diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rwxr-xr-x | boot/myocamlbuild.boot | bin | 349284 -> 349493 bytes | |||
| -rwxr-xr-x | build/install.sh | 2 | ||||
| -rw-r--r-- | build/otherlibs-targets.sh | 3 | ||||
| -rw-r--r-- | myocamlbuild.ml | 12 | ||||
| -rw-r--r-- | otherlibs/unix/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/win32unix/Makefile.nt | 2 | ||||
| -rw-r--r-- | tools/.cvsignore | 2 |
8 files changed, 21 insertions, 4 deletions
diff --git a/.cvsignore b/.cvsignore index 413f278436..0df4651a22 100644 --- a/.cvsignore +++ b/.cvsignore @@ -12,3 +12,5 @@ ocamlcompopt.sh package-macosx .DS_Store *.annot +_build +_log diff --git a/boot/myocamlbuild.boot b/boot/myocamlbuild.boot Binary files differindex f8202b4d9f..d59c189a83 100755 --- a/boot/myocamlbuild.boot +++ b/boot/myocamlbuild.boot diff --git a/build/install.sh b/build/install.sh index 673e35f3ae..4524dd155e 100755 --- a/build/install.sh +++ b/build/install.sh @@ -109,6 +109,8 @@ for i in $PUBLIC_INCLUDES; do done cd .. +installdir otherlibs/{win32,}unix/unixsupport.h $LIBDIR/caml + installdir byterun/ocamlrun.dll yacc/ocamlyacc byterun/ocamlrun $BINDIR installdir byterun/ld.conf $LIBDIR diff --git a/build/otherlibs-targets.sh b/build/otherlibs-targets.sh index 46eafbd48c..b71eb4b0f4 100644 --- a/build/otherlibs-targets.sh +++ b/build/otherlibs-targets.sh @@ -97,6 +97,9 @@ for lib in $OTHERLIBRARIES; do UNIXDIR="otherlibs/win32unix" add_file unixsupport.h cst2constr.h socketaddr.h add unix;; + unix) + add_file unixsupport.h + add unix;; *) add $lib esac diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 371e8240df..32845ecc2e 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -511,6 +511,16 @@ rule "tools/opnames.ml" byterun/instruct.h > tools/opnames.ml") end;; +(* The version number *) +rule "stdlib/sys.ml" + ~prod:"stdlib/sys.ml" + ~deps:["stdlib/sys.mlp"; "VERSION"] + begin fun _ _ -> + Seq [rm_f "stdlib/sys.ml"; + Cmd (Sh"sed -e\"s|%%VERSION%%|`head -1 VERSION`|\" stdlib/sys.mlp >stdlib/sys.ml"); + chmod (A"-w") "stdlib/sys.ml"] + end;; + (* The predefined exceptions and primitives *) rule "camlheader" @@ -972,4 +982,4 @@ copy_rule "ocamlbrowser dummy module" end in () | _ -> () -end
\ No newline at end of file +end diff --git a/otherlibs/unix/Makefile b/otherlibs/unix/Makefile index 15f947fe7b..97f7d2ada4 100644 --- a/otherlibs/unix/Makefile +++ b/otherlibs/unix/Makefile @@ -70,7 +70,7 @@ install: cp libunix.a $(LIBDIR)/libunix.a cd $(LIBDIR); $(RANLIB) libunix.a cp unix.cma $(MLOBJS:.cmo=.cmi) $(MLOBJS:.cmo=.mli) $(LIBDIR) - cp unixsupport.h $(LIBDIR) + cp unixsupport.h $(LIBDIR)/caml installopt: cp $(MLOBJS:.cmo=.cmx) unix.cmxa unix.a $(LIBDIR) diff --git a/otherlibs/win32unix/Makefile.nt b/otherlibs/win32unix/Makefile.nt index 6f15bf7c56..6c473329f3 100644 --- a/otherlibs/win32unix/Makefile.nt +++ b/otherlibs/win32unix/Makefile.nt @@ -83,7 +83,7 @@ install: cp dllunix.dll $(STUBLIBDIR)/dllunix.dll cp libunix.$(A) $(LIBDIR)/libunix.$(A) cp $(CAML_OBJS:.cmo=.cmi) unix.cma $(CAML_OBJS:.cmo=.mli) $(LIBDIR) - cp unixsupport.h $(LIBDIR) + cp unixsupport.h $(LIBDIR)/caml installopt: cp unix.cmxa $(CAML_OBJS:.cmo=.cmx) unix.$(A) $(LIBDIR) diff --git a/tools/.cvsignore b/tools/.cvsignore index 1aa5013d57..da394be959 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -19,4 +19,4 @@ ocamlmklib.ml lexer301.ml scrapelabels addlabels - +myocamlbuild_config.ml |