clean up

Author: bobzhang

jscomp/Makefile

@@ -252,11 +252,13 @@ OTHER_CORE_SRCS= bsppx_main bspack_main jsoo_main  bspp_main js_cmi_datasets \
 OTHER_CORE_CMXS= $(addprefix core/, $(addsuffix .cmx, $(OTHER_CORE_SRCS)))
 BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util \
 	bsb_dir bsb_ninja \
-	bsb_build_ui bsb_default\
+	bsb_build_ui \
+	bsb_default\
 	bsb_dep_infos\
-	 bsb_gen\
-	 bsb_file\
-	 bsb_config_parse\
+	bsb_gen\
+	bsb_file\
+	bsb_config_types\
+	bsb_config_parse\
 	bsb_unix
 
 BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))

jscomp/all.depend

@@ -649,35 +649,38 @@ bsb/bsb_build_ui.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
     bsb/bsb_dir.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_build_ui.cmi
-bsb/bsb_build_util.cmx : ext/ext_sys.cmx ext/ext_string.cmx ext/ext_list.cmx \
-    ext/ext_json.cmx ext/ext_filename.cmx ext/ext_array.cmx \
-    bsb/bsb_config.cmx bsb/bsb_build_util.cmi
-bsb/bsb_config.cmx : ext/literals.cmx common/js_config.cmx \
-    ext/ext_string.cmx ext/ext_filename.cmx bsb/bsb_config.cmi
+bsb/bsb_build_util.cmx : ext/literals.cmx ext/ext_sys.cmx ext/ext_string.cmx \
+    ext/ext_list.cmx ext/ext_json.cmx ext/ext_filename.cmx ext/ext_array.cmx \
+    bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx common/bs_pkg.cmx \
+    bsb/bsb_build_util.cmi
+bsb/bsb_config.cmx : ext/string_set.cmx ext/literals.cmx \
+    common/js_config.cmx ext/ext_string.cmx ext/ext_filename.cmx \
+    bsb/bsb_config.cmi
 bsb/bsb_config_parse.cmx : ext/literals.cmx ext/ext_string.cmx \
     ext/ext_pervasives.cmx ext/ext_json.cmx ext/ext_filename.cmx \
-    ext/ext_file_pp.cmx bsb/bsb_gen.cmx bsb/bsb_default.cmx \
+    ext/ext_file_pp.cmx bsb/bsb_default.cmx bsb/bsb_config_types.cmx \
     bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx \
     bsb/bsb_build_schemas.cmx common/bs_pkg.cmx bsb/bsb_config_parse.cmi
-bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_sys.cmx \
-    ext/ext_string.cmx ext/ext_json.cmx ext/ext_filename.cmx \
-    bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx \
-    common/bs_pkg.cmx bsb/bsb_default.cmi
+bsb/bsb_config_types.cmx : bsb/bsb_config.cmx bsb/bsb_build_ui.cmx
+bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_string.cmx \
+    ext/ext_filename.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
+    bsb/bsb_default.cmi
 bsb/bsb_dep_infos.cmx : bsb/bsb_dep_infos.cmi
 bsb/bsb_dir.cmx : bsb/bsb_dir.cmi
 bsb/bsb_file.cmx : bsb/bsb_file.cmi
 bsb/bsb_gen.cmx : ext/string_map.cmx ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_filename.cmx bsb/bsb_ninja.cmx bsb/bsb_config.cmx \
-    bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx \
-    common/binary_cache.cmx bsb/bsb_gen.cmi
+    ext/ext_filename.cmx bsb/bsb_ninja.cmx bsb/bsb_config_types.cmx \
+    bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx \
+    bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_gen.cmi
 bsb/bsb_helper_main.cmx : depends/depends_post_process.cmx \
     bsb/bsb_helper_main.cmi
 bsb/bsb_main.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/string_hash_set.cmx ext/literals.cmx ext/ext_sys.cmx \
     ext/ext_string.cmx ext/ext_filename.cmx ext/ext_array.cmx \
-    bsb/bsb_unix.cmx bsb/bsb_ninja.cmx bsb/bsb_file.cmx bsb/bsb_dep_infos.cmx \
-    bsb/bsb_default.cmx bsb/bsb_config_parse.cmx bsb/bsb_config.cmx \
-    bsb/bsb_build_util.cmx bsb/bsb_main.cmi
+    bsb/bsb_unix.cmx bsb/bsb_ninja.cmx bsb/bsb_gen.cmx bsb/bsb_file.cmx \
+    bsb/bsb_dep_infos.cmx bsb/bsb_default.cmx bsb/bsb_config_types.cmx \
+    bsb/bsb_config_parse.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
+    bsb/bsb_main.cmi
 bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx \
     ext/string_hash_set.cmx ext/literals.cmx ext/ext_sys.cmx \
     ext/ext_string.cmx ext/ext_filename.cmx bsb/bsb_config.cmx \
@@ -688,16 +691,16 @@ bsb/bsb_unix.cmx : ext/ext_sys.cmx ext/ext_string.cmx bsb/bsb_unix.cmi
 bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/ext_json.cmi \
     ext/ext_file_pp.cmi common/binary_cache.cmi
 bsb/bsb_build_util.cmi : ext/ext_json.cmi
-bsb/bsb_config.cmi :
-bsb/bsb_config_parse.cmi : bsb/bsb_default.cmi
-bsb/bsb_default.cmi : ext/string_set.cmi ext/ext_json.cmi
+bsb/bsb_config.cmi : ext/string_set.cmi
+bsb/bsb_config_parse.cmi : bsb/bsb_config_types.cmx bsb/bsb_config.cmi
+bsb/bsb_default.cmi : ext/ext_json.cmi bsb/bsb_config.cmi
 bsb/bsb_dep_infos.cmi :
 bsb/bsb_dir.cmi :
 bsb/bsb_file.cmi :
-bsb/bsb_gen.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
+bsb/bsb_gen.cmi : bsb/bsb_config_types.cmx
 bsb/bsb_helper_main.cmi :
 bsb/bsb_main.cmi :
-bsb/bsb_ninja.cmi : ext/string_hash_set.cmi bsb/bsb_default.cmi \
+bsb/bsb_ninja.cmi : ext/string_hash_set.cmi bsb/bsb_config.cmi \
     bsb/bsb_build_ui.cmi
 bsb/bsb_unix.cmi :
 jscmj_main.cmx : common/js_config.cmx core/js_cmj_format.cmx \

jscomp/bin/bsb.d

@@ -1,15 +1,21 @@
+bin/bsb.ml : ext/literals.ml
+bin/bsb.ml : ext/literals.mli
+bin/bsb.ml : common/bs_pkg.ml
+bin/bsb.ml : common/bs_pkg.mli
+bin/bsb.ml : bsb/bsb_build_schemas.ml
 bin/bsb.ml : ext/ext_pervasives.ml
 bin/bsb.ml : ext/ext_pervasives.mli
 bin/bsb.ml : ext/ext_bytes.ml
 bin/bsb.ml : ext/ext_bytes.mli
 bin/bsb.ml : ext/ext_string.ml
 bin/bsb.ml : ext/ext_string.mli
-bin/bsb.ml : ext/literals.ml
-bin/bsb.ml : ext/literals.mli
 bin/bsb.ml : ext/ext_filename.ml
 bin/bsb.ml : ext/ext_filename.mli
 bin/bsb.ml : common/js_config.ml
 bin/bsb.ml : common/js_config.mli
+bin/bsb.ml : ext/set_gen.ml
+bin/bsb.ml : ext/string_set.ml
+bin/bsb.ml : ext/string_set.mli
 bin/bsb.ml : bsb/bsb_config.ml
 bin/bsb.ml : bsb/bsb_config.mli
 bin/bsb.ml : ext/ext_array.ml
@@ -25,27 +31,28 @@ bin/bsb.ml : ext/ext_sys.ml
 bin/bsb.ml : ext/ext_sys.mli
 bin/bsb.ml : bsb/bsb_build_util.ml
 bin/bsb.ml : bsb/bsb_build_util.mli
-bin/bsb.ml : common/bs_pkg.ml
-bin/bsb.ml : common/bs_pkg.mli
-bin/bsb.ml : bsb/bsb_build_schemas.ml
 bin/bsb.ml : common/binary_cache.ml
 bin/bsb.ml : common/binary_cache.mli
 bin/bsb.ml : bsb/bsb_dir.ml
 bin/bsb.ml : bsb/bsb_dir.mli
 bin/bsb.ml : ext/ext_file_pp.ml
 bin/bsb.ml : ext/ext_file_pp.mli
-bin/bsb.ml : ext/set_gen.ml
-bin/bsb.ml : ext/string_set.ml
-bin/bsb.ml : ext/string_set.mli
 bin/bsb.ml : ext/vec_gen.ml
 bin/bsb.ml : ext/resize_array.ml
 bin/bsb.ml : ext/resize_array.mli
 bin/bsb.ml : ext/string_vec.ml
 bin/bsb.ml : ext/string_vec.mli
 bin/bsb.ml : bsb/bsb_build_ui.ml
 bin/bsb.ml : bsb/bsb_build_ui.mli
+bin/bsb.ml : bsb/bsb_config_types.ml
 bin/bsb.ml : bsb/bsb_default.ml
 bin/bsb.ml : bsb/bsb_default.mli
+bin/bsb.ml : bsb/bsb_config_parse.ml
+bin/bsb.ml : bsb/bsb_config_parse.mli
+bin/bsb.ml : bsb/bsb_dep_infos.ml
+bin/bsb.ml : bsb/bsb_dep_infos.mli
+bin/bsb.ml : bsb/bsb_file.ml
+bin/bsb.ml : bsb/bsb_file.mli
 bin/bsb.ml : stubs/bs_hash_stubs.ml
 bin/bsb.ml : ext/ext_util.ml
 bin/bsb.ml : ext/ext_util.mli
@@ -56,12 +63,6 @@ bin/bsb.ml : bsb/bsb_ninja.ml
 bin/bsb.ml : bsb/bsb_ninja.mli
 bin/bsb.ml : bsb/bsb_gen.ml
 bin/bsb.ml : bsb/bsb_gen.mli
-bin/bsb.ml : bsb/bsb_config_parse.ml
-bin/bsb.ml : bsb/bsb_config_parse.mli
-bin/bsb.ml : bsb/bsb_dep_infos.ml
-bin/bsb.ml : bsb/bsb_dep_infos.mli
-bin/bsb.ml : bsb/bsb_file.ml
-bin/bsb.ml : bsb/bsb_file.mli
 bin/bsb.ml : bsb/bsb_unix.ml
 bin/bsb.ml : bsb/bsb_unix.mli
 bin/bsb.ml : bsb/bsb_main.ml