summaryrefslogtreecommitdiff
path: root/lang/sml-nj-devel/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/sml-nj-devel/files')
-rw-r--r--lang/sml-nj-devel/files/optional-patch-flint-access54
-rw-r--r--lang/sml-nj-devel/files/patch-ab56
-rw-r--r--lang/sml-nj-devel/files/plist-cml12
-rw-r--r--lang/sml-nj-devel/files/plist-eXene4
-rw-r--r--lang/sml-nj-devel/files/plist-everything54
-rw-r--r--lang/sml-nj-devel/files/plist-flint1
6 files changed, 156 insertions, 25 deletions
diff --git a/lang/sml-nj-devel/files/optional-patch-flint-access b/lang/sml-nj-devel/files/optional-patch-flint-access
index 6ac420fe7406..3119f7e09729 100644
--- a/lang/sml-nj-devel/files/optional-patch-flint-access
+++ b/lang/sml-nj-devel/files/optional-patch-flint-access
@@ -1,5 +1,27 @@
---- src/compiler/core.cm.orig Fri Aug 24 19:48:52 2001
-+++ src/compiler/core.cm Thu Aug 30 11:51:20 2001
+--- src/cm/cm-lib.cm.orig Fri Feb 8 21:02:55 2002
++++ src/cm/cm-lib.cm Thu Feb 28 02:38:24 2002
+@@ -14,6 +14,8 @@
+ structure Sharing
+ signature TOOLS
+ structure Subst
++ (* required by Backend.Compile.elaborate: *)
++ structure UniquePid
+ is
+ $/basis.cm
+ $/smlnj-lib.cm
+--- src/cm/compile/uniquepid.sml.orig Fri Feb 8 21:02:55 2002
++++ src/cm/compile/uniquepid.sml Thu Feb 28 03:07:33 2002
+@@ -17,7 +17,7 @@
+ type triplet = { staticPid: pid, fingerprint: pid, pepper: string }
+ in
+ structure UniquePid :> sig
+- type info
++ type info = triplet option
+ val reset : unit -> unit
+ val getInfo : GeneralParams.info -> SrcPath.file -> info
+ val uniquepid : info -> pid -> pid * string
+--- src/compiler/core.cm.orig Fri Dec 14 22:01:23 2001
++++ src/compiler/core.cm Thu Feb 28 02:43:48 2002
@@ -81,6 +81,26 @@
signature PICKMOD
signature UNPICKMOD
@@ -27,3 +49,31 @@
is
TopLevel/environ/environ.sig
+--- src/system/smlnj/internal/intsys.cm.orig Thu Sep 13 17:19:18 2001
++++ src/system/smlnj/internal/intsys.cm Thu Feb 28 05:54:57 2002
+@@ -32,7 +32,7 @@
+ $smlnj/init/init.cmi : cm
+
+ $/basis.cm
+- $smlnj/viscomp/core.cm
++ $smlnj/viscomp/core_flint.cm
+
+ (* need access to CM's "init" function *)
+ $smlnj/internal/cm0.cm
+--- src/system/smlnj/viscomp/core_flint.cm.orig Thu Feb 28 03:06:08 2002
++++ src/system/smlnj/viscomp/core_flint.cm Thu Feb 28 03:46:52 2002
+@@ -0,0 +1,14 @@
++(*
++ * Just a quick hack to avoid a cyclic dependency between
++ * cm/cm-lib.cm and compiler/core.cm. This happens because
++ * Compiler.elaborate requires cm's structure UniquePid,
++ * and we need Compiler.elaborate to generate FLINT terms.
++ * -5- 20020228
++ *)
++
++Library
++ library($smlnj/viscomp/core.cm)
++ structure UniquePid
++is
++ $smlnj/viscomp/core.cm
++ $smlnj/internal/cm-lib.cm
diff --git a/lang/sml-nj-devel/files/patch-ab b/lang/sml-nj-devel/files/patch-ab
index fe93cf1d434b..0ea33ef5bdf3 100644
--- a/lang/sml-nj-devel/files/patch-ab
+++ b/lang/sml-nj-devel/files/patch-ab
@@ -1,8 +1,50 @@
---- config/install.sh.orig Wed Jun 20 22:39:12 2001
-+++ config/install.sh Wed Aug 15 19:16:18 2001
-@@ -408,6 +408,28 @@
+--- config/install.sh.orig Fri Feb 15 23:17:39 2002
++++ config/install.sh Wed Feb 20 03:36:14 2002
+@@ -92,6 +92,17 @@
+ return 0
}
++isin() {
++ tested_x=$1
++ shift
++ for set_y in "$@" ; do
++ if [ ${tested_x} = ${set_y} ] ; then
++ return 0
++ fi
++ done
++ return 1
++}
++
+ require() {
+ require_who=$1
+ shift
+@@ -105,8 +116,10 @@
+ }
+
+ onepass() {
+- while read depline ; do
+- require $depline
++ while read depwho depon ; do
++ if isin $depwho ${TARGETS} ; then
++ require $depwho $depon
++ fi
+ done
+ }
+
+@@ -123,9 +136,7 @@
+ #
+ NEWTARGETS=""
+ for t in ${ALLTARGETS} ; do
+- if isnotin $t ${TARGETS} ; then
+- :
+- else
++ if isin $t ${TARGETS} ; then
+ NEWTARGETS="$NEWTARGETS $t"
+ fi
+ done
+@@ -552,6 +563,28 @@
+ ######################################################################
+
#
+# do_patch patch-file
+# apply a patch file
@@ -29,16 +71,16 @@
# create the various sub directories
#
for dir in $BINDIR $HEAPDIR $RUNDIR $LIBDIR $SRCDIR ; do
-@@ -527,7 +549,7 @@
+@@ -668,7 +701,7 @@
$MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
if [ -x run.$ARCH-$OPSYS ]; then
mv run.$ARCH-$OPSYS $RUNDIR
- $MAKE MAKE=$MAKE clean
+ [ "$MLNORUNTIMECLEAN" ] || $MAKE MAKE=$MAKE clean
else
- echo "$this: !!! Run-time system build failed for some reason."
- exit 1
-@@ -594,6 +616,8 @@
+ complain "$this: !!! Run-time system build failed for some reason."
+ fi
+@@ -732,6 +765,8 @@
do
unpack $src $ROOT/src $src $src
done
diff --git a/lang/sml-nj-devel/files/plist-cml b/lang/sml-nj-devel/files/plist-cml
deleted file mode 100644
index 4f6fb60760b1..000000000000
--- a/lang/sml-nj-devel/files/plist-cml
+++ /dev/null
@@ -1,12 +0,0 @@
-smlnj/lib/cml/CM/%%MLARCH%%-unix/basis.cm
-smlnj/lib/cml/CM/%%MLARCH%%-unix/cml-internal.cm
-smlnj/lib/cml/CM/%%MLARCH%%-unix/cml.cm
-smlnj/lib/cml/CM/%%MLARCH%%-unix/core-cml.cm
-smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/smlnj-lib.cm
-smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/trace-cml.cm
-@dirrm smlnj/lib/cml/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/cml/CM
-@dirrm smlnj/lib/cml
-@dirrm smlnj/lib/cml-lib/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/cml-lib/CM
-@dirrm smlnj/lib/cml-lib
diff --git a/lang/sml-nj-devel/files/plist-eXene b/lang/sml-nj-devel/files/plist-eXene
deleted file mode 100644
index 3902a0c46ecb..000000000000
--- a/lang/sml-nj-devel/files/plist-eXene
+++ /dev/null
@@ -1,4 +0,0 @@
-smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix/eXene.cm
-@dirrm smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/eXene.cm/CM
-@dirrm smlnj/lib/eXene.cm
diff --git a/lang/sml-nj-devel/files/plist-everything b/lang/sml-nj-devel/files/plist-everything
new file mode 100644
index 000000000000..36f585c7f633
--- /dev/null
+++ b/lang/sml-nj-devel/files/plist-everything
@@ -0,0 +1,54 @@
+bin/ml-burg
+bin/ml-nlffigen
+bin/nowhere
+smlnj/bin/.heap/ml-burg.%%MLARCH%%-bsd
+smlnj/bin/.heap/ml-nlffigen.%%MLARCH%%-bsd
+smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd
+smlnj/bin/ml-burg
+smlnj/bin/ml-nlffigen
+smlnj/bin/nowhere
+smlnj/lib/c-int.cm/CM/%%MLARCH%%-unix/c-int.cm
+smlnj/lib/c.cm/CM/%%MLARCH%%-unix/c.cm
+smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix/ckit-lib.cm
+smlnj/lib/cml/CM/%%MLARCH%%-unix/basis.cm
+smlnj/lib/cml/CM/%%MLARCH%%-unix/cml-internal.cm
+smlnj/lib/cml/CM/%%MLARCH%%-unix/cml.cm
+smlnj/lib/cml/CM/%%MLARCH%%-unix/core-cml.cm
+smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/smlnj-lib.cm
+smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/trace-cml.cm
+smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix/eXene.cm
+smlnj/lib/memory.cm/CM/%%MLARCH%%-unix/memory.cm
+smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/match-compiler.cm
+smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/parser.cm
+smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/pp.cm
+smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/prec-parser.cm
+smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/sml-ast.cm
+smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/source-map.cm
+smlnj/lib/pgraph-util.cm/CM/%%MLARCH%%-unix/pgraph-util.cm
+@dirrm smlnj/lib/cml/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/cml/CM
+@dirrm smlnj/lib/cml
+@dirrm smlnj/lib/cml-lib/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/cml-lib/CM
+@dirrm smlnj/lib/cml-lib
+@dirrm smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/eXene.cm/CM
+@dirrm smlnj/lib/eXene.cm
+@dirrm smlnj/lib/c-int.cm/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/c-int.cm/CM
+@dirrm smlnj/lib/c-int.cm
+@dirrm smlnj/lib/c.cm/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/c.cm/CM
+@dirrm smlnj/lib/c.cm
+@dirrm smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/ckit-lib.cm/CM
+@dirrm smlnj/lib/ckit-lib.cm
+@dirrm smlnj/lib/memory.cm/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/memory.cm/CM
+@dirrm smlnj/lib/memory.cm
+@dirrm smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/mlrisc-tools/CM
+@dirrm smlnj/lib/mlrisc-tools
+@dirrm smlnj/lib/pgraph-util.cm/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/pgraph-util.cm/CM
+@dirrm smlnj/lib/pgraph-util.cm
diff --git a/lang/sml-nj-devel/files/plist-flint b/lang/sml-nj-devel/files/plist-flint
new file mode 100644
index 000000000000..6081641f6be7
--- /dev/null
+++ b/lang/sml-nj-devel/files/plist-flint
@@ -0,0 +1 @@
+smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix/core_flint.cm