renaming

Author: bobzhang

jscomp/Makefile

@@ -295,13 +295,13 @@ BSB_SRCS= bsb_config \
 	bsb_helper_linker\
 	bsb_helper_extract\
 	bsb_rule\
-	bsb_ninja \
+	bsb_ninja_util \
 	bsb_parse_sources\
 	bsb_default\
 	bsb_bsdeps\
 	bsb_watcher_gen\
 	bsb_merlin_gen\
-	bsb_gen\
+	bsb_ninja_gen\
 	bsb_file\
 	bsb_config_types\
 	bsb_config_parse\

jscomp/all.depend

@@ -736,11 +736,6 @@ bsb/bsb_dir_index.cmx : bsb/bsb_dir_index.cmi
 bsb/bsb_exception.cmx : ext/ext_string.cmx ext/ext_position.cmx \
     ext/ext_json.cmx common/bs_version.cmx bsb/bsb_exception.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_list.cmx ext/ext_filename.cmx bsb/bsb_rule.cmx \
-    bsb/bsb_parse_sources.cmx bsb/bsb_ninja.cmx bsb/bsb_dir_index.cmx \
-    bsb/bsb_config_types.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
-    bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_gen.cmi
 bsb/bsb_helper_dep_graph.cmx : ext/string_set.cmx ext/string_map.cmx \
     ext/string_hashtbl.cmx bsb/bsb_helper_dep_graph.cmi
 bsb/bsb_helper_extract.cmx : ext/string_set.cmx ext/ext_string.cmx \
@@ -760,18 +755,23 @@ bsb/bsb_init.cmx : ext/string_hashtbl.cmx bsb/oCamlRes.cmx \
 bsb/bsb_log.cmx : bsb/bsb_log.cmi
 bsb/bsb_main.cmx : ext/string_hash_set.cmx ext/literals.cmx ext/ext_sys.cmx \
     ext/ext_string.cmx ext/ext_filename.cmx ext/ext_color.cmx \
-    ext/ext_array.cmx bsb/bsb_unix.cmx bsb/bsb_merlin_gen.cmx \
-    bsb/bsb_init.cmx bsb/bsb_gen.cmx bsb/bsb_file.cmx \
+    ext/ext_array.cmx bsb/bsb_unix.cmx bsb/bsb_ninja_gen.cmx \
+    bsb/bsb_merlin_gen.cmx bsb/bsb_init.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_bsdeps.cmx bsb/bsb_main.cmi
 bsb/bsb_merlin_gen.cmx : ext/literals.cmx ext/ext_string.cmx \
     ext/ext_filename.cmx bsb/bsb_parse_sources.cmx bsb/bsb_config_types.cmx \
     bsb/bsb_config.cmx bsb/bsb_merlin_gen.cmi
-bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx \
+bsb/bsb_ninja_gen.cmx : ext/string_map.cmx ext/literals.cmx \
+    ext/ext_string.cmx ext/ext_list.cmx ext/ext_filename.cmx bsb/bsb_rule.cmx \
+    bsb/bsb_parse_sources.cmx bsb/bsb_ninja_util.cmx bsb/bsb_dir_index.cmx \
+    bsb/bsb_config_types.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
+    bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_ninja_gen.cmi
+bsb/bsb_ninja_util.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_filename.cmx bsb/bsb_rule.cmx \
     bsb/bsb_parse_sources.cmx bsb/bsb_dir_index.cmx bsb/bsb_config.cmx \
-    bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_ninja.cmi
+    bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_ninja_util.cmi
 bsb/bsb_os_dependent.cmx :
 bsb/bsb_parse_sources.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/string_map.cmx ext/ext_string.cmx ext/ext_json_types.cmx \
@@ -798,7 +798,6 @@ bsb/bsb_default.cmi : ext/string_set.cmi bsb/bsb_config_types.cmx
 bsb/bsb_dir_index.cmi :
 bsb/bsb_exception.cmi : ext/ext_position.cmi ext/ext_json_types.cmx
 bsb/bsb_file.cmi :
-bsb/bsb_gen.cmi : bsb/bsb_config_types.cmx
 bsb/bsb_helper_dep_graph.cmi : ext/string_set.cmi ext/string_map.cmi \
     ext/string_hashtbl.cmi
 bsb/bsb_helper_extract.cmi : ext/string_set.cmi
@@ -809,7 +808,8 @@ bsb/bsb_init.cmi :
 bsb/bsb_log.cmi :
 bsb/bsb_main.cmi :
 bsb/bsb_merlin_gen.cmi : bsb/bsb_config_types.cmx
-bsb/bsb_ninja.cmi : ext/string_map.cmi ext/string_hash_set.cmi \
+bsb/bsb_ninja_gen.cmi : bsb/bsb_config_types.cmx
+bsb/bsb_ninja_util.cmi : ext/string_map.cmi ext/string_hash_set.cmi \
     bsb/bsb_rule.cmi bsb/bsb_parse_sources.cmi bsb/bsb_config.cmi
 bsb/bsb_parse_sources.cmi : ext/string_set.cmi ext/ext_json_types.cmx \
     ext/ext_file_pp.cmi bsb/bsb_dir_index.cmi common/binary_cache.cmi

jscomp/bsb/bsb_main.ml

@@ -190,7 +190,7 @@ let regenerate_ninja
       begin 
         Bsb_merlin_gen.merlin_file_gen ~cwd
           (bsc_dir // bsppx_exe) config;
-        Bsb_gen.output_ninja ~cwd ~bsc_dir config ; 
+        Bsb_ninja_gen.output_ninja ~cwd ~bsc_dir config ; 
         Literals.bsconfig_json :: config.globbed_dirs
         |> List.map
           (fun x ->

jscomp/bsb/bsb_gen.ml jscomp/bsb/bsb_ninja_gen.ml

@@ -96,7 +96,7 @@ let output_ninja
         | Some  s -> 
           "-ppx " ^ s         
       in 
-      Bsb_ninja.output_kvs
+      Bsb_ninja_util.output_kvs
         [|
           "src_root_dir", cwd (* TODO: need check its integrity -- allow relocate or not? *);
           "bsc", bsc ;
@@ -133,7 +133,7 @@ let output_ninja
               merge_module_info_map  acc  sources ,  dir::dirs , (List.map (fun x -> dir // x ) resources) @ acc_resources
             ) (String_map.empty,[],[]) bs_file_groups in
         Binary_cache.write_build_cache (cwd // Bsb_config.lib_bs // Binary_cache.bsbuild_cache) [|bs_groups|] ;
-        Bsb_ninja.output_kv
+        Bsb_ninja_util.output_kv
           Bsb_build_schemas.bsc_lib_includes (Bsb_build_util.flag_concat dash_i @@ 
           (all_includes source_dirs  ))  oc ;
         static_resources
@@ -150,28 +150,28 @@ let output_ninja
             ) [] bs_file_groups in
         (* Make sure [sources] does not have files in [lib] we have to check later *)
         let lib = bs_groups.((Bsb_dir_index.lib_dir_index :> int)) in
-        Bsb_ninja.output_kv
+        Bsb_ninja_util.output_kv
           Bsb_build_schemas.bsc_lib_includes (Bsb_build_util.flag_concat dash_i @@
            (all_includes source_dirs.(0))) oc ;
         for i = 1 to number_of_dev_groups  do
           let c = bs_groups.(i) in
           String_map.iter (fun k _ -> if String_map.mem k lib then failwith ("conflict files found:" ^ k)) c ;
-          Bsb_ninja.output_kv (Bsb_dir_index.(string_of_bsb_dev_include (of_int i)))
+          Bsb_ninja_util.output_kv (Bsb_dir_index.(string_of_bsb_dev_include (of_int i)))
             (Bsb_build_util.flag_concat "-I" @@ source_dirs.(i)) oc
         done  ;
         Binary_cache.write_build_cache (cwd // Bsb_config.lib_bs // Binary_cache.bsbuild_cache) bs_groups ;
         static_resources;
     in
     let all_info =
-      Bsb_ninja.handle_file_groups oc       
+      Bsb_ninja_util.handle_file_groups oc       
         ~custom_rules
-        ~js_post_build_cmd  ~package_specs ~files_to_install bs_file_groups Bsb_ninja.zero  in
+        ~js_post_build_cmd  ~package_specs ~files_to_install bs_file_groups Bsb_ninja_util.zero  in
     let () =
-      List.iter (fun x -> Bsb_ninja.output_build oc
+      List.iter (fun x -> Bsb_ninja_util.output_build oc
                     ~output:x
                     ~input:(Bsb_config.proj_rel x)
                     ~rule:Bsb_rule.copy_resources) static_resources in
-    Bsb_ninja.phony oc ~order_only_deps:(static_resources @ all_info.all_config_deps)
+    Bsb_ninja_util.phony oc ~order_only_deps:(static_resources @ all_info.all_config_deps)
       ~inputs:[]
       ~output:Literals.build_ninja ;
     close_out oc;

jscomp/bsb/bsb_gen.mli jscomp/bsb/bsb_ninja_gen.mli

@@ -55,7 +55,7 @@ val output_kvs : (string * string) array -> out_channel -> unit
 
 type info = {
   all_config_deps : string list  ;
-  (*all_installs :  string list *)
+
 }
 
 val zero : info 
@@ -69,5 +69,3 @@ val handle_file_groups : out_channel ->
   Bsb_parse_sources.file_group list ->
   info -> info
 
-(** TODO: need clean up when running across projects process *)
-(* val files_to_install : String_hash_set.t  *)