Merge pull request #1903 from BuckleScript/no_compiler_in_bsb

support package map directly, no compiler dependency in bsb

Author: bobzhang

jscomp/all.depend

@@ -619,7 +619,8 @@ core/lam_compile_group.cmx : ext/literals.cmx core/lam_util.cmx \
     ext/ext_filename.cmx core/lam_compile_group.cmi
 core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
     core/lam_compile_group.cmx core/lam_compile_env.cmx common/js_config.cmx \
-    ext/ext_pervasives.cmx common/ext_log.cmx syntax/bs_ast_invariant.cmx \
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_package_name.cmx \
+    common/ext_log.cmx ext/ext_io.cmx syntax/bs_ast_invariant.cmx \
     depends/binary_ast.cmx core/js_implementation.cmi
 core/ocaml_batch_compile.cmx : core/ocaml_parse.cmx \
     core/js_implementation.cmx common/js_config.cmx ext/ext_ref.cmx \
@@ -831,9 +832,8 @@ bsb/bsb_pkg.cmx : ext/string_hashtbl.cmx ext/literals.cmx \
     bsb/bsb_exception.cmx bsb/bsb_pkg.cmi
 bsb/bsb_pkg_cmi_create.cmx :
 bsb/bsb_pkg_create.cmx : ext/ext_package_name.cmx bsb/bsb_pkg_create.cmi
-bsb/bsb_pkg_map_gen.cmx : ext/string_map.cmx common/ml_binary.cmx \
-    ext/literals.cmx ext/ext_filename.cmx bsb/bsb_pkg_create.cmx \
-    bsb/bsb_parse_sources.cmx bsb/bsb_pkg_map_gen.cmi
+bsb/bsb_pkg_map_gen.cmx : ext/string_map.cmx ext/literals.cmx \
+    ext/ext_filename.cmx bsb/bsb_parse_sources.cmx bsb/bsb_pkg_map_gen.cmi
 bsb/bsb_query.cmx : ext/string_map.cmx ext/ext_json_noloc.cmx \
     ext/ext_array.cmx bsb/bsb_parse_sources.cmx bsb/bsb_ninja_regen.cmx \
     bsb/bsb_config_types.cmx bsb/bsb_query.cmi

jscomp/bin/all_ounit_tests.ml

@@ -3921,6 +3921,7 @@ val suffix_mlast : string
 val suffix_mlast_simple : string
 val suffix_mliast : string
 val suffix_mliast_simple : string
+val suffix_mlmap : string
 val suffix_mll : string
 val suffix_re : string
 val suffix_rei : string 
@@ -4049,6 +4050,7 @@ let suffix_ml = ".ml"
 let suffix_mli = ".mli"
 let suffix_re = ".re"
 let suffix_rei = ".rei"
+let suffix_mlmap = ".mlmap"
 
 let suffix_cmt = ".cmt" 
 let suffix_cmti = ".cmti" 

jscomp/bin/bsb.d

@@ -58,44 +58,37 @@ bin/bsb.ml : ext/string_map.mli
 bin/bsb.ml : ext/string_set.mli
 bin/bsb.ml : ext/string_vec.mli
 bin/bsb.ml : bsb/bsb_default.mli
-bin/bsb.ml : common/ml_binary.ml
 bin/bsb.ml : ext/ext_file_pp.mli
 bin/bsb.ml : ext/ext_filename.ml
 bin/bsb.ml : ext/ext_position.ml
 bin/bsb.ml : ext/hash_set_gen.ml
 bin/bsb.ml : ext/resize_array.ml
-bin/bsb.ml : ../vendor/ocaml/utils/misc.ml
 bin/bsb.ml : bsb/bsb_dir_index.ml
 bin/bsb.ml : bsb/bsb_exception.ml
 bin/bsb.ml : bsb/bsb_ninja_gen.ml
 bin/bsb.ml : bsb/bsb_templates.ml
 bin/bsb.ml : common/bs_version.ml
-bin/bsb.ml : common/ml_binary.mli
 bin/bsb.ml : ext/ext_filename.mli
 bin/bsb.ml : ext/ext_position.mli
 bin/bsb.ml : ext/resize_array.mli
-bin/bsb.ml : ../vendor/ocaml/utils/misc.mli
 bin/bsb.ml : bsb/bsb_build_util.ml
 bin/bsb.ml : bsb/bsb_dir_index.mli
 bin/bsb.ml : bsb/bsb_exception.mli
 bin/bsb.ml : bsb/bsb_merlin_gen.ml
 bin/bsb.ml : bsb/bsb_ninja_gen.mli
 bin/bsb.ml : bsb/bsb_ninja_util.ml
-bin/bsb.ml : bsb/bsb_pkg_create.ml
 bin/bsb.ml : bsb/bsb_templates.mli
 bin/bsb.ml : common/bs_version.mli
 bin/bsb.ml : ext/ext_json_noloc.ml
 bin/bsb.ml : ext/ext_json_parse.ml
 bin/bsb.ml : ext/ext_json_types.ml
 bin/bsb.ml : ext/ext_pervasives.ml
 bin/bsb.ml : ext/string_hashtbl.ml
-bin/bsb.ml : ../vendor/ocaml/utils/config.ml
 bin/bsb.ml : bsb/bsb_build_cache.ml
 bin/bsb.ml : bsb/bsb_build_util.mli
 bin/bsb.ml : bsb/bsb_merlin_gen.mli
 bin/bsb.ml : bsb/bsb_ninja_regen.ml
 bin/bsb.ml : bsb/bsb_ninja_util.mli
-bin/bsb.ml : bsb/bsb_pkg_create.mli
 bin/bsb.ml : bsb/bsb_pkg_map_gen.ml
 bin/bsb.ml : bsb/bsb_watcher_gen.ml
 bin/bsb.ml : ext/ext_json_noloc.mli
@@ -104,8 +97,6 @@ bin/bsb.ml : ext/ext_pervasives.mli
 bin/bsb.ml : ext/string_hash_set.ml
 bin/bsb.ml : ext/string_hashtbl.mli
 bin/bsb.ml : stubs/bs_hash_stubs.ml
-bin/bsb.ml : ../vendor/ocaml/utils/clflags.ml
-bin/bsb.ml : ../vendor/ocaml/utils/config.mli
 bin/bsb.ml : bsb/bsb_build_cache.mli
 bin/bsb.ml : bsb/bsb_config_parse.ml
 bin/bsb.ml : bsb/bsb_config_types.ml
@@ -114,28 +105,13 @@ bin/bsb.ml : bsb/bsb_pkg_map_gen.mli
 bin/bsb.ml : bsb/bsb_watcher_gen.mli
 bin/bsb.ml : ext/ext_package_name.ml
 bin/bsb.ml : ext/string_hash_set.mli
-bin/bsb.ml : ../vendor/ocaml/utils/clflags.mli
-bin/bsb.ml : ../vendor/ocaml/utils/terminfo.ml
-bin/bsb.ml : ../vendor/ocaml/utils/warnings.ml
 bin/bsb.ml : bsb/bsb_build_schemas.ml
 bin/bsb.ml : bsb/bsb_config_parse.mli
 bin/bsb.ml : bsb/bsb_package_specs.ml
 bin/bsb.ml : bsb/bsb_parse_sources.ml
 bin/bsb.ml : ext/ext_package_name.mli
-bin/bsb.ml : ../vendor/ocaml/utils/terminfo.mli
-bin/bsb.ml : ../vendor/ocaml/utils/warnings.mli
 bin/bsb.ml : bsb/bsb_package_specs.mli
 bin/bsb.ml : bsb/bsb_parse_sources.mli
-bin/bsb.ml : ../vendor/ocaml/parsing/location.ml
-bin/bsb.ml : ../vendor/ocaml/parsing/asttypes.mli
-bin/bsb.ml : ../vendor/ocaml/parsing/location.mli
-bin/bsb.ml : ../vendor/ocaml/parsing/longident.ml
-bin/bsb.ml : ../vendor/ocaml/parsing/ast_helper.ml
-bin/bsb.ml : ../vendor/ocaml/parsing/docstrings.ml
-bin/bsb.ml : ../vendor/ocaml/parsing/longident.mli
-bin/bsb.ml : ../vendor/ocaml/parsing/parsetree.mli
 bin/bsb.ml : bsb/bsb_ninja_file_groups.ml
 bin/bsb.ml : bsb/bsb_ninja_global_vars.ml
-bin/bsb.ml : ../vendor/ocaml/parsing/ast_helper.mli
-bin/bsb.ml : ../vendor/ocaml/parsing/docstrings.mli
 bin/bsb.ml : bsb/bsb_ninja_file_groups.mli