Merge pull request OCamlPro#123 from lefessan/without_js_of_ocaml

Without js of ocaml

Author: cagdasbozman

.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,10 +2,7 @@
 
 all: Makefile.config
 	$(MAKE) -C cmicomp
-	$(MAKE) -C ocp-jslib
-	$(MAKE) -C ocaml-num
-	$(MAKE) -C toplevel
-	$(MAKE) -C tutorial
+	ocp-build build try-make-lessons
 	$(MAKE) -C try-ocaml
 	$(MAKE) -C try-js_of_ocaml
 
@@ -14,21 +11,9 @@ 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
 
-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
 	$(MAKE) -C try-ocaml

Makefile.jsconfig

@@ -1,18 +1,20 @@
 all: byte $(TRYOCAML_NAME).js
 
-include $(ROOT)/Makefile.jsconfig
-
 SOURCES= lessons.ml lessons.mli
 TARGETS=$(TRYOCAML_NAME).byte $(TRYOCAML_NAME).js
 
 include $(ROOT)/Makefile.config
 
 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
-lessons.ml: lessons.cmi $(LESSON_SET)/goodies.ml
-	$(TUTORIAL_DIR)/make_lessons $(LESSON_SET) > lessons.ml
+lessons.ml: $(LESSON_SET)/goodies.ml
+	../_obuild/try-make-lessons/try-make-lessons.byte $(LESSON_SET) > lessons.ml
 
 CMOS= $(SOURCES:.ml=.cmo)
 
@@ -70,41 +72,39 @@ 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_DIR)/toplevel.cmi
-TOPLEVEL_CMAS= \
-  $(CMICOMP_DIR)/js_of_ocaml.cma $(JS_COMPILER_LIB)/js_of_ocaml_compiler.cma \
-  $(TOPLEVELLIB_CMAS) \
-  $(OCAMLNUM_DIR)/ocaml-num.cma \
-  lessons.cmo \
-  $(TUTORIAL_DIR)/tutorial.cma \
-  $(OCPJSLIB_DIR)/ocp-jslib.cma
-TOPLEVEL_CMOS=$(TOPLEVEL_DIR)/toplevel.cmo \
-   $(TOPLEVEL_DIR)/topmain.cmo main.cmo
+TOPLEVEL_CMIS=$(TOPLEVEL_INCDIR)/toplevel.cmi
 
 INCLUDES= \
+   -I $(LWT_DIR) \
    -I $(CMICOMP_DIR) \
    -I $(JS_COMPILER_LIB) \
    -I $(JS_DIR) \
-   -I $(TUTORIAL_DIR)/ \
+   -I $(TUTORIAL_INCDIR)/ \
    $(INCLUDE_TOPLEVELLIB) \
-   -I $(OCAMLNUM_DIR) \
-   -I $(TOPLEVEL_DIR) \
-   -I $(OCPJSLIB_DIR) \
+   -I $(OCAMLNUM_INCDIR) \
+   -I $(TOPLEVEL_INCDIR) \
+   -I $(OCPJSLIB_INCDIR) \
    $(TRYOCAML_EXTRA_INCLUDES) \
    -I .
 
-$(TRYOCAML_NAME).js: $(TRYOCAML_NAME).byte $(JSFILES)
-	$(COMP) $(INCLUDES) -toplevel -linkall -noinline -noruntime $(JSFILES) $(TRYOCAML_NAME).byte $(OPTIONS)
+ALWAYS:
+
+../_obuild/$(TRYOCAML_NAME)/$(TRYOCAML_NAME).byte: ALWAYS $(SOURCES)
+	ocp-build $(TRYOCAML_NAME)
 
-$(TRYOCAML_NAME).byte: $(TOPLEVEL_CMIS) $(TOPLEVEL_CMOS) $(TOPLEVEL_CMAS) \
-                       $(TRYOCAML_EXTRA_CMAS) $(TRYOCAML_EXTRA_CMIS)
-	$(OCAMLFIND) $(OCAMLC) $(INCLUDES) -linkall $(OCAMLFIND_OPTIONS) -package str -linkpkg \
-                  -o [email protected] $(TOPLEVEL_CMAS) \
-                  $(TRYOCAML_EXTRA_CMAS) $(TRYOCAML_EXTRA_CMOS) $(TOPLEVEL_CMOS)
-	$(EXPUNGE) [email protected] $@ $(TOPLEVEL_MODULES) $(TRYOCAML_EXTRA_MODULES)
-	rm -f [email protected]
+$(TRYOCAML_NAME).js: \
+   ../_obuild/$(TRYOCAML_NAME)/$(TRYOCAML_NAME).byte \
+   $(JSFILES)
+	$(EXPUNGE) \
+		../_obuild/$(TRYOCAML_NAME)/$(TRYOCAML_NAME).byte \
+		$(TRYOCAML_NAME).tmp \
+		$(TOPLEVEL_MODULES) $(TRYOCAML_EXTRA_MODULES)
+	$(COMP) $(INCLUDES) \
+		-toplevel -linkall -noinline -noruntime  \
+		$(JSFILES) $(TRYOCAML_NAME).tmp $(OPTIONS)
+#	@rm -f $(TRYOCAML_NAME).tmp
 
-byte: lessons.cmo $(TRYOCAML_NAME).byte
+byte: $(TRYOCAML_NAME).js
 

Makefile.rules

@@ -1,18 +1,24 @@
 #!/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=`ocamlfind -query js_of_ocaml` >> 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=`ocamlfind -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 'OCAMLNUM_DIR=$(ROOT)/ocaml-num' >> Makefile.config.temp
+echo 'TOPLEVEL_INCDIR=$(ROOT)/_obuild/try-toplevel' >> Makefile.config.temp
+echo 'OCAMLNUM_INCDIR=$(ROOT)/_obuild/ocaml-num' >> Makefile.config.temp
+echo 'TUTORIAL_INCDIR=$(ROOT)/_obuild/try-tutorial' >> Makefile.config.temp
 echo 'TUTORIAL_DIR=$(ROOT)/tutorial' >> Makefile.config.temp
 echo 'TOPLEVELLIB_DIR=$(ROOT)/toplevellib/toplevellib-$(OCAMLVNUM)' >> Makefile.config.temp
 echo 'CMICOMP_DIR=$(ROOT)/cmicomp' >> Makefile.config.temp
-echo 'OCPJSLIB_DIR=$(ROOT)/ocp-jslib' >> Makefile.config.temp
+echo 'OCPJSLIB_INCDIR=$(ROOT)/_obuild/ocp-jslib' >> Makefile.config.temp
 echo 'SCP=scp' >> Makefile.config.temp
 
 mv Makefile.config.temp Makefile.config

Makefile.tryocaml

@@ -0,0 +1,18 @@
+begin library "ocaml-num"
+  files = [ "int_misc.ml" "nat.ml" "big_int.ml"
+              "arith_flags.ml" "ratio.ml" "num.ml"
+              "arith_status.ml" "topnum.ml"
+          ]
+end
+
+(*
+begin program "testdiv"
+    files = [ "tests/testdiv.ml" ]
+    requires = [ "ocaml-num" ]
+end
+*)
+
+(*
+numtop: OCamlNum.cmo
+        ocamlmktop -o numtop nums.cma OCamlNum.cmo
+*)

configure

@@ -1,36 +1,42 @@
-button.cmo : utils.cmi /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi button.cmi
-button.cmx : utils.cmx /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi button.cmi
-cookie.cmo : /home/cago/.opam/4/lib/js_of_ocaml/regexp.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi cookie.cmi
-cookie.cmx : /home/cago/.opam/4/lib/js_of_ocaml/regexp.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi cookie.cmi
-dragnDrop.cmo : utils.cmi /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom.cmi dragnDrop.cmi
-dragnDrop.cmx : utils.cmx /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom.cmi dragnDrop.cmi
-graphics.cmo : utils.cmi /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom.cmi graphics.cmi
-graphics.cmx : utils.cmx /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom.cmi graphics.cmi
-utils.cmo : /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom.cmi utils.cmi
-utils.cmx : /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom.cmi utils.cmi
-button.cmi : /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi
-cookie.cmi : /home/cago/.opam/4/lib/js_of_ocaml/js.cmi
-dragnDrop.cmi : /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi
+button.cmo : utils.cmi /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi button.cmi
+button.cmx : utils.cmx /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi button.cmi
+cookie.cmo : /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/regexp.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi cookie.cmi
+cookie.cmx : /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/regexp.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi cookie.cmi
+dragnDrop.cmo : utils.cmi /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom.cmi dragnDrop.cmi
+dragnDrop.cmx : utils.cmx /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom.cmi dragnDrop.cmi
+gra.cmo : utils.cmi /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom.cmi
+gra.cmx : utils.cmx /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom.cmi
+graphics.cmo : utils.cmi /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom.cmi graphics.cmi
+graphics.cmx : utils.cmx /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom.cmi graphics.cmi
+utils.cmo : /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom.cmi utils.cmi
+utils.cmx : /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom.cmi utils.cmi
+button.cmi : /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi
+cookie.cmi : /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi
+dragnDrop.cmi : /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi
 graphics.cmi :
-utils.cmi : /home/cago/.opam/4/lib/js_of_ocaml/js.cmi \
-    /home/cago/.opam/4/lib/js_of_ocaml/dom_html.cmi
+utils.cmi : /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/js.cmi \
+    /home/lefessan/.opam/4.00.1/lib/js_of_ocaml/dom_html.cmi

ocaml-num/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
@@ -442,4 +449,6 @@ let open_graph string =
   clear_graph ();
   raw_set_color blue;
   set_text_size text_size;
-  raw_set_line_width line_width
+  raw_set_line_width line_width;
+  Utils.set_div_by_id graphics_title_id !graphics_title;
+  ()