[MLton-commit] r7080

Mon Apr 13 16:06:10 PDT 2009

Clean and reorganize <src>/lib directory.
----------------------------------------------------------------------

U   mlton/trunk/Makefile
D   mlton/trunk/lib/basis-stubs/
D   mlton/trunk/lib/basis-stubs-for-polyml/
D   mlton/trunk/lib/basis-stubs-for-smlnj/
D   mlton/trunk/lib/mlnlffi/
A   mlton/trunk/lib/mlnlffi-lib/
U   mlton/trunk/lib/mlton/basic/sources.cm
U   mlton/trunk/lib/mlton/pervasive/sources.cm
D   mlton/trunk/lib/mlton-stubs/
D   mlton/trunk/lib/mlton-stubs-for-polyml/
D   mlton/trunk/lib/mlton-stubs-for-smlnj/
D   mlton/trunk/lib/mlton-stubs-in-smlnj/
D   mlton/trunk/lib/mlyacc/
A   mlton/trunk/lib/mlyacc-lib/
A   mlton/trunk/lib/stubs/
A   mlton/trunk/lib/stubs/basis-stubs-for-polyml/
A   mlton/trunk/lib/stubs/basis-stubs-for-smlnj/
U   mlton/trunk/lib/stubs/basis-stubs-for-smlnj/Makefile
A   mlton/trunk/lib/stubs/mlton-stubs/
U   mlton/trunk/lib/stubs/mlton-stubs/Makefile
U   mlton/trunk/lib/stubs/mlton-stubs/mlton.sml
A   mlton/trunk/lib/stubs/mlton-stubs-for-polyml/
A   mlton/trunk/lib/stubs/mlton-stubs-for-smlnj/
A   mlton/trunk/lib/stubs/mlton-stubs-for-smlnj/Makefile
U   mlton/trunk/mlton/Makefile
U   mlton/trunk/mlton/front-end/ml-yacc-lib-proxy.cm
U   mlton/trunk/mlton/front-end/sources.cm
U   mlton/trunk/mlton/front-end/sources.mlb
U   mlton/trunk/mlton/mlton-stubs.cm
U   mlton/trunk/mlton/mlton.cm
U   mlton/trunk/mlyacc/README.MLton

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

Modified: mlton/trunk/Makefile
===================================================================

--- mlton/trunk/Makefile	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/Makefile	2009-04-13 23:06:09 UTC (rev 7080)
@@ -133,21 +133,21 @@
 		bin/make-pdf-guide; \
 	fi
 
-LIBRARIES := ckit-lib cml mlrisc-lib mlnlffi-lib mlyacc-lib smlnj-lib
+LIBRARIES := ckit-lib cml mlnlffi-lib mlrisc-lib mlyacc-lib smlnj-lib
 
 .PHONY: libraries-no-check
 libraries-no-check:
 	mkdir -p "$(LIB)/sml"
 	cd "$(LIB)/sml" && rm -rf $(LIBRARIES)
 	$(MAKE) -C "$(SRC)/lib/ckit-lib"
-	$(MAKE) -C "$(SRC)/lib/mlnlffi"
+	$(MAKE) -C "$(SRC)/lib/mlnlffi-lib"
 	$(MAKE) -C "$(SRC)/lib/mlrisc-lib"
 	$(MAKE) -C "$(SRC)/lib/smlnj-lib"
 	$(CP) "$(SRC)/lib/cml/." "$(LIB)/sml/cml"
 	$(CP) "$(SRC)/lib/ckit-lib/ckit/." "$(LIB)/sml/ckit-lib"
-	$(CP) "$(SRC)/lib/mlnlffi/." "$(LIB)/sml/mlnlffi-lib"
+	$(CP) "$(SRC)/lib/mlnlffi-lib/." "$(LIB)/sml/mlnlffi-lib"
 	$(CP) "$(SRC)/lib/mlrisc-lib/MLRISC/." "$(LIB)/sml/mlrisc-lib"
-	$(CP) "$(SRC)/lib/mlyacc/." "$(LIB)/sml/mlyacc-lib"
+	$(CP) "$(SRC)/lib/mlyacc-lib/." "$(LIB)/sml/mlyacc-lib"
 	$(CP) "$(SRC)/lib/smlnj-lib/smlnj-lib/." "$(LIB)/sml/smlnj-lib"
 	find "$(LIB)/sml" -type d -name .cm | xargs rm -rf
 	find "$(LIB)/sml" -type d -name .svn | xargs rm -rf
@@ -223,7 +223,6 @@
 	$(CP) "$(SRC)/bin/static-library.bat" "$(LIB)"
 endif
 
-
 .PHONY: smlnj-mlton
 smlnj-mlton:
 	$(MAKE) dirs runtime

Copied: mlton/trunk/lib/mlnlffi-lib (from rev 7078, mlton/trunk/lib/mlnlffi)


Property changes on: mlton/trunk/lib/mlnlffi-lib
___________________________________________________________________
Name: svn:ignore
   + gen-rtld-flags
gen-rtld-flags.exe

Name: svn:mergeinfo
   + 

Modified: mlton/trunk/lib/mlton/basic/sources.cm
===================================================================
--- mlton/trunk/lib/mlton/basic/sources.cm	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/lib/mlton/basic/sources.cm	2009-04-13 23:06:09 UTC (rev 7080)
@@ -169,8 +169,8 @@
 is
 
 #if (defined (SMLNJ_VERSION))
-../../basis-stubs-for-smlnj/sources.cm
-../../mlton-stubs/sources.cm
+../../stubs/basis-stubs-for-smlnj/sources.cm
+../../stubs/mlton-stubs/sources.cm
 #endif
 ../pervasive/sources.cm
 

Modified: mlton/trunk/lib/mlton/pervasive/sources.cm
===================================================================
--- mlton/trunk/lib/mlton/pervasive/sources.cm	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/lib/mlton/pervasive/sources.cm	2009-04-13 23:06:09 UTC (rev 7080)
@@ -16,7 +16,7 @@
 is
 
 #if (defined (SMLNJ_VERSION))
-../../basis-stubs-for-smlnj/sources.cm
+../../stubs/basis-stubs-for-smlnj/sources.cm
 #endif
 
 pervasive.sml

Copied: mlton/trunk/lib/mlyacc-lib (from rev 7078, mlton/trunk/lib/mlyacc)


Property changes on: mlton/trunk/lib/mlyacc-lib
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: mlton/trunk/lib/stubs/basis-stubs-for-polyml (from rev 7078, mlton/trunk/lib/basis-stubs-for-polyml)


Property changes on: mlton/trunk/lib/stubs/basis-stubs-for-polyml
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: mlton/trunk/lib/stubs/basis-stubs-for-smlnj (from rev 7078, mlton/trunk/lib/basis-stubs-for-smlnj)


Property changes on: mlton/trunk/lib/stubs/basis-stubs-for-smlnj
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: mlton/trunk/lib/stubs/basis-stubs-for-smlnj/Makefile
===================================================================
--- mlton/trunk/lib/basis-stubs-for-smlnj/Makefile	2009-04-13 20:53:50 UTC (rev 7078)
+++ mlton/trunk/lib/stubs/basis-stubs-for-smlnj/Makefile	2009-04-13 23:06:09 UTC (rev 7080)
@@ -9,4 +9,4 @@
 
 .PHONY: clean
 clean:
-	../../bin/clean
+	../../../bin/clean

Copied: mlton/trunk/lib/stubs/mlton-stubs (from rev 7078, mlton/trunk/lib/mlton-stubs)


Property changes on: mlton/trunk/lib/stubs/mlton-stubs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: mlton/trunk/lib/stubs/mlton-stubs/Makefile
===================================================================
--- mlton/trunk/lib/mlton-stubs/Makefile	2009-04-13 20:53:50 UTC (rev 7078)
+++ mlton/trunk/lib/stubs/mlton-stubs/Makefile	2009-04-13 23:06:09 UTC (rev 7080)
@@ -1,4 +1,5 @@
-## Copyright (C) 1999-2005 Henry Cejtin, Matthew Fluet, Suresh
+## Copyright (C) 2009 Matthew Fluet.
+ # Copyright (C) 1999-2005 Henry Cejtin, Matthew Fluet, Suresh
  #    Jagannathan, and Stephen Weeks.
  # Copyright (C) 1997-2000 NEC Research Institute.
  #
@@ -10,7 +11,7 @@
 
 .PHONY: links
 links:
-	for f in `cd ../../basis-library/mlton && ls *.sig`; do 	\
+	for f in `cd ../../../basis-library/mlton && ls *.sig`; do 	\
 		if [ "$$f" != 'ffi.sig' ]; then				\
 			rm -f $$f && 					\
 				ln ../../basis-library/mlton/$$f .; 	\
@@ -19,4 +20,4 @@
 
 .PHONY: clean
 clean:
-	../../bin/clean
+	../../../bin/clean

Modified: mlton/trunk/lib/stubs/mlton-stubs/mlton.sml
===================================================================
--- mlton/trunk/lib/mlton-stubs/mlton.sml	2009-04-13 20:53:50 UTC (rev 7078)
+++ mlton/trunk/lib/stubs/mlton-stubs/mlton.sml	2009-04-13 23:06:09 UTC (rev 7080)
@@ -492,7 +492,7 @@
          struct
             datatype status = Clone | Original
             fun load _ = raise Fail "World.load"
-            fun save _ = raise Fail "MLton.World.save"
+            fun save _ = raise Fail "World.save"
             fun saveThread _ = raise Fail "World.saveThread"
          end
 

Copied: mlton/trunk/lib/stubs/mlton-stubs-for-polyml (from rev 7078, mlton/trunk/lib/mlton-stubs-for-polyml)


Property changes on: mlton/trunk/lib/stubs/mlton-stubs-for-polyml
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: mlton/trunk/lib/stubs/mlton-stubs-for-smlnj (from rev 7078, mlton/trunk/lib/mlton-stubs-for-smlnj)


Property changes on: mlton/trunk/lib/stubs/mlton-stubs-for-smlnj
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: mlton/trunk/lib/stubs/mlton-stubs-for-smlnj/Makefile (from rev 7078, mlton/trunk/lib/basis-stubs-for-smlnj/Makefile)
===================================================================
--- mlton/trunk/lib/basis-stubs-for-smlnj/Makefile	2009-04-13 20:53:50 UTC (rev 7078)
+++ mlton/trunk/lib/stubs/mlton-stubs-for-smlnj/Makefile	2009-04-13 23:06:09 UTC (rev 7080)
@@ -0,0 +1,12 @@
+## Copyright (C) 2009 Matthew Fluet.
+ # Copyright (C) 1999-2005 Henry Cejtin, Matthew Fluet, Suresh
+ #    Jagannathan, and Stephen Weeks.
+ # Copyright (C) 1997-2000 NEC Research Institute.
+ #
+ # MLton is released under a BSD-style license.
+ # See the file MLton-LICENSE for details.
+ ##
+
+.PHONY: clean
+clean:
+	../../../bin/clean


Property changes on: mlton/trunk/lib/stubs/mlton-stubs-for-smlnj/Makefile
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: mlton/trunk/mlton/Makefile
===================================================================
--- mlton/trunk/mlton/Makefile	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/mlton/Makefile	2009-04-13 23:06:09 UTC (rev 7080)
@@ -173,14 +173,14 @@
 	$(CC) -o $(LIB)/mlton-polyml mlton-polyml.o -lpolymain -lpolyml
 	rm -f mlton-polyml.o
 
-mlton-polyml.use: ../lib/basis-stubs-for-polyml/sources.use ../lib/mlton-stubs-for-polyml/sources.use $(shell mlton -stop f ../lib/mlton-stubs/sources.mlb) $(shell mlton -stop f mlton.mlb)
+mlton-polyml.use: ../lib/stubs/basis-stubs-for-polyml/sources.use ../lib/stubs/mlton-stubs-for-polyml/sources.use $(shell mlton -stop f ../lib/stubs/mlton-stubs/sources.mlb) $(shell mlton -stop f mlton.mlb)
 	(									\
-		cat ../lib/basis-stubs-for-polyml/sources.use |			\
-			sed 's|use "\(.*\)";|../lib/basis-stubs-for-polyml/\1|'; \
+		cat ../lib/stubs/basis-stubs-for-polyml/sources.use |		\
+			sed 's|use "\(.*\)";|../lib/stubs/basis-stubs-for-polyml/\1|'; \
 		mlton -stop f mlton.mlb | grep -v 'mlb$$' | grep 'mlyacc';	\
-		cat ../lib/mlton-stubs-for-polyml/sources.use |			\
-			sed 's|use "\(.*\)";|../lib/mlton-stubs-for-polyml/\1|'; \
-		mlton -stop f ../lib/mlton-stubs/sources.mlb |			\
+		cat ../lib/stubs/mlton-stubs-for-polyml/sources.use |		\
+			sed 's|use "\(.*\)";|../lib/stubs/mlton-stubs-for-polyml/\1|'; \
+		mlton -stop f ../lib/stubs/mlton-stubs/sources.mlb |		\
 			grep -v 'mlb$$' | 					\
 			grep 'mlton-stubs';					\
 		mlton -stop f mlton.mlb |					\

Modified: mlton/trunk/mlton/front-end/ml-yacc-lib-proxy.cm
===================================================================
--- mlton/trunk/mlton/front-end/ml-yacc-lib-proxy.cm	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/mlton/front-end/ml-yacc-lib-proxy.cm	2009-04-13 23:06:09 UTC (rev 7080)
@@ -6,11 +6,11 @@
 
 Library
 
-library($/ml-yacc-lib.cm) - (
+library(../../lib/mlyacc-lib/ml-yacc-lib.cm) - (
   signature STREAM
   structure Stream
 )
 
 is
 
-$/ml-yacc-lib.cm
+../../lib/mlyacc-lib/ml-yacc-lib.cm

Modified: mlton/trunk/mlton/front-end/sources.cm
===================================================================
--- mlton/trunk/mlton/front-end/sources.cm	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/mlton/front-end/sources.cm	2009-04-13 23:06:09 UTC (rev 7080)
@@ -18,7 +18,7 @@
 #if (defined (SMLNJ_VERSION))
 ml-yacc-lib-proxy.cm
 #else
-../../lib/mlyacc/ml-yacc-lib.cm
+../../lib/mlyacc-lib/ml-yacc-lib.cm
 #endif
 ../ast/sources.cm
 ../control/sources.cm

Modified: mlton/trunk/mlton/front-end/sources.mlb
===================================================================
--- mlton/trunk/mlton/front-end/sources.mlb	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/mlton/front-end/sources.mlb	2009-04-13 23:06:09 UTC (rev 7080)
@@ -9,7 +9,7 @@
 
 local
    ../../lib/mlton/sources.mlb
-   ../../lib/mlyacc/mlyacc-lib.mlb
+   ../../lib/mlyacc-lib/mlyacc-lib.mlb
    ../ast/sources.mlb
    ../control/sources.mlb
 

Modified: mlton/trunk/mlton/mlton-stubs.cm
===================================================================
--- mlton/trunk/mlton/mlton-stubs.cm	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/mlton/mlton-stubs.cm	2009-04-13 23:06:09 UTC (rev 7080)
@@ -9,5 +9,5 @@
 Group is
 
 upgrade-basis.sml
-../lib/mlton-stubs/sources.cm
+../lib/stubs/mlton-stubs/sources.cm
 mlton.cm

Modified: mlton/trunk/mlton/mlton.cm
===================================================================
--- mlton/trunk/mlton/mlton.cm	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/mlton/mlton.cm	2009-04-13 23:06:09 UTC (rev 7080)
@@ -9,6 +9,6 @@
 Group is
 
 (* Need to elaborate ML-Yacc library in Basis Library, not MLton library. *)
-../lib/mlyacc/ml-yacc-lib.cm
+../lib/mlyacc-lib/ml-yacc-lib.cm
 sources.cm
 call-main.sml

Modified: mlton/trunk/mlyacc/README.MLton
===================================================================
--- mlton/trunk/mlyacc/README.MLton	2009-04-13 20:55:21 UTC (rev 7079)
+++ mlton/trunk/mlyacc/README.MLton	2009-04-13 23:06:09 UTC (rev 7080)
@@ -7,14 +7,14 @@
   build.bat -- deleted
   doc/
   examples/
-  lib/base.sig -- moved to <src>/lib/mlyacc
-  lib/join.sml -- moved to <src>/lib/mlyacc
-  lib/lrtable.sml -- moved to <src>/lib/mlyacc
+  lib/base.sig -- moved to <src>/lib/mlyacc-lib
+  lib/join.sml -- moved to <src>/lib/mlyacc-lib
+  lib/lrtable.sml -- moved to <src>/lib/mlyacc-lib
   lib/ml-yacc-lib.cm
-  lib/parser1.sml -- moved to <src>/lib/mlyacc
-  lib/parser2.sml -- moved to <src>/lib/mlyacc
+  lib/parser1.sml -- moved to <src>/lib/mlyacc-lib
+  lib/parser2.sml -- moved to <src>/lib/mlyacc-lib
   lib/sources.cm -- deleted
-  lib/stream.sml -- moved to <src>/lib/mlyacc
+  lib/stream.sml -- moved to <src>/lib/mlyacc-lib
   src/FILES
   src/README
   src/absyn.sig -- modifed
@@ -51,6 +51,6 @@
   call-main.sml
   doc/Makefile
   doc/macros.hva
-  lib/mlyacc-lib.mlb -- moved to <src>/lib/mlyacc
+  lib/mlyacc-lib.mlb -- moved to <src>/lib/mlyacc-lib
   main.sml
   mlyacc.mlb


