MAJ portage NT

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@672 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

6 files changed, 87 insertions, 68 deletions

diff --git a/Makefile.nt b/Makefile.nt
index e094d6e7f..d11df560a 100644
--- a/Makefile.nt
+++ b/Makefile.nt
@@ -141,7 +141,7 @@ backup:
 promote-cross:
 	cp cslc boot\cslc
 	cp lex\csllex boot\csllex
-	cp yacc\cslyacc boot\cslyacc
+	cp yacc\cslyacc.exe boot\cslyacc.exe
 	cd stdlib & cp $(LIBFILES) ..\boot
 
 # Promote the newly compiled system to the rank of bootstrap compiler
@@ -151,7 +151,7 @@ promote: promote-cross
 
 # Restore the saved bootstrap compiler if a problem arises
 restore:
-	mv boot\Saved\* boot
+	cd boot\Saved & mv * ..
 	rmdir boot\Saved
 	mv boot\Saved.prev boot\Saved
 
@@ -403,7 +403,7 @@ realclean::
 
 csltools:
 	cd tools & $(MAKEREC) all
-realclean::
+clean::
 	cd tools & $(MAKEREC) clean
 alldepend::
 	cd tools & $(MAKEREC) depend
@@ -435,14 +435,14 @@ alldepend::
 	$(CAMLOPT) $(COMPFLAGS) -c $<
 
 clean::
-	rm -f utils\*.cm[iox] utils\*.obj utils\*.asm
-	rm -f parsing\*.cm[iox] parsing\*.obj parsing\*.asm
-	rm -f typing\*.cm[iox] typing\*.obj typing\*.asm
-	rm -f bytecomp\*.cm[iox] bytecomp\*.obj bytecomp\*.asm
-	rm -f asmcomp\*.cm[iox] asmcomp\*.obj asmcomp\*.asm
-	rm -f driver\*.cm[iox] driver\*.obj driver\*.asm
-	rm -f toplevel\*.cm[iox] toplevel\*.obj toplevel\*.asm
-	rm -f tools\*.cm[iox] tools\*.obj tools\*.asm
+	rm -f utils/*.cm* utils/*.obj utils/*.asm
+	rm -f parsing/*.cm* parsing/*.obj parsing/*.asm
+	rm -f typing/*.cm* typing/*.obj typing/*.asm
+	rm -f bytecomp/*.cm* bytecomp/*.obj bytecomp/*.asm
+	rm -f asmcomp/*.cm* asmcomp/*.obj asmcomp/*.asm
+	rm -f driver/*.cm* driver/*.obj driver/*.asm
+	rm -f toplevel/*.cm* toplevel/*.obj toplevel/*.asm
+	rm -f tools/*.cm* tools/*.obj tools/*.asm
 
 depend: beforedepend
 	echo > .depend
diff --git a/asmrun/.depend b/asmrun/.depend
index a46cd2c4f..9973606c5 100644
--- a/asmrun/.depend
+++ b/asmrun/.depend
@@ -52,12 +52,17 @@ ints.o: ints.c ../byterun/alloc.h ../byterun/misc.h \
  ../byterun/mlvalues.h ../byterun/fail.h ../byterun/memory.h \
  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
  ../byterun/minor_gc.h ../byterun/str.h
-io.o: io.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
- ../byterun/../config/m.h ../byterun/../config/s.h \
+io.o: io.c ../byterun/config.h ../byterun/../config/m.h \
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
  ../byterun/mlvalues.h ../byterun/fail.h ../byterun/io.h \
  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/signals.h \
  ../byterun/sys.h
+lexing.o: lexing.c ../byterun/mlvalues.h ../byterun/config.h \
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
+ ../byterun/stacks.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/str.h
 main.o: main.c ../byterun/gc.h ../byterun/mlvalues.h \
  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
  ../byterun/misc.h ../byterun/gc_ctrl.h ../byterun/sys.h
@@ -165,12 +170,17 @@ ints.d.o: ints.c ../byterun/alloc.h ../byterun/misc.h \
  ../byterun/mlvalues.h ../byterun/fail.h ../byterun/memory.h \
  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
  ../byterun/minor_gc.h ../byterun/str.h
-io.d.o: io.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
- ../byterun/../config/m.h ../byterun/../config/s.h \
+io.d.o: io.c ../byterun/config.h ../byterun/../config/m.h \
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
  ../byterun/mlvalues.h ../byterun/fail.h ../byterun/io.h \
  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/signals.h \
  ../byterun/sys.h
+lexing.d.o: lexing.c ../byterun/mlvalues.h ../byterun/config.h \
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
+ ../byterun/stacks.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/str.h
 main.d.o: main.c ../byterun/gc.h ../byterun/mlvalues.h \
  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
  ../byterun/misc.h ../byterun/gc_ctrl.h ../byterun/sys.h
diff --git a/asmrun/Makefile.nt b/asmrun/Makefile.nt
index e6a4c9fcc..24f3d56a0 100644
--- a/asmrun/Makefile.nt
+++ b/asmrun/Makefile.nt
@@ -4,9 +4,11 @@ CC=$(NATIVECC)
 CFLAGS=-I..\byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(NATIVECCCOMPOPTS)
 
 COBJS=main.obj fail.obj roots.obj signals.obj \
-  misc.obj freelist.obj major_gc.obj minor_gc.obj memory.obj alloc.obj compare.obj ints.obj \
-  floats.obj str.obj array.obj io.obj extern.obj intern.obj hash.obj sys.obj parsing.obj \
-  gc_ctrl.obj terminfo.obj md5.obj obj.obj
+  misc.obj freelist.obj major_gc.obj minor_gc.obj memory.obj alloc.obj \
+  compare.obj ints.obj floats.obj str.obj array.obj io.obj extern.obj \
+  intern.obj hash.obj sys.obj parsing.obj gc_ctrl.obj terminfo.obj \
+  md5.obj obj.obj lexing.obj
+
 ASMOBJS=$(ARCH)nt.obj
 
 OBJS=$(COBJS) $(ASMOBJS)
@@ -20,46 +22,48 @@ libasmrun.lib: $(OBJS)
 install:
 	cp libasmrun.lib $(LIBDIR)
 
-misc.c: ..\byterun\misc.c
-	cp ..\byterun\misc.c misc.c
-freelist.c: ..\byterun\freelist.c
-	cp ..\byterun\freelist.c freelist.c
-major_gc.c: ..\byterun\major_gc.c
-	cp ..\byterun\major_gc.c major_gc.c
-minor_gc.c: ..\byterun\minor_gc.c
-	cp ..\byterun\minor_gc.c minor_gc.c
-memory.c: ..\byterun\memory.c
-	cp ..\byterun\memory.c memory.c
-alloc.c: ..\byterun\alloc.c
-	cp ..\byterun\alloc.c alloc.c
-compare.c: ..\byterun\compare.c
-	cp ..\byterun\compare.c compare.c
-ints.c: ..\byterun\ints.c
-	cp ..\byterun\ints.c ints.c
-floats.c: ..\byterun\floats.c
-	cp ..\byterun\floats.c floats.c
-str.c: ..\byterun\str.c
-	cp ..\byterun\str.c str.c
-io.c: ..\byterun\io.c
-	cp ..\byterun\io.c io.c
-extern.c: ..\byterun\extern.c
-	cp ..\byterun\extern.c extern.c
-intern.c: ..\byterun\intern.c
-	cp ..\byterun\intern.c intern.c
-hash.c: ..\byterun\hash.c
-	cp ..\byterun\hash.c hash.c
-sys.c: ..\byterun\sys.c
-	cp ..\byterun\sys.c sys.c
-parsing.c: ..\byterun\parsing.c
-	cp ..\byterun\parsing.c parsing.c
-gc_ctrl.c: ..\byterun\gc_ctrl.c
-	cp ..\byterun\gc_ctrl.c gc_ctrl.c
-terminfo.c: ..\byterun\terminfo.c
-	cp ..\byterun\terminfo.c terminfo.c
-md5.c: ..\byterun\md5.c
-	cp ..\byterun\md5.c md5.c
-obj.c: ..\byterun\obj.c
-	cp ..\byterun\obj.c obj.c
+misc.c: ../byterun/misc.c
+	cp ../byterun/misc.c misc.c
+freelist.c: ../byterun/freelist.c
+	cp ../byterun/freelist.c freelist.c
+major_gc.c: ../byterun/major_gc.c
+	cp ../byterun/major_gc.c major_gc.c
+minor_gc.c: ../byterun/minor_gc.c
+	cp ../byterun/minor_gc.c minor_gc.c
+memory.c: ../byterun/memory.c
+	cp ../byterun/memory.c memory.c
+alloc.c: ../byterun/alloc.c
+	cp ../byterun/alloc.c alloc.c
+compare.c: ../byterun/compare.c
+	cp ../byterun/compare.c compare.c
+ints.c: ../byterun/ints.c
+	cp ../byterun/ints.c ints.c
+floats.c: ../byterun/floats.c
+	cp ../byterun/floats.c floats.c
+str.c: ../byterun/str.c
+	cp ../byterun/str.c str.c
+io.c: ../byterun/io.c
+	cp ../byterun/io.c io.c
+extern.c: ../byterun/extern.c
+	cp ../byterun/extern.c extern.c
+intern.c: ../byterun/intern.c
+	cp ../byterun/intern.c intern.c
+hash.c: ../byterun/hash.c
+	cp ../byterun/hash.c hash.c
+sys.c: ../byterun/sys.c
+	cp ../byterun/sys.c sys.c
+parsing.c: ../byterun/parsing.c
+	cp ../byterun/parsing.c parsing.c
+gc_ctrl.c: ../byterun/gc_ctrl.c
+	cp ../byterun/gc_ctrl.c gc_ctrl.c
+terminfo.c: ../byterun/terminfo.c
+	cp ../byterun/terminfo.c terminfo.c
+md5.c: ../byterun/md5.c
+	cp ../byterun/md5.c md5.c
+obj.c: ../byterun/obj.c
+	cp ../byterun/obj.c obj.c
+lexing.c: ../byterun/lexing.c
+	cp ../byterun/lexing.c lexing.c
 
 clean::
 	rm -f *.obj *.lib *~
diff --git a/byterun/.depend b/byterun/.depend
index e59057830..f68b85d1c 100644
--- a/byterun/.depend
+++ b/byterun/.depend
@@ -34,10 +34,12 @@ interp.o: interp.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
 ints.o: ints.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
  str.h
-io.o: io.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
+io.o: io.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
  mlvalues.h fail.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
  signals.h sys.h
-main.o: main.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
+lexing.o: lexing.c mlvalues.h config.h ../config/m.h ../config/s.h \
+ misc.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h str.h
+main.o: main.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
  mlvalues.h exec.h fail.h fix_code.h gc_ctrl.h interp.h intext.h io.h \
  minor_gc.h stacks.h memory.h gc.h major_gc.h freelist.h sys.h
 major_gc.o: major_gc.c config.h ../config/m.h ../config/s.h fail.h \
@@ -111,10 +113,12 @@ interp.d.o: interp.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
 ints.d.o: ints.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
  mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
  str.h
-io.d.o: io.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
+io.d.o: io.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
  mlvalues.h fail.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
  signals.h sys.h
-main.d.o: main.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
+lexing.d.o: lexing.c mlvalues.h config.h ../config/m.h ../config/s.h \
+ misc.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h str.h
+main.d.o: main.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
  mlvalues.h exec.h fail.h fix_code.h gc_ctrl.h interp.h intext.h io.h \
  minor_gc.h stacks.h memory.h gc.h major_gc.h freelist.h sys.h
 major_gc.d.o: major_gc.c config.h ../config/m.h ../config/s.h fail.h \
diff --git a/byterun/Makefile.nt b/byterun/Makefile.nt
index 179438526..ba55c2e9e 100644
--- a/byterun/Makefile.nt
+++ b/byterun/Makefile.nt
@@ -3,13 +3,14 @@
 CC=$(BYTECC)
 CFLAGS=$(BYTECCCOMPOPTS)
 
-OBJS=interp.obj misc.obj stacks.obj fix_code.obj main.obj fail.obj signals.obj \
-  freelist.obj major_gc.obj minor_gc.obj memory.obj alloc.obj roots.obj \
-  compare.obj ints.obj floats.obj str.obj array.obj io.obj extern.obj intern.obj \
-  hash.obj sys.obj meta.obj parsing.obj gc_ctrl.obj terminfo.obj md5.obj obj.obj
+OBJS=interp.obj misc.obj stacks.obj fix_code.obj main.obj fail.obj \
+  signals.obj freelist.obj major_gc.obj minor_gc.obj memory.obj alloc.obj \
+  roots.obj compare.obj ints.obj floats.obj str.obj array.obj io.obj \
+  extern.obj intern.obj hash.obj sys.obj meta.obj parsing.obj gc_ctrl.obj \
+  terminfo.obj md5.obj obj.obj lexing.obj
 
 PRIMS=array.c compare.c extern.c floats.c gc_ctrl.c hash.c \
-  intern.c interp.c ints.c io.c md5.c meta.c obj.c parsing.c \
+  intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c \
   signals.c str.c sys.c terminfo.c
 
 all: cslrun.exe
diff --git a/lex/Makefile.nt b/lex/Makefile.nt
index a6fc15aa7..bde5b466e 100644
--- a/lex/Makefile.nt
+++ b/lex/Makefile.nt
@@ -9,7 +9,7 @@ CAMLLEX=..\boot\cslrun ..\boot\csllex
 CAMLDEP=..\boot\cslrun ..\tools\csldep
 DEPFLAGS=
 
-OBJS=syntax.cmo parser.cmo lexer.cmo lexgen.cmo output.cmo main.cmo
+OBJS=parser.cmo lexer.cmo lexgen.cmo compact.cmo output.cmo main.cmo
 
 all: csllex