build,sys: improve the mixed build mode

- Rename this partial mode as a mixed mode.
- Use a file (build/ocamlbuild_mixed_mode) instead of an
  env var.
- Add a check when switching from mixed to non-mixed mode.


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

9 files changed, 18 insertions, 18 deletions

diff --git a/build/camlp4-byte-only.sh b/build/camlp4-byte-only.sh
index 1b2e359966..ab21fd3495 100755
--- a/build/camlp4-byte-only.sh
+++ b/build/camlp4-byte-only.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 # $Id$
 set -e
-OCAMLBUILD_PARTIAL="true"
-export OCAMLBUILD_PARTIAL
 cd `dirname $0`/..
 . build/targets.sh
 set -x
-$OCAMLBUILD $@ byte_stdlib_partial_mode $OCAMLC_BYTE $OCAMLLEX_BYTE $CAMLP4_BYTE
+$OCAMLBUILD $@ byte_stdlib_mixed_mode $OCAMLC_BYTE $OCAMLLEX_BYTE $CAMLP4_BYTE
diff --git a/build/camlp4-native-only.sh b/build/camlp4-native-only.sh
index 638aba9818..42d615880e 100755
--- a/build/camlp4-native-only.sh
+++ b/build/camlp4-native-only.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 # $Id$
 set -e
-OCAMLBUILD_PARTIAL="true"
-export OCAMLBUILD_PARTIAL
 cd `dirname $0`/..
 . build/targets.sh
 set -x
-$OCAMLBUILD $@ native_stdlib_partial_mode $OCAMLOPT_BYTE $OCAMLLEX_BYTE $CAMLP4_NATIVE
+$OCAMLBUILD $@ native_stdlib_mixed_mode $OCAMLOPT_BYTE $OCAMLLEX_BYTE $CAMLP4_NATIVE
diff --git a/build/distclean.sh b/build/distclean.sh
index 1a88138d85..b3efb3ab93 100755
--- a/build/distclean.sh
+++ b/build/distclean.sh
@@ -19,6 +19,7 @@ set -ex
 (cd byterun && make clean) || :
 (cd asmrun && make clean)  || :
 (cd yacc && make clean)    || :
+rm -f build/ocamlbuild_mixed_mode
 rm -rf _build
 rm -f boot/ocamlrun boot/ocamlrun.exe boot/camlheader \
       boot/myocamlbuild boot/myocamlbuild.native boot/myocamlbuild.native.exe \
diff --git a/build/fastworld.sh b/build/fastworld.sh
index 59e093a197..325af89db1 100755
--- a/build/fastworld.sh
+++ b/build/fastworld.sh
@@ -2,6 +2,11 @@
 # $Id$
 cd `dirname $0`
 set -e
+if [ -e ocamlbuild_mixed_mode ]; then
+  echo ocamlbuild mixed mode detected
+  echo 'please cleanup and re-launch (make clean ; ./build/distclean.sh)'
+  exit 1
+fi
 ./mkconfig.sh
 ./mkmyocamlbuild_config.sh
 . ../config/config.sh
diff --git a/build/partial-boot.sh b/build/mixed-boot.sh
index ee6676eadb..9e9a4bc81c 100755
--- a/build/partial-boot.sh
+++ b/build/mixed-boot.sh
@@ -16,8 +16,7 @@
 
 set -ex
 cd `dirname $0`/..
-OCAMLBUILD_PARTIAL="true"
-export OCAMLBUILD_PARTIAL
+touch build/ocamlbuild_mixed_mode
 mkdir -p _build
 cp -rf boot _build/
 ./build/mkconfig.sh
diff --git a/build/ocamlbuild-byte-only.sh b/build/ocamlbuild-byte-only.sh
index 87e7ba3a05..8b010142fc 100755
--- a/build/ocamlbuild-byte-only.sh
+++ b/build/ocamlbuild-byte-only.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 # $Id$
 set -e
-OCAMLBUILD_PARTIAL="true"
-export OCAMLBUILD_PARTIAL
 cd `dirname $0`/..
 . build/targets.sh
 set -x
-$OCAMLBUILD $@ byte_stdlib_partial_mode $OCAMLC_BYTE $OCAMLLEX_BYTE $OCAMLBUILD_BYTE
+$OCAMLBUILD $@ byte_stdlib_mixed_mode $OCAMLC_BYTE $OCAMLLEX_BYTE $OCAMLBUILD_BYTE
diff --git a/build/ocamlbuild-native-only.sh b/build/ocamlbuild-native-only.sh
index 03d93edc1c..823964a7c7 100755
--- a/build/ocamlbuild-native-only.sh
+++ b/build/ocamlbuild-native-only.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 # $Id$
 set -e
-OCAMLBUILD_PARTIAL="true"
-export OCAMLBUILD_PARTIAL
 cd `dirname $0`/..
 . build/targets.sh
 set -x
-$OCAMLBUILD $@ native_stdlib_partial_mode $OCAMLOPT_BYTE $OCAMLLEX_BYTE $OCAMLBUILD_NATIVE
+$OCAMLBUILD $@ native_stdlib_mixed_mode $OCAMLOPT_BYTE $OCAMLLEX_BYTE $OCAMLBUILD_NATIVE
diff --git a/build/ocamlbuildlib-native-only.sh b/build/ocamlbuildlib-native-only.sh
index b603bc57d2..7afdf72511 100755
--- a/build/ocamlbuildlib-native-only.sh
+++ b/build/ocamlbuildlib-native-only.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 # $Id$
 set -e
-OCAMLBUILD_PARTIAL="true"
-export OCAMLBUILD_PARTIAL
 cd `dirname $0`/..
 . build/targets.sh
 set -x
-$OCAMLBUILD $@ native_stdlib_partial_mode $OCAMLOPT_BYTE $OCAMLLEX_BYTE $OCAMLBUILDLIB_NATIVE
+$OCAMLBUILD $@ native_stdlib_mixed_mode $OCAMLOPT_BYTE $OCAMLLEX_BYTE $OCAMLBUILDLIB_NATIVE
diff --git a/build/world.sh b/build/world.sh
index 1acf2b5944..2ae1f72fb9 100755
--- a/build/world.sh
+++ b/build/world.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
 # $Id$
 cd `dirname $0`
-set -ex
+set -e
+if [ -e ocamlbuild_mixed_mode ]; then
+  echo ocamlbuild mixed mode detected
+  echo 'please cleanup and re-launch (make clean ; ./build/distclean.sh)'
+  exit 1
+fi
 ./mkconfig.sh
 ./mkmyocamlbuild_config.sh
 . ../config/config.sh