Update for 4.01 and new version of ocp-build

Author: lefessan

Makefile

@@ -2,7 +2,7 @@
 
 all: Makefile.config
 	$(MAKE) -C cmicomp
-	ocp-build -scan try-make-lessons
+	ocp-build build try-make-lessons
 	$(MAKE) -C try-ocaml
 	$(MAKE) -C try-js_of_ocaml
 

Makefile.tryocaml

@@ -9,7 +9,7 @@ all: lessons.ml byte
 
 clean:
 	rm -f *~ $(SOURCES) $(TRYOCAML_NAME).tmp  $(TRYOCAML_NAME).js
-	ocp-build -clean
+	ocp-build clean
 
 lessons.mli: $(TUTORIAL_DIR)/lessons.mli
 	cp -f  $(TUTORIAL_DIR)/lessons.mli lessons.mli

configure

@@ -1,13 +1,16 @@
 #!/bin/sh
 echo Generating Makefile.config
 
+ocp-build init
+ocp-build configure
+
 echo OCAMLC=ocamlc > Makefile.config.temp
 echo OCAMLDEP=ocamldep.opt >> Makefile.config.temp
-echo OCAMLVNUM=`ocamlc -version` >> Makefile.config.temp
-echo JS_DIR=`ocp-build -configure -query js_of_ocaml` >> Makefile.config.temp
-echo LWT_DIR=`ocp-build -configure -query lwt` >> Makefile.config.temp
+echo OCAMLVNUM=`ocamlc -version | cut -b 1-6` >> Makefile.config.temp
+echo JS_DIR=`ocp-build query -libdir js_of_ocaml` >> Makefile.config.temp
+echo LWT_DIR=`ocp-build query -libdir lwt` >> Makefile.config.temp
 echo JS_COMP=`which js_of_ocaml` >> Makefile.config.temp
-echo JS_COMPILER_LIB=`ocp-build -configure  -query js_of_ocaml_compiler` >> Makefile.config.temp
+echo JS_COMPILER_LIB=`ocp-build query -libdir js_of_ocaml_compiler` >> Makefile.config.temp
 echo 'TOPLEVEL_DIR=$(ROOT)/toplevel' >> Makefile.config.temp
 echo 'TOPLEVEL_INCDIR=$(ROOT)/_obuild/try-toplevel' >> Makefile.config.temp
 echo 'OCAMLNUM_INCDIR=$(ROOT)/_obuild/ocaml-num' >> Makefile.config.temp
@@ -20,5 +23,3 @@ echo 'SCP=scp' >> Makefile.config.temp
 
 mv Makefile.config.temp Makefile.config
 echo Makefile.config generated
-
-echo -n "" >> ocp-build.root

ocp-jslib/ocp-jslib.ocp

@@ -11,7 +11,7 @@ begin
       requires = [ "camlp4lib" "camlp4-pa-op" "Camlp4Bin" ]
   end
 *)
-  dirname = [ "/home/lefessan/.opam/4.00.1/lib/js_of_ocaml" ]
+  dirname = [ "%{js_of_ocaml.syntax_SRC_DIR}%" ]
 
   begin objects "js_of_ocaml.camlp4-syntax.objects"
     files = [ "pa_js.ml" ]

ocp-jslib/utils.ml

@@ -30,7 +30,9 @@ let get_by_name id =
   Js.to_string div##innerHTML
 
 let read_from_input ?msg:(msg="") ?default:(default="") =
-  Js.to_string (window##prompt (_s msg, _s default))
+  match Js.Opt.to_option (window##prompt (_s msg, _s default)) with
+  None -> assert false
+  | Some s -> Js.to_string s
 
 let jsnew0 (constr : 'a Js.t Js.constr) () =
   (Js.Unsafe.new_obj constr [| |] : 'a Js.t)

toplevellib/toplevellib-4.01.0/Makefile

@@ -0,0 +1,11 @@
+all:
+	echo Use this Makefile to update this directory from a patched OCaml toplevel
+
+update:
+	cp `ocamlc -where`/compiler-libs/ocamlbytecomp.cma .
+	cp `ocamlc -where`/compiler-libs/ocamlcommon.cma .
+	cp `ocamlc -where`/compiler-libs/ocamltoplevel.cma .
+	cp `ocamlc -where`/compiler-libs/topdirs.cmi .
+	cp `ocamlc -where`/compiler-libs/toploop.cmi .
+	cp `ocamlc -where`/compiler-libs/outcometree.cmi .
+	cp `ocamlc -where`/compiler-libs/clflags.cmi .