Permalink
Browse files

Fix PR#84: build with 3.12.1 and 4.00.0

  • Loading branch information...
1 parent e65252e commit 0dd3d718afc42b1361bbee067b9df2110d353c17 @lefessan lefessan committed Sep 17, 2012
Showing with 9 additions and 3 deletions.
  1. +2 −0 Makefile
  2. +5 −1 cmicomp/Makefile
  3. +0 −2 toplevel/toplevel.ml
  4. +1 −0 toplevellib-3.12.1/Makefile.config
  5. +1 −0 toplevellib-4.00.0/Makefile.config
View
@@ -16,9 +16,11 @@ Makefile.config:
clean:
$(MAKE) -C js_of_ocaml 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
View
@@ -9,6 +9,7 @@ dom_html.cmi form.cmi regexp.cmi xmlHttpRequest.cmi
ROOT=..
include $(ROOT)/Makefile.config
+include $(TOPLEVELLIB_DIR)/Makefile.config
CMICOMP=$(TOPLEVELLIB_DIR)/cmicomp
all: $(CMICOMP) $(JS_CMIS)
@@ -17,4 +18,7 @@ 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 .
- ocamlrun $(CMICOMP) compress $(JS_CMIS)
+ ocamlrun $(CMICOMP) $(CMICOMP_FLAGS) $(JS_CMIS)
+
+clean:
+ rm -f *.cmi *.cmi.old
View
@@ -89,7 +89,6 @@ let start ppf =
with e ->
Printf.printf "Exception %s while processing [%s]\n%!" (Printexc.to_string e) s
) [
-(*
"Toploop.set_wrap true";
"open Tutorial";
"#install_printer Toploop.print_hashtbl";
@@ -103,7 +102,6 @@ let start ppf =
"#install_printer Topnum.print_num";
"#install_printer Toploop.print_exn";
"open Topnum";
-*)
];
()
@@ -1,3 +1,4 @@
TOPLEVELLIB_CMAS=$(TOPLEVELLIB_DIR)/toplevellib.cma
INCLUDE_TOPLEVELLIB= -I $(TOPLEVELLIB_DIR)/
TOPLEVELLIB=$(TOPLEVELLIB_DIR)/
+CMICOMP_FLAGS="-with-log"
@@ -5,3 +5,4 @@ TOPLEVELLIB_CMAS=\
INCLUDE_TOPLEVELLIB= -I $(TOPLEVELLIB_DIR)/
TOPLEVELLIB=$(TOPLEVELLIB_DIR)/
+CMICOMP_FLAGS=compress

0 comments on commit 0dd3d71

Please sign in to comment.