Index: VERSION
===================================================================
--- VERSION	(.../vendor/ocaml/3.12.1)	(revision 653)
+++ VERSION	(.../trunk/ocamlxsim)	(revision 653)
@@ -1,4 +1,4 @@
-3.12.1
+3.12.1+xsim4
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli
Index: tools/make-package-macosx
===================================================================
--- tools/make-package-macosx	(.../vendor/ocaml/3.12.1)	(revision 653)
+++ tools/make-package-macosx	(.../trunk/ocamlxsim)	(revision 653)
@@ -30,9 +30,9 @@
           <key>IFPkgDescriptionDeleteWarning</key>
           <string></string>
           <key>IFPkgDescriptionDescription</key>
-          <string>The Objective Caml compiler and tools</string>
+          <string>The Objective Caml compiler and tools for iOS Simulator</string>
           <key>IFPkgDescriptionTitle</key>
-          <string>Objective Caml</string>
+          <string>Objective Caml for iOS Simulator</string>
           <key>IFPkgDescriptionVersion</key>
           <string>${VERSION}</string>
   </dict>
@@ -46,11 +46,11 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>Objective Caml ${VERSION}</string>
+        <string>Objective Caml ${VERSION} for iOS Simulator</string>
         <key>CFBundleIdentifier</key>
-        <string>fr.inria.ocaml</string>
+        <string>com.psellos.ocamlxsim</string>
         <key>CFBundleName</key>
-        <string>Objective Caml</string>
+        <string>Objective Caml for iOS Simulator</string>
         <key>CFBundleShortVersionString</key>
         <string>${VERSION}</string>
         <key>IFMajorVersion</key>
@@ -62,7 +62,7 @@
         <key>IFPkgFlagAuthorizationAction</key>
         <string>AdminAuthorization</string>
         <key>IFPkgFlagDefaultLocation</key>
-        <string>/usr/local</string>
+        <string>/usr/local/ocamlxsim</string>
         <key>IFPkgFlagInstallFat</key>
         <false/>
         <key>IFPkgFlagIsRequired</key>
@@ -72,7 +72,7 @@
         <key>IFPkgFlagRestartAction</key>
         <string>NoRestart</string>
         <key>IFPkgFlagRootVolumeOnly</key>
-        <true/>
+        <false/>
         <key>IFPkgFlagUpdateInstalledLanguages</key>
         <false/>
         <key>IFPkgFormatVersion</key>
@@ -85,22 +85,22 @@
 
 #                                         stop here -> |
 cat >resources/ReadMe.txt <<EOF
-This package installs Objective Caml version ${VERSION}.
-You need Mac OS X 10.5.x (Leopard), with the
-XCode tools installed (v3.1.1 or later), and
-optionally X11.
+This package installs Objective Caml version ${VERSION},
+for cross compiling to the iOS Simulator.
+You need Mac OS X 10.7.x (Lion) or later, with the
+XCode tools (v4.2 or later) installed.
 
 Files will be installed in the following directories:
 
-/usr/local/bin - command-line executables
-/usr/local/lib/ocaml - library and support files
-/usr/local/man - manual pages
+/usr/local/ocamlxsim/bin - command-line executables
+/usr/local/ocamlxsim/lib/ocaml - lib and support files
+/usr/local/ocamlxsim/man - manual pages
 EOF
 
 chmod -R g-w root
 sudo chown -R root:wheel root
 
-/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker \
+/Developer/Applications/Auxiliary\ Tools/PackageMaker.app/Contents/MacOS/PackageMaker \
   -build -p "`pwd`/ocaml.pkg" -f "`pwd`/root" -i "`pwd`/Info.plist" \
   -d "`pwd`/Description.plist" -r "`pwd`/resources"
 

Index: xsim-build
===================================================================
--- xsim-build	(.../vendor/ocaml/3.12.1)	(revision 0)
+++ xsim-build	(.../trunk/ocamlxsim)	(revision 653)
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# Build OCamlXSim compiler based on OCaml 3.12.1
+#
+# Jeffrey Scofield, jeffsco@psellos.com
+#
+# OCaml on iOS resources: http://psellos.com/ocaml/
+#
+# Expects one parameter:
+# Single big step:  all
+# Medium steps:     phase1           phase2
+# Small steps:      config1  build1  config2  build2
+
+export PLT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
+export SDK=/Developer/SDKs/iPhoneSimulator5.1.sdk
+export XSIMTARGET=/usr/local/ocamlxsim
+
+# Small steps
+config1 () {
+    ./configure \
+            -bindir $XSIMTARGET/bin \
+            -libdir $XSIMTARGET/lib/ocaml \
+            -mandir $XSIMTARGET/man/man1 \
+            -no-curses \
+            -no-tk \
+            -host i386-apple-darwin11.3.0 \
+            -cc "gcc -arch i386" \
+            -as "gcc -arch i386 -c" \
+            -aspp "gcc -arch i386 -c"
+}
+
+build1 () {
+    make world && make opt
+}
+
+config2 () {
+    # Clean out OS X runtime
+    cd asmrun; make clean; cd ..
+    cd stdlib; make clean; cd ..
+    cd otherlibs/bigarray; make clean; cd ../..
+    cd otherlibs/dbm; make clean; cd ../..
+    cd otherlibs/dynlink; make clean; cd ../..
+    cd otherlibs/graph; make clean; cd ../..
+    cd otherlibs/labltk; make clean; cd ../..
+    cd otherlibs/num; make clean; cd ../..
+    cd otherlibs/str; make clean; cd ../..
+    cd otherlibs/systhreads; make clean; cd ../..
+    cd otherlibs/threads; make clean; cd ../..
+    cd otherlibs/unix; make clean; cd ../..
+    # Reconfigure for Simulator environment
+    ./configure \
+            -bindir $XSIMTARGET/bin \
+            -libdir $XSIMTARGET/lib/ocaml \
+            -mandir $XSIMTARGET/man/man1 \
+            -no-curses \
+            -no-tk \
+            -host i386-apple-darwin11.3.0 \
+            -cc "gcc -arch i386 -isysroot $PLT$SDK" \
+            -as "gcc -arch i386 -c" \
+            -aspp "gcc -arch i386 -c" \
+            -lib "-Wl,-syslibroot,$PLT$SDK"
+}
+
+build2 () {
+    # Make Simulator runtime
+    cd asmrun; make all; cd ..
+    cd stdlib; make all allopt; cd ..
+    cd otherlibs/unix; make all allopt; cd ../..
+    cd otherlibs/str; make all allopt; cd ../..
+    cd otherlibs/num; make all allopt; cd ../..
+    cd otherlibs/dynlink; make all allopt; cd ../..
+    cd otherlibs/bigarray; make all allopt; cd ../..
+    cd otherlibs/systhreads; make all allopt; cd ../..
+    cd otherlibs/threads; make all allopt; cd ../..
+    cd otherlibs/graph; make all allopt; cd ../..
+    cd otherlibs/dbm; make all allopt; cd ../..
+}
+
+# Bigger steps
+
+phase1 () {
+    config1 && build1
+}
+
+phase2 () {
+    config2 && build2
+}
+
+all () {
+    phase1 && phase2
+}
+
+case "$1" in
+config1) config1 ;;
+build1) build1 ;;
+config2) config2 ;;
+build2) build2 ;;
+phase1) phase1 ;;
+phase2) phase2 ;;
+all) all ;;
+*) echo "usage: $(basename $0) {all|phase1|phase2|config1|build1|config2|build2}" >&2; exit 1 ;;
+esac

Index: Makefile
===================================================================
--- Makefile	(.../vendor/ocaml/3.12.1)	(revision 653)
+++ Makefile	(.../trunk/ocamlxsim)	(revision 653)
@@ -721,7 +721,10 @@
 
 package-macosx:
 	sudo rm -rf package-macosx/root
-	make PREFIX="`pwd`"/package-macosx/root install
+	make BINDIR="`pwd`"/package-macosx/root/bin \
+             LIBDIR="`pwd`"/package-macosx/root/lib/ocaml \
+             MANDIR="`pwd`"/package-macosx/root/man \
+             install
 	tools/make-package-macosx
 	sudo rm -rf package-macosx/root