Merge branch 'without_js_of_ocaml'

Conflicts:
	ocaml-lessons/lesson5/step5/step.html

Author: Çagdas Bozman

.depend

@@ -18,11 +18,6 @@ tutorial/lessons.ml
 tutorial/make_lessons
 *.byte
 #*#
-js_of_ocaml/compiler/js_of_ocaml
-js_of_ocaml/lib/deriving_json/deriving_Json_lexer.ml
-js_of_ocaml/lib/log
-js_of_ocaml/lib/stubs.c
-js_of_ocaml/runtime/runtime.js
 try-ocaml/lessons.ml
 try-ocaml/lessons.mli
 try-ocaml/try-ocaml.js
@@ -32,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

.gitignore

@@ -1,13 +1,8 @@
 
 
 all: Makefile.config
-	$(MAKE) -C js_of_ocaml
-	$(MAKE) -C js_of_ocaml/compiler compiler.cma
 	$(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
 
@@ -16,27 +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
 
-cleanall: clean
-	$(MAKE) -C js_of_ocaml clean
-
-depend:
-	$(MAKE) -C js_of_ocaml depend
-	$(MAKE) -C cmicomp depend
-	$(MAKE) -C ocp-jslib depend
-	$(MAKE) -C toplevel depend
-	$(MAKE) -C ocaml-num 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

@@ -1,28 +1,30 @@
 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)
 
 ############### TRYOCAML_NAME=toplevel
 # remove this variable to use the default ocaml toplevel
-include $(ROOT)/toplevellib-$(OCAMLVNUM)/Makefile.config
+include $(ROOT)/toplevellib/toplevellib-$(OCAMLVNUM)/Makefile.config
 
 
-COMP=$(JS_DIR)/compiler/js_of_ocaml
-JSFILES=$(JS_DIR)/runtime/runtime.js $(JS_DIR)/runtime/weak.js $(TOPLEVEL_DIR)/toplevel_runtime.js
+COMP=$(JS_COMP)
+JSFILES=$(JS_DIR)/runtime.js $(TOPLEVEL_DIR)/toplevel_runtime.js
 #OCAMLC=ocamlfind ocamlc -annot -pp "camlp4o $(JS_DIR)/lib/syntax/pa_js.cmo"
 EXPUNGE=$(shell ocamlc -where)/expunge
 # Removed gc and sys
@@ -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_DIR)/compiler/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_DIR)/compiler \
-   -I $(JS_DIR)/lib \
-   -I $(TUTORIAL_DIR)/ \
+   -I $(JS_COMPILER_LIB) \
+   -I $(JS_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 -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.jsconfig

@@ -13,6 +13,7 @@ js_of_ocaml (see http://ocsigen.org/js_of_ocaml/).
 
   * Findlib
   * Lwt (version 2.4.0** at least, see http://ocsigen.org/lwt/)
+  * js_of_ocaml (development version)
 
 # Try it
 

Makefile.rules

@@ -15,9 +15,9 @@ CMICOMP=$(TOPLEVELLIB_DIR)/cmicomp
 all: $(CMICOMP) $(JS_CMIS)
 
 
-$(JS_CMIS):  $(JS_DIR)/lib/*.cmi
-	cp -f $(JS_DIR)/lib/*.cmi .
-	cp -f $(JS_DIR)/lib/js_of_ocaml.cma .
+$(JS_CMIS):  $(JS_DIR)/*.cmi
+	cp -f $(JS_DIR)/*.cmi .
+	cp -f $(JS_DIR)/js_of_ocaml.cma .
 	ocamlrun $(CMICOMP) $(CMICOMP_FLAGS) $(JS_CMIS)
 
 clean:

Makefile.tryocaml

@@ -1,16 +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=$(ROOT)/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=`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-$(OCAMLVNUM)' >> 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