remove bsb_pkg_create which is never used

bobzhang · bobzhang · commit 2ca63cbfc87e · 2017-08-22T10:12:58.000+08:00
diff --git a/jscomp/Makefile b/jscomp/Makefile
@@ -219,7 +219,7 @@ EXT_SRCS = 	literals \
 	ident_hashtbl\
 	int_hashtbl\
 	ext_filename\
-	ext_package_name
+	ext_namespace
 
 EXT_CMXS=$(addprefix ext/, $(addsuffix .cmx, $(EXT_SRCS)))
 EXT_CMOS=$(addprefix ext/, $(addsuffix .cmo, $(EXT_SRCS)))
@@ -318,7 +318,6 @@ BSB_SRCS= bsb_config\
 	bsb_build_schemas\
 	bsb_build_util\
 	bsb_package_specs\
-	bsb_pkg_create\
 	bsb_pkg_map_gen\
 	bsb_helper_extract\
 	bsb_helper_dep_graph\
diff --git a/jscomp/all.depend b/jscomp/all.depend
@@ -91,7 +91,7 @@ ext/int_hashtbl.cmx : ext/hashtbl_gen.cmx ext/ext_int.cmx \
     stubs/bs_hash_stubs.cmx ext/int_hashtbl.cmi
 ext/ext_filename.cmx : ext/literals.cmx ext/ext_string.cmx \
     ext/ext_pervasives.cmx ext/ext_filename.cmi
-ext/ext_package_name.cmx : ext/literals.cmx ext/ext_package_name.cmi
+ext/ext_namespace.cmx : ext/literals.cmx ext/ext_namespace.cmi
 ext/literals.cmi :
 ext/ext_util.cmi :
 ext/ext_int.cmi :
@@ -152,7 +152,7 @@ ext/hash_set_poly.cmi :
 ext/ident_hashtbl.cmi : ext/hashtbl_gen.cmx
 ext/int_hashtbl.cmi : ext/hashtbl_gen.cmx
 ext/ext_filename.cmi :
-ext/ext_package_name.cmi :
+ext/ext_namespace.cmi :
 common/bs_version.cmx : common/bs_version.cmi
 common/js_config.cmx : common/js_config.cmi
 common/ext_log.cmx : common/js_config.cmx common/ext_log.cmi
@@ -365,12 +365,11 @@ core/ocaml_batch_compile.cmi :
 core/js_runtime_modules.cmx :
 core/config_util.cmx : core/config_util.cmi
 core/js_packages_info.cmx : core/lam_module_ident.cmx ext/ext_sys.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_package_name.cmx \
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
     ext/ext_filename.cmx core/config_util.cmx depends/bs_exception.cmx \
     core/js_packages_info.cmi
 core/js_packages_state.cmx : core/js_packages_info.cmx \
-    ext/ext_pervasives.cmx ext/ext_package_name.cmx \
-    core/js_packages_state.cmi
+    ext/ext_pervasives.cmx ext/ext_namespace.cmx core/js_packages_state.cmi
 core/type_int_to_string.cmx :
 core/type_util.cmx : core/type_int_to_string.cmx common/ext_log.cmx \
     core/type_util.cmi
@@ -614,17 +613,17 @@ core/lam_compile_group.cmx : ext/literals.cmx core/lam_util.cmx \
     core/js_pass_debug.cmx core/js_packages_state.cmx core/js_output.cmx \
     core/js_fold_basic.cmx core/js_exp_make.cmx core/js_dump.cmx \
     common/js_config.cmx core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_package_name.cmx \
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
     common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.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_string.cmx ext/ext_pervasives.cmx ext/ext_package_name.cmx \
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.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 \
-    ext/ext_pervasives.cmx ext/ext_package_name.cmx ext/ext_format.cmx \
+    ext/ext_pervasives.cmx ext/ext_namespace.cmx ext/ext_format.cmx \
     ext/ext_filename.cmx depends/bs_exception.cmx depends/ast_extract.cmx \
     core/ocaml_batch_compile.cmi
 core/bspack_main.cmi :
@@ -703,7 +702,7 @@ ounit_tests/ounit_vec_test.cmx : ext/set_int.cmx ounit/oUnit.cmx \
     ext/int_vec.cmx ext/ext_json.cmx
 ounit_tests/ounit_data_random.cmx :
 ounit_tests/ounit_string_tests.cmx : ounit_tests/ounit_data_random.cmx \
-    ounit/oUnit.cmx ext/ext_string.cmx ext/ext_package_name.cmx
+    ounit/oUnit.cmx ext/ext_string.cmx ext/ext_namespace.cmx
 ounit_tests/ounit_utf8_test.cmx : ounit/oUnit.cmx ext/ext_utf8.cmx
 ounit_tests/ounit_js_regex_checker_tests.cmx : ounit/oUnit.cmx \
     ext/ext_js_regex.cmx
@@ -754,7 +753,7 @@ bsb/bsb_clean.cmx : ext/ext_filename.cmx bsb/bsb_unix.cmx bsb/bsb_config.cmx \
     bsb/bsb_build_util.cmx bsb/bsb_clean.cmi
 bsb/bsb_config.cmx : ext/ext_filename.cmx bsb/bsb_config.cmi
 bsb/bsb_config_parse.cmx : ext/string_map.cmx ext/string_hash_set.cmx \
-    ext/literals.cmx ext/ext_package_name.cmx ext/ext_json_types.cmx \
+    ext/literals.cmx ext/ext_namespace.cmx ext/ext_json_types.cmx \
     ext/ext_json_parse.cmx ext/ext_json.cmx ext/ext_filename.cmx \
     ext/ext_file_pp.cmx ext/ext_array.cmx bsb/bsb_watcher_gen.cmx \
     bsb/bsb_pkg.cmx bsb/bsb_parse_sources.cmx bsb/bsb_package_specs.cmx \
@@ -765,7 +764,7 @@ bsb/bsb_config_types.cmx : ext/string_map.cmx ext/string_hash_set.cmx \
     bsb/bsb_parse_sources.cmx bsb/bsb_package_specs.cmx
 bsb/bsb_default.cmx : bsb/bsb_config_types.cmx bsb/bsb_default.cmi
 bsb/bsb_depfile_gen.cmx : ext/string_map.cmx ext/literals.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_package_name.cmx \
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
     bsb/bsb_dir_index.cmx bsb/bsb_build_cache.cmx bsb/bsb_depfile_gen.cmi
 bsb/bsb_dir_index.cmx : bsb/bsb_dir_index.cmi
 bsb/bsb_exception.cmx : ext/ext_string.cmx ext/ext_position.cmx \
@@ -798,7 +797,7 @@ bsb/bsb_merlin_gen.cmx : ext/literals.cmx ext/ext_string.cmx \
     bsb/bsb_config.cmx bsb/bsb_merlin_gen.cmi
 bsb/bsb_ninja_file_groups.cmx : ext/string_set.cmx ext/string_map.cmx \
     ext/string_hash_set.cmx ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_pervasives.cmx ext/ext_package_name.cmx ext/ext_filename.cmx \
+    ext/ext_pervasives.cmx ext/ext_namespace.cmx ext/ext_filename.cmx \
     bsb/bsb_rule.cmx bsb/bsb_parse_sources.cmx bsb/bsb_package_specs.cmx \
     bsb/bsb_ninja_util.cmx bsb/bsb_ninja_global_vars.cmx \
     bsb/bsb_dir_index.cmx bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx \
@@ -819,7 +818,7 @@ bsb/bsb_ninja_util.cmx : ext/ext_string.cmx bsb/bsb_rule.cmx \
     bsb/bsb_ninja_util.cmi
 bsb/bsb_os_dependent.cmx :
 bsb/bsb_package_specs.cmx : ext/string_map.cmx ext/literals.cmx \
-    ext/ext_string.cmx ext/ext_package_name.cmx ext/ext_json_types.cmx \
+    ext/ext_string.cmx ext/ext_namespace.cmx ext/ext_json_types.cmx \
     ext/ext_json.cmx ext/ext_filename.cmx bsb/bsb_exception.cmx \
     bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx bsb/bsb_package_specs.cmi
 bsb/bsb_parse_sources.cmx : ext/string_vec.cmx ext/string_set.cmx \
@@ -831,7 +830,6 @@ bsb/bsb_parse_sources.cmx : ext/string_vec.cmx ext/string_set.cmx \
 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 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 \
@@ -846,7 +844,7 @@ bsb/bsb_watcher_gen.cmx : ext/ext_list.cmx ext/ext_json_noloc.cmx \
     ext/ext_filename.cmx ext/ext_array.cmx bsb/bsb_parse_sources.cmx \
     bsb/bsb_config.cmx bsb/bsb_watcher_gen.cmi
 bsb/bsb_world.cmx : ext/string_hash_set.cmx ext/literals.cmx \
-    ext/ext_package_name.cmx ext/ext_filename.cmx bsb/bsb_unix.cmx \
+    ext/ext_namespace.cmx ext/ext_filename.cmx bsb/bsb_unix.cmx \
     bsb/bsb_ninja_regen.cmx bsb/bsb_file.cmx bsb/bsb_config_types.cmx \
     bsb/bsb_config_parse.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_world.cmi
@@ -882,7 +880,6 @@ bsb/bsb_package_specs.cmi : ext/ext_json_types.cmx
 bsb/bsb_parse_sources.cmi : ext/string_set.cmi ext/ext_json_types.cmx \
     ext/ext_file_pp.cmi bsb/bsb_dir_index.cmi bsb/bsb_build_cache.cmi
 bsb/bsb_pkg.cmi :
-bsb/bsb_pkg_create.cmi :
 bsb/bsb_pkg_map_gen.cmi : bsb/bsb_parse_sources.cmi
 bsb/bsb_query.cmi :
 bsb/bsb_regex.cmi :
diff --git a/jscomp/bsb/bsb_config_parse.ml b/jscomp/bsb/bsb_config_parse.ml
@@ -261,7 +261,7 @@ let interpret_json
         in 
         let namespace =     
           if !namespace then 
-            Some (Ext_package_name.namespace_of_package_name package_name)
+            Some (Ext_namespace.namespace_of_package_name package_name)
           else   None  in  
         {
           package_name ;
diff --git a/jscomp/bsb/bsb_depfile_gen.ml b/jscomp/bsb/bsb_depfile_gen.ml
@@ -59,7 +59,7 @@ let output_file oc source namespace =
   match namespace with 
   | None -> output_string oc source ;
   | Some ns ->
-    output_string oc ( Ext_package_name.make ~ns source)
+    output_string oc ( Ext_namespace.make ~ns source)
 
 (** for bucklescript artifacts 
     [lhs_suffix] is [.cmj]
diff --git a/jscomp/bsb/bsb_ninja_file_groups.ml b/jscomp/bsb/bsb_ninja_file_groups.ml
@@ -117,7 +117,7 @@ let emit_impl_build
     | None -> 
       filename_sans_extension 
     | Some ns -> 
-      Ext_package_name.make ~ns filename_sans_extension
+      Ext_namespace.make ~ns filename_sans_extension
   in 
   let file_cmi =  output_filename_sans_extension ^ Literals.suffix_cmi in
   let output_cmj =  output_filename_sans_extension ^ Literals.suffix_cmj in
@@ -184,7 +184,7 @@ let emit_intf_build
     | None -> 
       filename_sans_extension 
     | Some ns -> 
-      Ext_package_name.make ~ns filename_sans_extension
+      Ext_namespace.make ~ns filename_sans_extension
   in 
   let output_cmi = output_filename_sans_extension ^ Literals.suffix_cmi in  
   let common_shadows = 
diff --git a/jscomp/bsb/bsb_package_specs.ml b/jscomp/bsb/bsb_package_specs.ml
@@ -186,7 +186,7 @@ let get_list_of_output_js
     package_specs output_file_sans_extension = 
   Spec_set.fold (fun format acc ->
       package_output format 
-        ( Ext_package_name.js_name_of_basename output_file_sans_extension)
+        ( Ext_namespace.js_name_of_basename output_file_sans_extension)
       :: acc
     ) package_specs []
 
diff --git a/jscomp/bsb/bsb_pkg_create.ml b/jscomp/bsb/bsb_pkg_create.ml
diff --git a/jscomp/bsb/bsb_pkg_create.mli b/jscomp/bsb/bsb_pkg_create.mli
diff --git a/jscomp/bsb/bsb_world.ml b/jscomp/bsb/bsb_world.ml
@@ -43,7 +43,7 @@ let install_targets cwd (config : Bsb_config_types.t option) =
     let x = 
       match namespace with 
       | None -> x 
-      | Some ns -> Ext_package_name.make ~ns x in 
+      | Some ns -> Ext_namespace.make ~ns x in 
     install ~destdir (cwd // x ^  Literals.suffix_ml) ;
     install ~destdir (cwd // x ^  Literals.suffix_re) ;
     install ~destdir (cwd // x ^ Literals.suffix_mli) ;
diff --git a/jscomp/core/js_implementation.ml b/jscomp/core/js_implementation.ml
@@ -162,7 +162,7 @@ let make_structure_item ~ns cunit : Parsetree.structure_item =
     (Mb.mk {txt = cunit; loc  }
        (Mod.ident 
           {txt = Lident 
-               ( Ext_package_name.make ~ns cunit)
+               ( Ext_namespace.make ~ns cunit)
           ; loc}))
 
 
diff --git a/jscomp/core/js_packages_info.ml b/jscomp/core/js_packages_info.ml
@@ -203,7 +203,7 @@ let string_of_module_id
       | Runtime  
       | Ml  -> 
         let id = x.id in
-        let js_file =  Ext_package_name.js_name_of_basename id.name in 
+        let js_file =  Ext_namespace.js_name_of_basename id.name in 
         let rebase different_package package_dir dep =
           let current_unit_dir =
             `Dir (get_output_dir 
diff --git a/jscomp/core/js_packages_state.ml b/jscomp/core/js_packages_state.ml
@@ -40,7 +40,7 @@ let set_package_name name =
 let set_package_map name = 
     set_package_name name ; 
     Clflags.open_modules := 
-      Ext_package_name.namespace_of_package_name name ::
+      Ext_namespace.namespace_of_package_name name ::
       !Clflags.open_modules
       
 let update_npm_package_path s  = 
diff --git a/jscomp/core/lam_compile_group.ml b/jscomp/core/lam_compile_group.ml
@@ -382,7 +382,7 @@ let lambda_as_module
     let (//) = Filename.concat in 
     let basename =  
       (* #758, output_prefix is already chopped *)
-       Ext_package_name.js_name_of_basename (Filename.basename
+       Ext_namespace.js_name_of_basename (Filename.basename
          output_prefix (* -o *)
          (* filename *) (* see #757  *)
       ) in
diff --git a/jscomp/core/ocaml_batch_compile.ml b/jscomp/core/ocaml_batch_compile.ml
@@ -44,7 +44,7 @@ let process_result ppf  main_file ast_table result =
   if not (!Clflags.compile_only) then
     Sys.command
       ("node " ^
-        Ext_package_name.js_name_of_basename (Filename.chop_extension main_file)
+        Ext_namespace.js_name_of_basename (Filename.chop_extension main_file)
       )
   else 0
 
diff --git a/jscomp/ext/ext_namespace.ml b/jscomp/ext/ext_namespace.ml
@@ -27,25 +27,25 @@
  (* Note the build system should check the validity of filenames
     espeically, it should not contain '-'
  *)
- let package_sep_char = '-'
- let package_sep = "-"
+ let ns_sep_char = '-'
+ let ns_sep = "-"
 
  let make ~ns cunit  = 
-    cunit ^ package_sep ^ ns
+    cunit ^ ns_sep ^ ns
     
 
 let rec rindex_rec s i c =
   if i < 0 then i else
   if String.unsafe_get s i = c then i else rindex_rec s (i - 1) c;;
     
-let remove_package_suffix name =
-    let i = rindex_rec name (String.length name - 1) package_sep_char in 
+let remove_ns_suffix name =
+    let i = rindex_rec name (String.length name - 1) ns_sep_char in 
     if i < 0 then name 
     else String.sub name 0 i 
 
 
 let js_name_of_basename s = 
-  remove_package_suffix (String.uncapitalize s) ^ Literals.suffix_js
+  remove_ns_suffix (String.uncapitalize s) ^ Literals.suffix_js
   
   
 let namespace_of_package_name (s : string) : string = 
diff --git a/jscomp/ext/ext_namespace.mli b/jscomp/ext/ext_namespace.mli
@@ -25,7 +25,7 @@
 
 val make : ns:string -> string -> string 
 
-val remove_package_suffix: string -> string 
+val remove_ns_suffix: string -> string 
 
 (* Note  we have to output uncapitalized file Name, 
   or at least be consistent, since by reading cmi file on Case insensitive OS, we don't really know it is `list.cmi` or `List.cmi`, so that `require (./list.js)` or `require(./List.js)`
diff --git a/jscomp/ounit_tests/ounit_string_tests.ml b/jscomp/ounit_tests/ounit_string_tests.ml

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ let interpret_json`
`261`	`261`	`in`
`262`	`262`	`let namespace =`
`263`	`263`	`if !namespace then`
`264`		`- Some (Ext_package_name.namespace_of_package_name package_name)`
	`264`	`+ Some (Ext_namespace.namespace_of_package_name package_name)`
`265`	`265`	`else None in`
`266`	`266`	`{`
`267`	`267`	`package_name ;`