Mac OS 9

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

5 files changed, 18 insertions, 10 deletions

diff --git a/Changes b/Changes
index 60ac391cca..05a2be2120 100644
--- a/Changes
+++ b/Changes
@@ -111,6 +111,10 @@ Tools:
 Win32 port:
 - Unix.waitpid now implements the WNOHANG option.
 
+Mac OS ports:
+- Mac OS X public beta is supported.
+- Int64.format works on Mac OS 8/9.
+
 
 Objective Caml 3.00:
 --------------------
diff --git a/INSTALL.MPW b/INSTALL.MPW
index e01a01d5cb..26fd57baa1 100644
--- a/INSTALL.MPW
+++ b/INSTALL.MPW
@@ -12,12 +12,11 @@
 
 # PREREQUISITES
 
-# You need MPW 3.5 (with MrC) and Universal Interfaces version 3.3
+# You need MPW 3.5 (with MrC) and Universal Interfaces version 3.3.2
 # You need ToolServer (which comes with MPW by default).
 # You need WASTE version 1.3
-# To use the Unix emulation library "macosunix" in the standalone
-# application, you also need:
-# + GUSI version 2.0.6
+# You also need:
+# + GUSI version 2.1.5
 # + SFIO version 04Aug99
 #
 # MPW is available from Apple's FTP site at:
@@ -26,7 +25,7 @@
 # WASTE 1.3 is available from:
 # <ftp://ftp.boingo.com/dan/WASTE/>
 #
-# GUSI 2.0.6 and SFIO 04Aug99 are available from:
+# GUSI 2.1.5 and SFIO 04Aug99 are available from:
 # <ftp://sunsite.cnlab-switch.ch/software/platform/macos/src/mw_c/>
 
 
@@ -39,6 +38,10 @@
 # Before you start, you should put the WASTE 1.3 distribution folder
 # into the :maccaml:WASTE: folder.
 
+# You also need to install GUSI and SFIO (follow their installation
+# procedures).
+
+
 # Go to the directory where you found this file.
 
 Directory "`echo "{active}" | streamedit -e '1 replace /[Â:]*°/ ""'`"
@@ -96,7 +99,6 @@ begin
   DoMake world
   DoMake bootstrap
   DoMake install
-  DoMake clean
 end ·· "{worksheet}"
 
 # If you want syntax coloring in MPW Shell, use ResEdit to copy the
diff --git a/config/config.Mac b/config/config.Mac
index 86ef02aad8..39ec2da93b 100644
--- a/config/config.Mac
+++ b/config/config.Mac
@@ -36,11 +36,12 @@ set -e APPLIDIR "{mpw}:OCaml-distrib:"
 #       bigarray        Statically-allocated arrays
 #       dynlink         Dynamic linking of bytecode
 #       graph           Graphics (for the standalone application only)
-#       macosunix       Unix emulation (application only)
+#       macosunix       Unix emulation (application only, needs GUSI)
 #       num             Arbitrary-precision rational arithmetic
 #       str             Regular expressions and high-level string processing
-#       systhreads      Lightweight processes
+#       systhreads      Lightweight processes (application only, needs GUSI)
 #
+# You need all of them to build the standalone application.
 set -e OTHERLIBRARIES "bigarray dynlink graph macosunix num str systhreads"
 
 
@@ -67,7 +68,7 @@ set -e NATIVECC MrC
 ############# Version numbers (do not change)
 
 set -e OCAMLMAJOR 3
-set -e OCAMLMINOR "00"
+set -e OCAMLMINOR "01"
 set -e MAJOR 1
 set -e MINOR 0
 set -e BUGFIX 0
diff --git a/config/m-MacOS.h b/config/m-MacOS.h
index 54e1e1d3b6..16f43a0215 100644
--- a/config/m-MacOS.h
+++ b/config/m-MacOS.h
@@ -21,6 +21,7 @@
 #if powerc
 #define ARCH_INT64_TYPE long long
 #define ARCH_UINT64_TYPE unsigned long long
+#define ARCH_INT64_PRINTF_FORMAT "ll"
 #endif
 
 #if powerc
diff --git a/maccaml/Makefile.Mac b/maccaml/Makefile.Mac
index 7cb037258e..513429f0b7 100644
--- a/maccaml/Makefile.Mac
+++ b/maccaml/Makefile.Mac
@@ -19,7 +19,7 @@
 VERSIONSTR = ¶
   "¶"{OCAMLMAJOR}.{OCAMLMINOR}/Mac{MAJOR}.{MINOR}.{BUGFIX}{STAGE}{REV}¶""
 
-COPYRIGHTSTR = "¶"Copyright 1991-2000 INRIA¶""
+COPYRIGHTSTR = "¶"Copyright 1991-2001 INRIA¶""
 
 XIncludes = -i ::byterun:,::config: ¶
             -i ":WASTE:WASTE 1.3 Distribution:WASTE C/C++ Headers:" ¶