diff options
| author | Nicolas Pouillard <np@nicolaspouillard.fr> | 2007-02-26 16:32:47 +0000 |
|---|---|---|
| committer | Nicolas Pouillard <np@nicolaspouillard.fr> | 2007-02-26 16:32:47 +0000 |
| commit | 9286d93c3371194d0bae3f24c599458968f5ef76 (patch) | |
| tree | 04516bbbdca4d7df89047c74011a97c73eaa1369 /build | |
| parent | 0105c80c6aadd2de226e89c3f5f638c9afb1f01f (diff) | |
| download | ocaml-9286d93c3371194d0bae3f24c599458968f5ef76.tar.gz | |
[Camlp4] handle externals properly and fix the bootstrap system
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7929 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'build')
| -rwxr-xr-x | build/camlp4-bootstrap.sh | 8 | ||||
| -rwxr-xr-x | build/install.sh | 1 | ||||
| -rwxr-xr-x | build/myocamlbuild.sh | 2 | ||||
| -rwxr-xr-x | build/partial-install.sh | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/build/camlp4-bootstrap.sh b/build/camlp4-bootstrap.sh index 6b1b6d7fae..e1458475ee 100755 --- a/build/camlp4-bootstrap.sh +++ b/build/camlp4-bootstrap.sh @@ -6,9 +6,15 @@ TMPTARGETS="\ camlp4/boot/Lexer.ml" TARGETS="\ + camlp4/Camlp4/Struct/Camlp4Ast.ml \ camlp4/boot/Camlp4.ml \ camlp4/boot/camlp4boot.ml" +for target in $TARGETS camlp4/boot/Camlp4Ast.ml; do + [ -f "$target" ] && mv "$target" "$target.old" + rm -f "_build/$target" +done + if [ -x ./boot/myocamlbuild.native ]; then OCAMLBUILD=./boot/myocamlbuild.native else @@ -18,5 +24,5 @@ $OCAMLBUILD $TMPTARGETS $TARGETS for t in $TARGETS; do echo promote $t - cp _build/$t $t + cp _build/$t camlp4/boot/`basename $t` done diff --git a/build/install.sh b/build/install.sh index 52fe38c4af..5a640ebf60 100755 --- a/build/install.sh +++ b/build/install.sh @@ -436,6 +436,7 @@ echo "Installing camlp4..." installbin camlp4/camlp4prof.byte$EXE $BINDIR/camlp4prof$EXE installbin camlp4/mkcamlp4.byte$EXE $BINDIR/mkcamlp4$EXE installbin camlp4/camlp4.byte$EXE $BINDIR/camlp4$EXE +installbin camlp4/camlp4boot.byte$EXE $BINDIR/camlp4boot$EXE installbin camlp4/camlp4o.byte$EXE $BINDIR/camlp4o$EXE installbin camlp4/camlp4of.byte$EXE $BINDIR/camlp4of$EXE installbin camlp4/camlp4oof.byte$EXE $BINDIR/camlp4oof$EXE diff --git a/build/myocamlbuild.sh b/build/myocamlbuild.sh index a219bdce76..f75718018c 100755 --- a/build/myocamlbuild.sh +++ b/build/myocamlbuild.sh @@ -10,7 +10,7 @@ if [ ! -x _build/ocamlbuild/ocamlbuildlight.byte ]; then fi rm -rf _build/myocamlbuild boot/myocamlbuild boot/myocamlbuild.native ./boot/ocamlrun _build/ocamlbuild/ocamlbuildlight.byte -no-hygiene \ - -install-dir _build/ocamlbuild -byte-plugin -just-plugin + -tag debug -install-dir _build/ocamlbuild -byte-plugin -just-plugin cp _build/myocamlbuild boot/myocamlbuild.boot # cp boot/myocamlbuild boot/myocamlbuild.boot # rm -f boot/myocamlbuild.boot diff --git a/build/partial-install.sh b/build/partial-install.sh index f69e6f0f1f..67ee23f017 100755 --- a/build/partial-install.sh +++ b/build/partial-install.sh @@ -99,6 +99,7 @@ echo "Installing camlp4..." installbin camlp4/camlp4prof.byte$EXE $BINDIR/camlp4prof$EXE installbin camlp4/mkcamlp4.byte$EXE $BINDIR/mkcamlp4$EXE installbin camlp4/camlp4.byte$EXE $BINDIR/camlp4$EXE +installbin camlp4/camlp4boot.byte$EXE $BINDIR/camlp4boot$EXE installbin camlp4/camlp4o.byte$EXE $BINDIR/camlp4o$EXE installbin camlp4/camlp4of.byte$EXE $BINDIR/camlp4of$EXE installbin camlp4/camlp4oof.byte$EXE $BINDIR/camlp4oof$EXE |