diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2010-01-20 16:26:46 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2010-01-20 16:26:46 +0000 |
| commit | bdc0fadee2dc9669818955486b4c3497016edda5 (patch) | |
| tree | 48047d836d903e84f7e0ae6d74613c2247c4fc81 /build | |
| parent | 8cd4fc63907a541d05f31a740632948d453f69f9 (diff) | |
| download | ocaml-bdc0fadee2dc9669818955486b4c3497016edda5.tar.gz | |
merge changes from release/3.11.1 to release/3.11.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9540 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'build')
| -rwxr-xr-x | build/boot-c-parts-windows.sh | 4 | ||||
| -rwxr-xr-x | build/install.sh | 3 | ||||
| -rwxr-xr-x | build/mkmyocamlbuild_config.sh | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/build/boot-c-parts-windows.sh b/build/boot-c-parts-windows.sh index 45193d338e..3e2ca3dc8e 100755 --- a/build/boot-c-parts-windows.sh +++ b/build/boot-c-parts-windows.sh @@ -13,7 +13,6 @@ set -ex mkdir -p _build/boot cp -f byterun/ocamlrun.exe \ byterun/libcamlrun.$A \ - byterun/ocamlrun.dll \ asmrun/libasmrun.$A \ yacc/ocamlyacc.exe \ boot/ocamlc \ @@ -21,5 +20,4 @@ cp -f byterun/ocamlrun.exe \ boot/ocamldep \ _build/boot mkdir -p _build/byterun -cp -f byterun/ocamlrun.exe byterun/ocamlrun.dll boot -cp -f byterun/ocamlrun.$A _build/byterun +cp -f byterun/ocamlrun.exe boot diff --git a/build/install.sh b/build/install.sh index 4c38740c53..2197069c5b 100755 --- a/build/install.sh +++ b/build/install.sh @@ -132,7 +132,6 @@ cd .. WIN32="" if [ "x$EXE" = "x.exe" ]; then installbin win32caml/ocamlwin.exe $PREFIX/OCamlWin.exe - installdir byterun/ocamlrun.dll $BINDIR WIN32=win32 fi @@ -140,7 +139,7 @@ installdir otherlibs/"$WIN32"unix/unixsupport.h \ otherlibs/bigarray/bigarray.h \ $LIBDIR/caml -installdir yacc/ocamlyacc byterun/ocamlrun $BINDIR +installdir yacc/ocamlyacc$EXE byterun/ocamlrun$EXE $BINDIR installdir config/Makefile $LIBDIR/Makefile.config installdir byterun/ld.conf $LIBDIR diff --git a/build/mkmyocamlbuild_config.sh b/build/mkmyocamlbuild_config.sh index e48f5b0e0b..9c7eebd3c3 100755 --- a/build/mkmyocamlbuild_config.sh +++ b/build/mkmyocamlbuild_config.sh @@ -19,6 +19,7 @@ cd `dirname $0`/.. sed \ -e 's/^.*FLEXDIR.*$//g' \ -e 's/^#ml \(.*\)/\1/' \ + -e 's/^\([^"][^"]*\("[^"]*"[^"]*\)*\)#.*$/\1/' \ -e 's/^\(#.*\)$/(* \1 *)/' \ -e 's/^\(.*\$([0-9]).*\)$/(* \1 *)/' \ -e 's/^\([^(=]*\)=\([^"]*\)$/let <:lower<\1>> = "\2";;/' \ |