Requires latest ocp-build

Author: lefessan

.gitignore

@@ -27,3 +27,5 @@ try-js_of_ocaml/lessons.mli
 try-js_of_ocaml/try-js_of_ocaml.js
 try-js_of_ocaml/try-ocaml.js
 Makefile.config
+ocp-build.root*
+_obuild

Makefile

@@ -2,11 +2,7 @@
 
 all: Makefile.config
 	$(MAKE) -C cmicomp
-	ocp-build -scan -meta - try-make-lessons
-#	$(MAKE) -C ocp-jslib
-#	$(MAKE) -C ocaml-num
-#	$(MAKE) -C toplevel
-#	$(MAKE) -C tutorial
+	ocp-build -scan try-make-lessons
 	$(MAKE) -C try-ocaml
 	$(MAKE) -C try-js_of_ocaml
 
@@ -15,21 +11,8 @@ Makefile.config:
 
 clean:
 	$(MAKE) -C cmicomp clean
-#	$(MAKE) -C ocp-jslib clean
-#	$(MAKE) -C toplevel clean
-#	$(MAKE) -C ocaml-num clean
-#	$(MAKE) -C toplevel clean
-#	$(MAKE) -C tutorial clean
 	$(MAKE) -C try-ocaml clean
 	$(MAKE) -C try-js_of_ocaml clean
-	rm -rf _obuild
-
-depend:
-	$(MAKE) -C ocp-jslib depend
-	$(MAKE) -C toplevel depend
-	$(MAKE) -C tutorial depend
-	$(MAKE) -C try-ocaml depend
-	$(MAKE) -C try-js_of_ocaml depend
 
 update-lessons:
 	touch ocaml-lessons/goodies.ml

Makefile.tryocaml

@@ -9,6 +9,7 @@ all: lessons.ml byte
 
 clean:
 	rm -f *~ $(SOURCES) $(TRYOCAML_NAME).tmp  $(TRYOCAML_NAME).js
+	ocp-build -clean
 
 lessons.mli: $(TUTORIAL_DIR)/lessons.mli
 	cp -f  $(TUTORIAL_DIR)/lessons.mli lessons.mli
@@ -71,11 +72,12 @@ STDLIB_MODULES=\
   stringLabels \
   weak
 
-TOPLEVEL_MODULES=$(STDLIB_MODULES) n regexp tutorial outcometree topdirs toploop toplevel clflags n big_int num topnum
+TOPLEVEL_MODULES=$(STDLIB_MODULES) n regexp tutorial outcometree topdirs toploop toplevel clflags n big_int num topnum lwt
 
 TOPLEVEL_CMIS=$(TOPLEVEL_INCDIR)/toplevel.cmi
 
 INCLUDES= \
+   -I $(LWT_DIR) \
    -I $(CMICOMP_DIR) \
    -I $(JS_COMPILER_LIB) \
    -I $(JS_DIR) \
@@ -90,7 +92,7 @@ INCLUDES= \
 ALWAYS:
 
 ../_obuild/$(TRYOCAML_NAME)/$(TRYOCAML_NAME).byte: ALWAYS $(SOURCES)
-	ocp-build -meta - $(TRYOCAML_NAME)
+	ocp-build $(TRYOCAML_NAME)
 
 $(TRYOCAML_NAME).js: \
    ../_obuild/$(TRYOCAML_NAME)/$(TRYOCAML_NAME).byte \
@@ -102,7 +104,7 @@ $(TRYOCAML_NAME).js: \
 	$(COMP) $(INCLUDES) \
 		-toplevel -linkall -noinline -noruntime  \
 		$(JSFILES) $(TRYOCAML_NAME).tmp $(OPTIONS)
-	@rm -f $(TRYOCAML_NAME).tmp
+#	@rm -f $(TRYOCAML_NAME).tmp
 
 byte: $(TRYOCAML_NAME).js
 

configure

@@ -4,9 +4,10 @@ echo Generating Makefile.config
 echo OCAMLC=ocamlc > Makefile.config.temp
 echo OCAMLDEP=ocamldep.opt >> Makefile.config.temp
 echo OCAMLVNUM=`ocamlc -version` >> Makefile.config.temp
-echo JS_DIR=`ocamlfind -query js_of_ocaml` >> 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 JS_COMP=`which js_of_ocaml` >> Makefile.config.temp
-echo JS_COMPILER_LIB=`ocamlfind -query js_of_ocaml_compiler` >> Makefile.config.temp
+echo JS_COMPILER_LIB=`ocp-build -configure  -query 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
@@ -19,3 +20,5 @@ echo 'SCP=scp' >> Makefile.config.temp
 
 mv Makefile.config.temp Makefile.config
 echo Makefile.config generated
+
+echo -n "" >> ocp-build.root

ocaml-num/ocaml-num.ocp

@@ -5,10 +5,12 @@ begin library "ocaml-num"
           ]
 end
 
+(*
 begin program "testdiv"
     files = [ "tests/testdiv.ml" ]
     requires = [ "ocaml-num" ]
 end
+*)
 
 (*
 numtop: OCamlNum.cmo

ocp-jslib/Makefile

@@ -1,4 +1,7 @@
 
+let graphics_title_id = "graphics-title"
+let graphics_id = "graphics"
+
 exception Graphic_failure of string
 
 (* NOT IMPLEMENTED:
@@ -31,6 +34,7 @@ type state = {
 }
 
 let state = ref None
+let graphics_title = ref "Graphics Window"
 
 let get_state () =
   match !state with
@@ -90,6 +94,8 @@ let _ =
   Callback.register_exception "Graphics.Graphic_failure" (Graphic_failure "")
 
 let set_window_title title =
+  graphics_title := title;
+  Utils.set_div_by_id graphics_title_id !graphics_title;
   (* TODO *) ()
 
 let resize_window width height =
@@ -419,12 +425,13 @@ let close_graph () =
     let canvas = c.canvas in
     canvas##width <- 0;
     canvas##height <- 0;
-    Utils.set_div_by_id "graphics" ""
+    Utils.set_div_by_id graphics_id "";
+    Utils.set_div_by_id graphics_title_id ""
 
 let open_graph string =
   close_graph ();
   let canvas = Dom_html.createCanvas doc in
-  let body = Utils.get_element_by_id "graphics" in
+  let body = Utils.get_element_by_id graphics_id in
   let context = canvas##getContext (Dom_html._2d_) in
   Dom.appendChild body canvas;
   let x = 0 in
@@ -443,4 +450,5 @@ let open_graph string =
   raw_set_color blue;
   set_text_size text_size;
   raw_set_line_width line_width;
+  Utils.set_div_by_id graphics_title_id !graphics_title;
   ()

ocp-jslib/graphics.ml

@@ -6,10 +6,11 @@ begin
   By default, ocp-build renames X.asm in X, and keeps X.byte. We should
   add options "byte_name" and "asm_name".
 *)
+(*
   begin program "camlp4o"
       requires = [ "camlp4lib" "camlp4-pa-op" "Camlp4Bin" ]
   end
-
+*)
   dirname = [ "/home/lefessan/.opam/4.00.1/lib/js_of_ocaml" ]
 
   begin objects "js_of_ocaml.camlp4-syntax.objects"

ocp-jslib/ocp-jslib.ocp

@@ -86,6 +86,7 @@ <h1 id="main-title">Try js_of_ocaml</h1>
             <div id="toplevel"></div>
           </div>
           <div id="buttons"></div>
+          <div id="graphics-title"></div>
           <div id="graphics"></div>
           <table class="zebra-striped">
             <thead><tr><th id="text-commands">Commands</th><th id="text-effects">Effects</th></tr></thead>

toplevel/Makefile

@@ -2,7 +2,6 @@
 begin library "try-js_of_ocaml-lessons"
   files = [ "lessons.ml" ]
   is_before = [ "try-tutorial" ]
-
 end
 
 begin program "try-js_of_ocaml"

try-js_of_ocaml/index.html

@@ -86,6 +86,7 @@ <h1 id="main-title">Try OCaml</h1>
             <div id="toplevel"></div>
           </div>
           <div id="buttons"></div>
+          <div id="graphics-title"></div>
           <div id="graphics"></div>
           <table class="zebra-striped">
             <thead><tr><th id="text-commands">Commands</th><th id="text-effects">Effects</th></tr></thead>

try-js_of_ocaml/try-js_of_ocaml.ocp

@@ -2,12 +2,11 @@
 begin library "try-ocaml-lessons"
   files = [ "lessons.ml" ]
   is_before = [ "try-tutorial" ]
-
 end
 
 begin program "try-ocaml"
   has_asm = false
-  bytelink = "-linkall"
+  bytelink += "-linkall"
   files = [ "main.ml" ]
   requires = [ "ocp-jslib" "lwt" "try-ocaml-lessons"  "try-tutorial"  "try-toplevel" ]
 end