[MLton-commit] r5403

Vesa Karvonen vesak at mlton.org
Tue Mar 6 00:00:37 PST 2007


Fixed directories in SML/NJ and MLton build files.
----------------------------------------------------------------------

U   mltonlib/trunk/com/ssh/extended-basis/unstable/README
U   mltonlib/trunk/com/ssh/extended-basis/unstable/basis.cm
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis-minus-extensions.cm
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis-rebound.cm
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/bootstrap.cm
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/sigs.cm
U   mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/unsealed.cm
U   mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.cm
U   mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb

----------------------------------------------------------------------

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/README
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/README	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/README	2007-03-06 08:00:36 UTC (rev 5403)
@@ -49,13 +49,13 @@
 
       This directory contains the implementation details of the library.
 
-   detail/$(SML_COMPILER)/
+   detail/ml/$(SML_COMPILER)/
 
       These directories (e.g. detail/mlton/) contain compiler specific
       implementation details.  Different compilers implement different
       subsets of the original basis library.
 
-   detail/$(SML_COMPILER)/workarounds/
+   detail/ml/$(SML_COMPILER)/workarounds/
 
       These directories (e.g. detail/smlnj/workarounds/) contain compiler
       specific workarounds.  The idea is that workarounds are separated

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/basis.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/basis.cm	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/basis.cm	2007-03-06 08:00:36 UTC (rev 5403)
@@ -5,8 +5,8 @@
  *)
 
 library
-   library(detail/smlnj/basis-minus-extensions.cm)
+   library(detail/ml/smlnj/basis-minus-extensions.cm)
    library(extensions.cm)
 is
    extensions.cm
-   detail/smlnj/basis-minus-extensions.cm
+   detail/ml/smlnj/basis-minus-extensions.cm

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis-minus-extensions.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis-minus-extensions.cm	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis-minus-extensions.cm	2007-03-06 08:00:36 UTC (rev 5403)
@@ -5,6 +5,6 @@
  *)
 
 library
-   library(workarounds/basis.cm) - library(../../extensions.cm)
+   library(workarounds/basis.cm) - library(../../../extensions.cm)
 is
    workarounds/basis.cm

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis-rebound.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis-rebound.cm	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/basis-rebound.cm	2007-03-06 08:00:36 UTC (rev 5403)
@@ -7,6 +7,6 @@
 library
    source(-)
 is
-   ../../detail/common/basis.sml
-   ../../detail/smlnj/basis.sml
+   ../../../detail/ml/common/basis.sml
+   ../../../detail/ml/smlnj/basis.sml
    workarounds/basis.cm

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/bootstrap.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/bootstrap.cm	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/bootstrap.cm	2007-03-06 08:00:36 UTC (rev 5403)
@@ -8,5 +8,5 @@
    library(basis-rebound.cm)
    source(-)
 is
-   ../../detail/bootstrap.sml
+   ../../../detail/bootstrap.sml
    basis-rebound.cm

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/sigs.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/sigs.cm	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/sigs.cm	2007-03-06 08:00:36 UTC (rev 5403)
@@ -8,67 +8,67 @@
    group(bootstrap.cm)
    source(-)
 is
-   ../../public/basic.sig
-   ../../public/concept/bitwise.sig
-   ../../public/concept/bounded.sig
-   ../../public/concept/cased.sig
-   ../../public/concept/cstringable.sig
-   ../../public/concept/equality.sig
-   ../../public/concept/flags.sig
-   ../../public/concept/func.sig
-   ../../public/concept/monad.sig
-   ../../public/concept/ordered.sig
-   ../../public/concept/scannable.sig
-   ../../public/concept/signed.sig
-   ../../public/concept/stringable.sig
-   ../../public/control/exit.sig
-   ../../public/control/exn.sig
-   ../../public/control/with.sig
-   ../../public/data/bool.sig
-   ../../public/data/option.sig
-   ../../public/data/order.sig
-   ../../public/data/pair.sig
-   ../../public/data/product-type.sig
-   ../../public/data/product.sig
-   ../../public/data/ref.sig
-   ../../public/data/sq.sig
-   ../../public/data/sum.sig
-   ../../public/data/unit.sig
-   ../../public/data/univ.sig
-   ../../public/data/void.sig
-   ../../public/fn/bin-fn.sig
-   ../../public/fn/bin-op.sig
-   ../../public/fn/bin-pr.sig
-   ../../public/fn/cmp.sig
-   ../../public/fn/effect.sig
-   ../../public/fn/fn.sig
-   ../../public/fn/shift-op.sig
-   ../../public/fn/thunk.sig
-   ../../public/fn/un-op.sig
-   ../../public/fn/un-pr.sig
-   ../../public/generic/emb.sig
-   ../../public/generic/fix.sig
-   ../../public/generic/iso.sig
-   ../../public/generic/tie.sig
-   ../../public/io/reader.sig
-   ../../public/io/text-io.sig
-   ../../public/io/writer.sig
-   ../../public/numeric/int-inf.sig
-   ../../public/numeric/integer.sig
-   ../../public/numeric/real.sig
-   ../../public/numeric/word.sig
-   ../../public/sequence/array-slice.sig
-   ../../public/sequence/array.sig
-   ../../public/sequence/buffer.sig
-   ../../public/sequence/list.sig
-   ../../public/sequence/mono-array-slice.sig
-   ../../public/sequence/mono-array.sig
-   ../../public/sequence/mono-vector-slice.sig
-   ../../public/sequence/mono-vector.sig
-   ../../public/sequence/vector-slice.sig
-   ../../public/sequence/vector.sig
-   ../../public/text/char.sig
-   ../../public/text/string.sig
-   ../../public/text/substring.sig
-   ../../public/text/text.sig
+   ../../../public/basic.sig
+   ../../../public/concept/bitwise.sig
+   ../../../public/concept/bounded.sig
+   ../../../public/concept/cased.sig
+   ../../../public/concept/cstringable.sig
+   ../../../public/concept/equality.sig
+   ../../../public/concept/flags.sig
+   ../../../public/concept/func.sig
+   ../../../public/concept/monad.sig
+   ../../../public/concept/ordered.sig
+   ../../../public/concept/scannable.sig
+   ../../../public/concept/signed.sig
+   ../../../public/concept/stringable.sig
+   ../../../public/control/exit.sig
+   ../../../public/control/exn.sig
+   ../../../public/control/with.sig
+   ../../../public/data/bool.sig
+   ../../../public/data/option.sig
+   ../../../public/data/order.sig
+   ../../../public/data/pair.sig
+   ../../../public/data/product-type.sig
+   ../../../public/data/product.sig
+   ../../../public/data/ref.sig
+   ../../../public/data/sq.sig
+   ../../../public/data/sum.sig
+   ../../../public/data/unit.sig
+   ../../../public/data/univ.sig
+   ../../../public/data/void.sig
+   ../../../public/fn/bin-fn.sig
+   ../../../public/fn/bin-op.sig
+   ../../../public/fn/bin-pr.sig
+   ../../../public/fn/cmp.sig
+   ../../../public/fn/effect.sig
+   ../../../public/fn/fn.sig
+   ../../../public/fn/shift-op.sig
+   ../../../public/fn/thunk.sig
+   ../../../public/fn/un-op.sig
+   ../../../public/fn/un-pr.sig
+   ../../../public/generic/emb.sig
+   ../../../public/generic/fix.sig
+   ../../../public/generic/iso.sig
+   ../../../public/generic/tie.sig
+   ../../../public/io/reader.sig
+   ../../../public/io/text-io.sig
+   ../../../public/io/writer.sig
+   ../../../public/numeric/int-inf.sig
+   ../../../public/numeric/integer.sig
+   ../../../public/numeric/real.sig
+   ../../../public/numeric/word.sig
+   ../../../public/sequence/array-slice.sig
+   ../../../public/sequence/array.sig
+   ../../../public/sequence/buffer.sig
+   ../../../public/sequence/list.sig
+   ../../../public/sequence/mono-array-slice.sig
+   ../../../public/sequence/mono-array.sig
+   ../../../public/sequence/mono-vector-slice.sig
+   ../../../public/sequence/mono-vector.sig
+   ../../../public/sequence/vector-slice.sig
+   ../../../public/sequence/vector.sig
+   ../../../public/text/char.sig
+   ../../../public/text/string.sig
+   ../../../public/text/substring.sig
+   ../../../public/text/text.sig
    bootstrap.cm

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/unsealed.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/unsealed.cm	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/detail/ml/smlnj/unsealed.cm	2007-03-06 08:00:36 UTC (rev 5403)
@@ -8,70 +8,70 @@
    group(sigs.cm)
    source(-)
 is
-   ../../detail/basic.sml
-   ../../detail/common/mono-seqs.sml
-   ../../detail/common/scalars.sml
-   ../../detail/concept/mk-bounded.fun
-   ../../detail/concept/mk-cstringable.fun
-   ../../detail/concept/mk-equality.fun
-   ../../detail/concept/mk-monad.fun
-   ../../detail/concept/mk-ordered.fun
-   ../../detail/concept/mk-scannable.fun
-   ../../detail/concept/mk-stringable.fun
-   ../../detail/concept/mk-word-flags.fun
-   ../../detail/control/exit.sml
-   ../../detail/control/exn.sml
-   ../../detail/control/with.sml
-   ../../detail/data/bool.sml
-   ../../detail/data/option.sml
-   ../../detail/data/order.sml
-   ../../detail/data/pair.sml
-   ../../detail/data/product.sml
-   ../../detail/data/ref.sml
-   ../../detail/data/sq.sml
-   ../../detail/data/sum.sml
-   ../../detail/data/univ-exn.sml
-   ../../detail/fn/bin-fn.sml
-   ../../detail/fn/bin-op.sml
-   ../../detail/fn/bin-pr.sml
-   ../../detail/fn/cmp.sml
-   ../../detail/fn/effect.sml
-   ../../detail/fn/fn.sml
-   ../../detail/fn/thunk.sml
-   ../../detail/fn/un-op.sml
-   ../../detail/fn/un-pr.sml
-   ../../detail/generic/emb.sml
-   ../../detail/generic/fix.sml
-   ../../detail/generic/iso.sml
-   ../../detail/generic/tie.sml
-   ../../detail/io/reader.sml
-   ../../detail/io/text-io.sml
-   ../../detail/io/writer.sml
-   ../../detail/lazy/promise.sml
-   ../../detail/numeric/mk-int-inf-ext.fun
-   ../../detail/numeric/mk-integer-ext.fun
-   ../../detail/numeric/mk-real-ext.fun
-   ../../detail/numeric/mk-word-ext.fun
-   ../../detail/sequence/array-slice.sml
-   ../../detail/sequence/array.sml
-   ../../detail/sequence/buffer.sml
-   ../../detail/sequence/list.sml
-   ../../detail/sequence/mk-mono-array-ext.fun
-   ../../detail/sequence/mk-mono-array-slice-ext.fun
-   ../../detail/sequence/mk-mono-seq-common-ext.fun
-   ../../detail/sequence/mk-mono-vector-ext.fun
-   ../../detail/sequence/mk-mono-vector-slice-ext.fun
-   ../../detail/sequence/mk-seq-common-ext.fun
-   ../../detail/sequence/vector-slice.sml
-   ../../detail/sequence/vector.sml
-   ../../detail/smlnj/ints.sml
-   ../../detail/smlnj/mono-array-slices.sml
-   ../../detail/smlnj/mono-arrays.sml
-   ../../detail/smlnj/mono-vector-slices.sml
-   ../../detail/smlnj/mono-vectors.sml
-   ../../detail/smlnj/reals.sml
-   ../../detail/smlnj/words.sml
-   ../../detail/text/mk-text-ext.fun
-   ../../public/lazy/promise.sig
+   ../../../detail/basic.sml
+   ../../../detail/concept/mk-bounded.fun
+   ../../../detail/concept/mk-cstringable.fun
+   ../../../detail/concept/mk-equality.fun
+   ../../../detail/concept/mk-monad.fun
+   ../../../detail/concept/mk-ordered.fun
+   ../../../detail/concept/mk-scannable.fun
+   ../../../detail/concept/mk-stringable.fun
+   ../../../detail/concept/mk-word-flags.fun
+   ../../../detail/control/exit.sml
+   ../../../detail/control/exn.sml
+   ../../../detail/control/with.sml
+   ../../../detail/data/bool.sml
+   ../../../detail/data/option.sml
+   ../../../detail/data/order.sml
+   ../../../detail/data/pair.sml
+   ../../../detail/data/product.sml
+   ../../../detail/data/ref.sml
+   ../../../detail/data/sq.sml
+   ../../../detail/data/sum.sml
+   ../../../detail/data/univ-exn.sml
+   ../../../detail/fn/bin-fn.sml
+   ../../../detail/fn/bin-op.sml
+   ../../../detail/fn/bin-pr.sml
+   ../../../detail/fn/cmp.sml
+   ../../../detail/fn/effect.sml
+   ../../../detail/fn/fn.sml
+   ../../../detail/fn/thunk.sml
+   ../../../detail/fn/un-op.sml
+   ../../../detail/fn/un-pr.sml
+   ../../../detail/generic/emb.sml
+   ../../../detail/generic/fix.sml
+   ../../../detail/generic/iso.sml
+   ../../../detail/generic/tie.sml
+   ../../../detail/io/reader.sml
+   ../../../detail/io/text-io.sml
+   ../../../detail/io/writer.sml
+   ../../../detail/lazy/promise.sml
+   ../../../detail/ml/common/mono-seqs.sml
+   ../../../detail/ml/common/scalars.sml
+   ../../../detail/ml/smlnj/ints.sml
+   ../../../detail/ml/smlnj/mono-array-slices.sml
+   ../../../detail/ml/smlnj/mono-arrays.sml
+   ../../../detail/ml/smlnj/mono-vector-slices.sml
+   ../../../detail/ml/smlnj/mono-vectors.sml
+   ../../../detail/ml/smlnj/reals.sml
+   ../../../detail/ml/smlnj/words.sml
+   ../../../detail/numeric/mk-int-inf-ext.fun
+   ../../../detail/numeric/mk-integer-ext.fun
+   ../../../detail/numeric/mk-real-ext.fun
+   ../../../detail/numeric/mk-word-ext.fun
+   ../../../detail/sequence/array-slice.sml
+   ../../../detail/sequence/array.sml
+   ../../../detail/sequence/buffer.sml
+   ../../../detail/sequence/list.sml
+   ../../../detail/sequence/mk-mono-array-ext.fun
+   ../../../detail/sequence/mk-mono-array-slice-ext.fun
+   ../../../detail/sequence/mk-mono-seq-common-ext.fun
+   ../../../detail/sequence/mk-mono-vector-ext.fun
+   ../../../detail/sequence/mk-mono-vector-slice-ext.fun
+   ../../../detail/sequence/mk-seq-common-ext.fun
+   ../../../detail/sequence/vector-slice.sml
+   ../../../detail/sequence/vector.sml
+   ../../../detail/text/mk-text-ext.fun
+   ../../../public/lazy/promise.sig
    ext.sml
    sigs.cm

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.cm
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.cm	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.cm	2007-03-06 08:00:36 UTC (rev 5403)
@@ -7,6 +7,6 @@
 library
    source(-)
 is
-   detail/smlnj/unsealed.cm
+   detail/ml/smlnj/unsealed.cm
    public/export/common.sml
    public/export/smlnj.sml

Modified: mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb
===================================================================
--- mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb	2007-03-06 07:54:22 UTC (rev 5402)
+++ mltonlib/trunk/com/ssh/extended-basis/unstable/extensions.mlb	2007-03-06 08:00:36 UTC (rev 5403)
@@ -24,8 +24,8 @@
    local
       $(SML_LIB)/basis/basis.mlb
    in
-      detail/common/basis.sml
-      detail/$(SML_COMPILER)/basis.sml
+      detail/ml/common/basis.sml
+      detail/ml/$(SML_COMPILER)/basis.sml
    end
    $(SML_LIB)/basis/pervasive.mlb
 in
@@ -36,13 +36,13 @@
    in
       local
          (* Workarounds (if any). *)
-         detail/$(SML_COMPILER)/workarounds.mlb
+         detail/ml/$(SML_COMPILER)/workarounds.mlb
 
          (* Minimal modules for bootstrapping. *)
          detail/bootstrap.sml
 
          (* Compiler specific extensions (if any). *)
-         detail/$(SML_COMPILER)/extensions.mlb
+         detail/ml/$(SML_COMPILER)/extensions.mlb
 
          (* Concept signatures *)
          public/concept/bitwise.sig
@@ -111,7 +111,7 @@
                detail/data/univ-exn.sml
             end
          in
-            detail/$(SML_COMPILER)/univ.sml
+            detail/ml/$(SML_COMPILER)/univ.sml
          end
 
          (* BinOp *)
@@ -231,10 +231,10 @@
          detail/numeric/mk-int-inf-ext.fun
          detail/numeric/mk-real-ext.fun
          detail/numeric/mk-word-ext.fun
-         detail/common/scalars.sml
-         detail/$(SML_COMPILER)/ints.sml
-         detail/$(SML_COMPILER)/reals.sml
-         detail/$(SML_COMPILER)/words.sml
+         detail/ml/common/scalars.sml
+         detail/ml/$(SML_COMPILER)/ints.sml
+         detail/ml/$(SML_COMPILER)/reals.sml
+         detail/ml/$(SML_COMPILER)/words.sml
 
          (* MonoSeqs *)
          public/sequence/mono-vector.sig
@@ -251,12 +251,12 @@
          detail/sequence/mk-mono-array-ext.fun
          detail/sequence/mk-mono-array-slice-ext.fun
          detail/text/mk-text-ext.fun
-         detail/common/mono-seqs.sml
-         detail/$(SML_COMPILER)/mono-vectors.sml
-         detail/$(SML_COMPILER)/mono-vector-slices.sml
-         detail/$(SML_COMPILER)/mono-arrays.sml
-         detail/$(SML_COMPILER)/mono-array-slices.sml
-         detail/$(SML_COMPILER)/texts.sml
+         detail/ml/common/mono-seqs.sml
+         detail/ml/$(SML_COMPILER)/mono-vectors.sml
+         detail/ml/$(SML_COMPILER)/mono-vector-slices.sml
+         detail/ml/$(SML_COMPILER)/mono-arrays.sml
+         detail/ml/$(SML_COMPILER)/mono-array-slices.sml
+         detail/ml/$(SML_COMPILER)/texts.sml
 
          (* Promise *)
          public/lazy/promise.sig




More information about the MLton-commit mailing list