Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix PR#84: build with 3.12.1 and 4.00.0
  • Loading branch information
lefessan committed Sep 17, 2012
1 parent e65252e commit 0dd3d71
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Makefile
Expand Up @@ -16,9 +16,11 @@ Makefile.config:


clean: clean:
$(MAKE) -C js_of_ocaml clean $(MAKE) -C js_of_ocaml clean
$(MAKE) -C cmicomp clean
$(MAKE) -C ocp-jslib clean $(MAKE) -C ocp-jslib clean
$(MAKE) -C toplevel clean $(MAKE) -C toplevel clean
$(MAKE) -C ocaml-num clean $(MAKE) -C ocaml-num clean
$(MAKE) -C toplevel clean
$(MAKE) -C tutorial clean $(MAKE) -C tutorial clean
$(MAKE) -C try-ocaml clean $(MAKE) -C try-ocaml clean
$(MAKE) -C try-js_of_ocaml clean $(MAKE) -C try-js_of_ocaml clean
Expand Down
6 changes: 5 additions & 1 deletion cmicomp/Makefile
Expand Up @@ -9,6 +9,7 @@ dom_html.cmi form.cmi regexp.cmi xmlHttpRequest.cmi


ROOT=.. ROOT=..
include $(ROOT)/Makefile.config include $(ROOT)/Makefile.config
include $(TOPLEVELLIB_DIR)/Makefile.config
CMICOMP=$(TOPLEVELLIB_DIR)/cmicomp CMICOMP=$(TOPLEVELLIB_DIR)/cmicomp


all: $(CMICOMP) $(JS_CMIS) all: $(CMICOMP) $(JS_CMIS)
Expand All @@ -17,4 +18,7 @@ all: $(CMICOMP) $(JS_CMIS)
$(JS_CMIS): $(JS_DIR)/lib/*.cmi $(JS_CMIS): $(JS_DIR)/lib/*.cmi
cp -f $(JS_DIR)/lib/*.cmi . cp -f $(JS_DIR)/lib/*.cmi .
cp -f $(JS_DIR)/lib/js_of_ocaml.cma . 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
2 changes: 0 additions & 2 deletions toplevel/toplevel.ml
Expand Up @@ -89,7 +89,6 @@ let start ppf =
with e -> with e ->
Printf.printf "Exception %s while processing [%s]\n%!" (Printexc.to_string e) s Printf.printf "Exception %s while processing [%s]\n%!" (Printexc.to_string e) s
) [ ) [
(*
"Toploop.set_wrap true"; "Toploop.set_wrap true";
"open Tutorial"; "open Tutorial";
"#install_printer Toploop.print_hashtbl"; "#install_printer Toploop.print_hashtbl";
Expand All @@ -103,7 +102,6 @@ let start ppf =
"#install_printer Topnum.print_num"; "#install_printer Topnum.print_num";
"#install_printer Toploop.print_exn"; "#install_printer Toploop.print_exn";
"open Topnum"; "open Topnum";
*)
]; ];
() ()


Expand Down
1 change: 1 addition & 0 deletions toplevellib-3.12.1/Makefile.config
@@ -1,3 +1,4 @@
TOPLEVELLIB_CMAS=$(TOPLEVELLIB_DIR)/toplevellib.cma TOPLEVELLIB_CMAS=$(TOPLEVELLIB_DIR)/toplevellib.cma
INCLUDE_TOPLEVELLIB= -I $(TOPLEVELLIB_DIR)/ INCLUDE_TOPLEVELLIB= -I $(TOPLEVELLIB_DIR)/
TOPLEVELLIB=$(TOPLEVELLIB_DIR)/ TOPLEVELLIB=$(TOPLEVELLIB_DIR)/
CMICOMP_FLAGS="-with-log"
1 change: 1 addition & 0 deletions toplevellib-4.00.0/Makefile.config
Expand Up @@ -5,3 +5,4 @@ TOPLEVELLIB_CMAS=\


INCLUDE_TOPLEVELLIB= -I $(TOPLEVELLIB_DIR)/ INCLUDE_TOPLEVELLIB= -I $(TOPLEVELLIB_DIR)/
TOPLEVELLIB=$(TOPLEVELLIB_DIR)/ TOPLEVELLIB=$(TOPLEVELLIB_DIR)/
CMICOMP_FLAGS=compress

0 comments on commit 0dd3d71

Please sign in to comment.