Merge pull request #1010 from bloomberg/bootstrap_bspack

bootstrap bspack with c capabilities

Author: bobzhang

jscomp/Makefile

@@ -346,10 +346,10 @@ bin/js_compiler.byte:bin/js_compiler.mli bin/js_compiler.ml
 
 bootbspack:
 	@echo "Bootstrap bspack.exe"
-	./bin/bspack.exe -bs-MD -prelude-str 'module Config = Config_bspack '   -bs-exclude-I config  -I ../ocaml/parsing/ -I ../ocaml/utils/ -I ext -I common -I depends -I core -bs-main Bspack_main -o bin/bspack.ml
-	$(NATIVE) -w -40  unix.cmxa  -I bin bin/config_bspack.mli bin/config_bspack.ml bin/bspack.mli bin/bspack.ml -o bin/bspack.exe
+	./bin/bspack.exe -bs-MD -prelude-str 'module Config = Config_bspack '   -bs-exclude-I config  -I ../ocaml/parsing/ -I ../ocaml/utils/ -I stubs -I ext -I common -I depends -I core -bs-main Bspack_main -o bin/bspack.ml
+	$(NATIVE) ./stubs/ext_basic_hash_stubs.c -w -40  unix.cmxa  -I bin bin/config_bspack.mli bin/config_bspack.ml bin/bspack.mli bin/bspack.ml -o bin/bspack.exe
 	@echo "Using the bootstrapped bspack.exe to genreate new bspack.ml: `date`"
-	./bin/bspack.exe -bs-MD  -prelude-str  'module Config = Config_bspack'   -bs-exclude-I config  -I ../ocaml/parsing/ -I ../ocaml/utils/ -I ext -I common -I depends -I core -bs-main Bspack_main -o bin/bspack.ml
+	./bin/bspack.exe -bs-MD  -prelude-str  'module Config = Config_bspack'   -bs-exclude-I config  -I ../ocaml/parsing/ -I ../ocaml/utils/ -I stubs -I ext -I common -I depends -I core -bs-main Bspack_main -o bin/bspack.ml
 	@echo "Bootstrap seems finished, please check diffs in bspack.exe"
 	@echo "Rebuilding bspack.exe"
 	make -C bin -B bspack.exe

jscomp/bin/Makefile

@@ -6,6 +6,8 @@ ifndef EXE
 endif
 NATIVE=ocamlopt.opt$(EXE)
 
+OCAMLOPT_FLAGS= -inline 1000 -w -a ../stubs/ext_basic_hash_stubs.c
+
 bsppx.exe: config_bsppx.mli config_bsppx.ml bsppx.mli bsppx.ml
 	$(NATIVE) -g -inline 1000 -linkall -w -a $^ -o $@
 
@@ -27,7 +29,7 @@ bsc.exe: config_whole_compiler.mli config_whole_compiler.ml  whole_compiler.mli
 	$(NATIVE) -w -a ../stubs/ext_basic_hash_stubs.c $^  -o $@
 
 bspack.exe: config_bspack.mli config_bspack.ml bspack.mli bspack.ml
-	$(NATIVE) -w -a unix.cmxa  $^ -o $@
+	$(NATIVE) $(OCAMLOPT_FLAGS) unix.cmxa  $^ -o $@
 
 
 all: bsppx.exe bspp.exe bsdep.exe bsc.exe bspack.exe bsb.exe bsb_helper.exe

jscomp/bin/bspack.d

@@ -4,14 +4,18 @@ bin/bspack.ml : ../ocaml/utils/warnings.ml
 bin/bspack.ml : ../ocaml/utils/warnings.mli
 bin/bspack.ml : ../ocaml/parsing/location.ml
 bin/bspack.ml : ../ocaml/parsing/location.mli
+bin/bspack.ml : depends/bs_exception.ml
+bin/bspack.ml : depends/bs_exception.mli
+bin/bspack.ml : ../ocaml/utils/clflags.ml
+bin/bspack.ml : ../ocaml/utils/clflags.mli
 bin/bspack.ml : ../ocaml/parsing/asttypes.mli
 bin/bspack.ml : ../ocaml/utils/misc.ml
 bin/bspack.ml : ../ocaml/utils/misc.mli
 bin/bspack.ml : ../ocaml/parsing/longident.ml
 bin/bspack.ml : ../ocaml/parsing/longident.mli
 bin/bspack.ml : ../ocaml/parsing/parsetree.mli
-bin/bspack.ml : common/binary_ast.ml
-bin/bspack.ml : common/binary_ast.mli
+bin/bspack.ml : ../ocaml/parsing/depend.ml
+bin/bspack.ml : ../ocaml/parsing/depend.mli
 bin/bspack.ml : ext/ext_pervasives.ml
 bin/bspack.ml : ext/ext_pervasives.mli
 bin/bspack.ml : ext/ext_bytes.ml
@@ -22,22 +26,15 @@ bin/bspack.ml : ext/literals.ml
 bin/bspack.ml : ext/literals.mli
 bin/bspack.ml : ext/ext_filename.ml
 bin/bspack.ml : ext/ext_filename.mli
-bin/bspack.ml : ext/string_map.ml
-bin/bspack.ml : ext/string_map.mli
-bin/bspack.ml : common/binary_cache.ml
-bin/bspack.ml : common/binary_cache.mli
-bin/bspack.ml : common/bs_exception.ml
-bin/bspack.ml : common/bs_exception.mli
-bin/bspack.ml : ../ocaml/utils/clflags.ml
-bin/bspack.ml : ../ocaml/utils/clflags.mli
-bin/bspack.ml : ../ocaml/parsing/depend.ml
-bin/bspack.ml : ../ocaml/parsing/depend.mli
 bin/bspack.ml : ext/ext_format.ml
 bin/bspack.ml : ext/ext_format.mli
 bin/bspack.ml : ext/ext_list.ml
 bin/bspack.ml : ext/ext_list.mli
 bin/bspack.ml : common/js_config.ml
 bin/bspack.ml : common/js_config.mli
+bin/bspack.ml : ext/map_gen.ml
+bin/bspack.ml : ext/string_map.ml
+bin/bspack.ml : ext/string_map.mli
 bin/bspack.ml : depends/ast_extract.ml
 bin/bspack.ml : depends/ast_extract.mli
 bin/bspack.ml : ext/ext_io.ml
@@ -54,5 +51,11 @@ bin/bspack.ml : ../ocaml/parsing/lexer.ml
 bin/bspack.ml : ../ocaml/parsing/lexer.mli
 bin/bspack.ml : ../ocaml/parsing/parse.ml
 bin/bspack.ml : ../ocaml/parsing/parse.mli
+bin/bspack.ml : stubs/bs_hash_stubs.ml
+bin/bspack.ml : ext/ext_util.ml
+bin/bspack.ml : ext/ext_util.mli
+bin/bspack.ml : ext/hashtbl_gen.ml
+bin/bspack.ml : ext/string_hashtbl.ml
+bin/bspack.ml : ext/string_hashtbl.mli
 bin/bspack.ml : core/bspack_main.ml
 bin/bspack.ml : core/bspack_main.mli