Macintosh

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

6 files changed, 36 insertions, 40 deletions

diff --git a/Makefile.Mac b/Makefile.Mac
index 9aa9476c45..9523644d9a 100644
--- a/Makefile.Mac
+++ b/Makefile.Mac
@@ -16,7 +16,8 @@ INCLUDES = -I :utils: -I :parsing: -I :typing: -I :bytecomp: ¶
            -I :driver: -I :toplevel:
 
 UTILS = :utils:misc.cmo :utils:tbl.cmo :utils:config.cmo ¶
-        :utils:clflags.cmo :utils:terminfo.cmo :utils:ccomp.cmo
+        :utils:clflags.cmo :utils:terminfo.cmo :utils:ccomp.cmo ¶
+        :utils:warnings.cmo
 
 PARSING = :parsing:linenum.cmo :parsing:location.cmo :parsing:longident.cmo ¶
           :parsing:syntaxerr.cmo :parsing:pstream.cmo :parsing:parser.cmo ¶
@@ -396,6 +397,8 @@ alldepend ÄÄ
 
 maccaml Ä
     directory :maccaml:; domake all; directory ::
+partialclean ÄÄ
+    directory :maccaml:; domake partialclean; directory ::
 clean ÄÄ
     directory :maccaml:; domake clean; directory ::
 alldepend ÄÄ
diff --git a/Makefile.Mac.depend b/Makefile.Mac.depend
index 3915bfe3e8..ac0841d06e 100644
--- a/Makefile.Mac.depend
+++ b/Makefile.Mac.depend
@@ -14,7 +14,10 @@
 :utils:tbl.cmxÄ :utils:tbl.cmi 
 :utils:terminfo.cmoÄ :utils:terminfo.cmi 
 :utils:terminfo.cmxÄ :utils:terminfo.cmi 
+:utils:warnings.cmoÄ :utils:warnings.cmi 
+:utils:warnings.cmxÄ :utils:warnings.cmi 
 :parsing:lexer.cmiÄ :parsing:parser.cmi 
+:parsing:location.cmiÄ :utils:warnings.cmi 
 :parsing:parse.cmiÄ :parsing:parsetree.cmi 
 :parsing:parser.cmiÄ :parsing:parsetree.cmi 
 :parsing:parsetree.cmiÄ :parsing:asttypes.cmi :parsing:location.cmi ¶
@@ -26,9 +29,9 @@
 :parsing:linenum.cmoÄ :utils:misc.cmi :parsing:linenum.cmi 
 :parsing:linenum.cmxÄ :utils:misc.cmx :parsing:linenum.cmi 
 :parsing:location.cmoÄ :parsing:linenum.cmi :utils:terminfo.cmi ¶
-    :parsing:location.cmi 
+    :utils:warnings.cmi :parsing:location.cmi 
 :parsing:location.cmxÄ :parsing:linenum.cmx :utils:terminfo.cmx ¶
-    :parsing:location.cmi 
+    :utils:warnings.cmx :parsing:location.cmi 
 :parsing:longident.cmoÄ :utils:misc.cmi :parsing:longident.cmi 
 :parsing:longident.cmxÄ :utils:misc.cmx :parsing:longident.cmi 
 :parsing:parse.cmoÄ :parsing:lexer.cmi :parsing:location.cmi ¶
@@ -133,10 +136,10 @@
     :typing:ident.cmx :typing:path.cmx :typing:types.cmx :typing:mtype.cmi 
 :typing:parmatch.cmoÄ :parsing:asttypes.cmi :typing:ctype.cmi :typing:env.cmi ¶
     :parsing:location.cmi :utils:misc.cmi :typing:typedtree.cmi ¶
-    :typing:types.cmi :typing:parmatch.cmi 
+    :typing:types.cmi :utils:warnings.cmi :typing:parmatch.cmi 
 :typing:parmatch.cmxÄ :parsing:asttypes.cmi :typing:ctype.cmx :typing:env.cmx ¶
     :parsing:location.cmx :utils:misc.cmx :typing:typedtree.cmx ¶
-    :typing:types.cmx :typing:parmatch.cmi 
+    :typing:types.cmx :utils:warnings.cmx :typing:parmatch.cmi 
 :typing:path.cmoÄ :typing:ident.cmi :typing:path.cmi 
 :typing:path.cmxÄ :typing:ident.cmx :typing:path.cmi 
 :typing:predef.cmoÄ :typing:btype.cmi :typing:ident.cmi :typing:path.cmi ¶
@@ -163,26 +166,26 @@
     :typing:parmatch.cmi :parsing:parsetree.cmi :typing:path.cmi ¶
     :typing:predef.cmi :typing:printtyp.cmi :typing:typecore.cmi ¶
     :typing:typedtree.cmi :typing:types.cmi :typing:typetexp.cmi ¶
-    :typing:typeclass.cmi 
+    :utils:warnings.cmi :typing:typeclass.cmi 
 :typing:typeclass.cmxÄ :parsing:asttypes.cmi :typing:ctype.cmx ¶
     :typing:env.cmx :typing:ident.cmx :typing:includeclass.cmx ¶
     :parsing:location.cmx :parsing:longident.cmx :utils:misc.cmx ¶
     :typing:parmatch.cmx :parsing:parsetree.cmi :typing:path.cmx ¶
     :typing:predef.cmx :typing:printtyp.cmx :typing:typecore.cmx ¶
     :typing:typedtree.cmx :typing:types.cmx :typing:typetexp.cmx ¶
-    :typing:typeclass.cmi 
+    :utils:warnings.cmx :typing:typeclass.cmi 
 :typing:typecore.cmoÄ :parsing:asttypes.cmi :typing:btype.cmi ¶
     :typing:ctype.cmi :typing:env.cmi :typing:ident.cmi :parsing:location.cmi ¶
     :parsing:longident.cmi :utils:misc.cmi :typing:parmatch.cmi ¶
     :parsing:parsetree.cmi :typing:path.cmi :typing:predef.cmi ¶
     :typing:printtyp.cmi :typing:typedtree.cmi :typing:types.cmi ¶
-    :typing:typetexp.cmi :typing:typecore.cmi 
+    :typing:typetexp.cmi :utils:warnings.cmi :typing:typecore.cmi 
 :typing:typecore.cmxÄ :parsing:asttypes.cmi :typing:btype.cmx ¶
     :typing:ctype.cmx :typing:env.cmx :typing:ident.cmx :parsing:location.cmx ¶
     :parsing:longident.cmx :utils:misc.cmx :typing:parmatch.cmx ¶
     :parsing:parsetree.cmi :typing:path.cmx :typing:predef.cmx ¶
     :typing:printtyp.cmx :typing:typedtree.cmx :typing:types.cmx ¶
-    :typing:typetexp.cmx :typing:typecore.cmi 
+    :typing:typetexp.cmx :utils:warnings.cmx :typing:typecore.cmi 
 :typing:typedecl.cmoÄ :utils:config.cmi :typing:ctype.cmi :typing:env.cmi ¶
     :typing:ident.cmi :typing:includecore.cmi :parsing:location.cmi ¶
     :utils:misc.cmi :parsing:parsetree.cmi :typing:path.cmi ¶
@@ -398,10 +401,10 @@
     :driver:errors.cmi 
 :driver:main.cmoÄ :bytecomp:bytelibrarian.cmi :bytecomp:bytelink.cmi ¶
     :utils:clflags.cmo :driver:compile.cmi :utils:config.cmi ¶
-    :driver:errors.cmi :driver:main_args.cmi 
+    :driver:errors.cmi :driver:main_args.cmi :utils:warnings.cmi 
 :driver:main.cmxÄ :bytecomp:bytelibrarian.cmx :bytecomp:bytelink.cmx ¶
     :utils:clflags.cmx :driver:compile.cmx :utils:config.cmx ¶
-    :driver:errors.cmx :driver:main_args.cmx 
+    :driver:errors.cmx :driver:main_args.cmx :utils:warnings.cmx 
 :driver:main_args.cmoÄ :driver:main_args.cmi 
 :driver:main_args.cmxÄ :driver:main_args.cmi 
 :driver:optcompile.cmoÄ :utils:ccomp.cmi :utils:clflags.cmo :utils:config.cmi ¶
@@ -425,14 +428,14 @@
     :typing:typedecl.cmx :typing:typemod.cmx :typing:typetexp.cmx ¶
     :driver:opterrors.cmi 
 :driver:optmain.cmoÄ :utils:clflags.cmo :utils:config.cmi ¶
-    :driver:optcompile.cmi :driver:opterrors.cmi 
+    :driver:optcompile.cmi :driver:opterrors.cmi :utils:warnings.cmi 
 :driver:optmain.cmxÄ :utils:clflags.cmx :utils:config.cmx ¶
-    :driver:optcompile.cmx :driver:opterrors.cmx 
+    :driver:optcompile.cmx :driver:opterrors.cmx :utils:warnings.cmx 
 :toplevel:genprintval.cmiÄ :typing:env.cmi :typing:path.cmi :typing:types.cmi 
 :toplevel:printval.cmiÄ :typing:env.cmi :typing:path.cmi :typing:types.cmi 
 :toplevel:topdirs.cmiÄ :parsing:longident.cmi 
 :toplevel:toploop.cmiÄ :typing:env.cmi :parsing:location.cmi ¶
-    :parsing:longident.cmi :parsing:parsetree.cmi 
+    :parsing:longident.cmi :parsing:parsetree.cmi :utils:warnings.cmi 
 :toplevel:trace.cmiÄ :typing:env.cmi :parsing:longident.cmi :typing:path.cmi ¶
     :typing:types.cmi 
 :toplevel:expunge.cmoÄ :utils:config.cmi :typing:ident.cmi :utils:misc.cmi ¶
diff --git a/byterun/Makefile.Mac.depend b/byterun/Makefile.Mac.depend
index bd64d7f1f6..a18821d5c0 100644
--- a/byterun/Makefile.Mac.depend
+++ b/byterun/Makefile.Mac.depend
@@ -65,8 +65,7 @@
                             gc.h ¶
                             major_gc.h ¶
                             freelist.h ¶
-                            minor_gc.h ¶
-                            str.h
+                            minor_gc.h
 
 "debugger.c.x" Ä  debugger.c ¶
                              config.h ¶
@@ -102,8 +101,7 @@
                            major_gc.h ¶
                            freelist.h ¶
                            minor_gc.h ¶
-                           reverse.h ¶
-                           str.h
+                           reverse.h
 
 "fail.c.x" Ä  fail.c ¶
                          alloc.h ¶
@@ -186,8 +184,7 @@
                          gc.h ¶
                          major_gc.h ¶
                          freelist.h ¶
-                         minor_gc.h ¶
-                         str.h
+                         minor_gc.h
 
 "instrtrace.c.x" Ä  instrtrace.c ¶
                                instruct.h ¶
@@ -236,7 +233,6 @@
                            prims.h ¶
                            signals.h ¶
                            stacks.h ¶
-                           str.h ¶
                            rotatecursor.h
 
 "ints.c.x" Ä  ints.c ¶
@@ -250,8 +246,7 @@
                          gc.h ¶
                          major_gc.h ¶
                          freelist.h ¶
-                         minor_gc.h ¶
-                         str.h
+                         minor_gc.h
 
 "io.c.x" Ä  io.c ¶
                        config.h ¶
@@ -281,8 +276,7 @@
                            gc.h ¶
                            major_gc.h ¶
                            freelist.h ¶
-                           minor_gc.h ¶
-                           str.h
+                           minor_gc.h
 
 "macintosh.c.x" Ä  macintosh.c
 
@@ -508,7 +502,6 @@
                         major_gc.h ¶
                         freelist.h ¶
                         minor_gc.h ¶
-                        str.h ¶
                         sys.h ¶
                         ui.h
 
@@ -603,8 +596,7 @@
                             gc.h ¶
                             major_gc.h ¶
                             freelist.h ¶
-                            minor_gc.h ¶
-                            str.h
+                            minor_gc.h
 
 "debugger.c.o" Ä  debugger.c ¶
                              config.h ¶
@@ -640,8 +632,7 @@
                            major_gc.h ¶
                            freelist.h ¶
                            minor_gc.h ¶
-                           reverse.h ¶
-                           str.h
+                           reverse.h
 
 "fail.c.o" Ä  fail.c ¶
                          alloc.h ¶
@@ -724,8 +715,7 @@
                          gc.h ¶
                          major_gc.h ¶
                          freelist.h ¶
-                         minor_gc.h ¶
-                         str.h
+                         minor_gc.h
 
 "instrtrace.c.o" Ä  instrtrace.c ¶
                                instruct.h ¶
@@ -774,7 +764,6 @@
                            prims.h ¶
                            signals.h ¶
                            stacks.h ¶
-                           str.h ¶
                            rotatecursor.h
 
 "ints.c.o" Ä  ints.c ¶
@@ -788,8 +777,7 @@
                          gc.h ¶
                          major_gc.h ¶
                          freelist.h ¶
-                         minor_gc.h ¶
-                         str.h
+                         minor_gc.h
 
 "io.c.o" Ä  io.c ¶
                        config.h ¶
@@ -819,8 +807,7 @@
                            gc.h ¶
                            major_gc.h ¶
                            freelist.h ¶
-                           minor_gc.h ¶
-                           str.h
+                           minor_gc.h
 
 "macintosh.c.o" Ä  macintosh.c
 
@@ -1046,7 +1033,6 @@
                         major_gc.h ¶
                         freelist.h ¶
                         minor_gc.h ¶
-                        str.h ¶
                         sys.h ¶
                         ui.h
 
diff --git a/maccaml/.cvsignore b/maccaml/.cvsignore
index 526a7806f0..b45a87e680 100644
--- a/maccaml/.cvsignore
+++ b/maccaml/.cvsignore
@@ -3,6 +3,7 @@ stdlib
 primitives
 prims.c
 Objective*Caml
+Objective*Caml.xcoff
 OCaml.68k
 OCaml.PPC
 OCaml.bytecode
diff --git a/maccaml/Makefile.Mac b/maccaml/Makefile.Mac
index f9137d9fcf..f37d0d1464 100644
--- a/maccaml/Makefile.Mac
+++ b/maccaml/Makefile.Mac
@@ -68,7 +68,7 @@ OCaml.PPC Ä {PPCOBJS}
 
 OCaml.bytecode Ä primitives ::toplevellib.cma ::toplevel:topmain.cmo ¶
                  ::otherlibs:graph:graphics.cma 
-    ::byterun:ocamlrun ::ocamlc -linkall -use_prims primitives ¶
+    ::byterun:ocamlrun ::ocamlc -I ::stdlib: -linkall -use-prims primitives ¶
        ::toplevellib.cma ::otherlibs:graph:graphics.cma ::toplevel:topmain.cmo ¶
        -o OCaml.bytecode
     mergefragment -c -t Caml OCaml.bytecode
@@ -83,6 +83,9 @@ appli ÄÄ ocaml.r OCaml.bytecode OCaml.PPC OCaml.68k
 install Ä
     duplicate -y "Objective Caml" "{APPLIDIR}"
 
+partialclean Ä
+    delete -i OCaml.bytecode "Objective Caml"
+
 clean Ä
     delete -i {OBJS} {PPCOBJS} OCaml.68k OCaml.PPC OCaml.bytecode ¶
               "Objective Caml" primitives prims.c
diff --git a/tools/Makefile.Mac b/tools/Makefile.Mac
index 19f8647b2e..b8401efaac 100644
--- a/tools/Makefile.Mac
+++ b/tools/Makefile.Mac
@@ -49,7 +49,7 @@ beforedepend ÄÄ ocamldep
 # To make custom toplevels
 
 install ÄÄ
-    duplicate -y ocamlmktop "{BINDIR}ocamlmktop"
+    duplicate -y ocamlmktop.tpl "{BINDIR}ocamlmktop"
     duplicate -y ocamlc-custom "{BINDIR}ocamlc-custom"
 
 # The bytecode disassembler