ajout VERSION + cvsignore

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

.cvsignore

@@ -12,3 +12,5 @@ ocamlcompopt.sh
 package-macosx
 .DS_Store
 *.annot
+_build
+_log

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

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

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
+end

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)

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)

tools/.cvsignore

@@ -19,4 +19,4 @@ ocamlmklib.ml
 lexer301.ml
 scrapelabels
 addlabels
-
+myocamlbuild_config.ml