continue refactoring

Author: bobzhang

jscomp/Makefile

@@ -307,6 +307,7 @@ BSB_SRCS= bsb_config \
 	bsb_config_parse\
 	bsb_unix\
 	bsb_regex\
+	bsb_clean\
 	oCamlRes\
 	bsb_templates\
 	bsb_init

jscomp/all.depend

@@ -718,6 +718,8 @@ bsb/bsb_build_util.cmx : ext/string_map.cmx ext/string_hashtbl.cmx \
     ext/ext_filename.cmx ext/ext_array.cmx bsb/bsb_pkg.cmx \
     bsb/bsb_exception.cmx bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx \
     bsb/bsb_build_util.cmi
+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/string_set.cmx ext/literals.cmx ext/ext_string.cmx \
     ext/ext_filename.cmx bsb/bsb_config.cmi
 bsb/bsb_config_parse.cmx : ext/string_set.cmx ext/string_map.cmx \
@@ -752,13 +754,14 @@ bsb/bsb_helper_packer.cmx : ext/string_set.cmx ext/string_map.cmx \
 bsb/bsb_init.cmx : ext/string_hashtbl.cmx bsb/oCamlRes.cmx \
     ext/ext_string.cmx ext/ext_io.cmx bsb/bsb_templates.cmx bsb/bsb_regex.cmx \
     common/bs_version.cmx bsb/bsb_init.cmi
-bsb/bsb_log.cmx : bsb/bsb_log.cmi
+bsb/bsb_log.cmx : ext/ext_string.cmx ext/ext_color.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_ninja_gen.cmx \
-    bsb/bsb_merlin_gen.cmx bsb/bsb_init.cmx bsb/bsb_file.cmx \
+    ext/ext_string.cmx ext/ext_filename.cmx ext/ext_array.cmx \
+    bsb/bsb_unix.cmx bsb/bsb_ninja_gen.cmx bsb/bsb_merlin_gen.cmx \
+    bsb/bsb_log.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_clean.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
@@ -792,6 +795,7 @@ bsb/bsb_watcher_gen.cmx : ext/ext_list.cmx ext/ext_json_noloc.cmx \
 bsb/oCamlRes.cmx :
 bsb/bsb_bsdeps.cmi :
 bsb/bsb_build_util.cmi : ext/ext_json_types.cmx
+bsb/bsb_clean.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/string_set.cmi bsb/bsb_config_types.cmx

jscomp/bsb/bsb_clean.ml

@@ -0,0 +1,47 @@
+(* Copyright (C) 2017 Authors of BuckleScript
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+let (//) = Ext_filename.combine
+
+let clean_bs_garbage cwd =
+  Format.fprintf Format.std_formatter "@{<info>Cleaning:@} in %s@." cwd ; 
+  let aux x =
+    let x = (cwd // x)  in
+    if Sys.file_exists x then
+      Bsb_unix.remove_dir_recursive x  in
+  try
+    List.iter aux Bsb_config.all_lib_artifacts
+  with
+    e ->
+    Format.fprintf Format.err_formatter "@{<warning>Failed@} to clean due to %s" (Printexc.to_string e)
+
+
+let clean_bs_deps cwd =
+  Bsb_build_util.walk_all_deps  cwd  (fun { cwd} ->
+      (* whether top or not always do the cleaning *)
+      clean_bs_garbage cwd
+    )
+
+let clean_self cwd = clean_bs_garbage cwd

jscomp/bsb/bsb_clean.mli

@@ -0,0 +1,29 @@
+(* Copyright (C) 2017 Authors of BuckleScript
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+
+val clean_bs_deps : string -> unit 
+
+val clean_self : string -> unit 

jscomp/bsb/bsb_log.ml

@@ -22,3 +22,30 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
+let color_enabled = ref (Unix.isatty Unix.stdin)
+let set_color ppf =
+  Format.pp_set_formatter_tag_functions ppf 
+    ({ (Format.pp_get_formatter_tag_functions ppf () ) with
+       mark_open_tag = (fun s ->  if !color_enabled then  Ext_color.ansi_of_tag s else Ext_string.empty) ;
+       mark_close_tag = (fun _ ->  if !color_enabled then Ext_color.reset_lit else Ext_string.empty);
+     })
+
+
+let setup () = 
+  begin 
+    Format.pp_set_mark_tags Format.std_formatter true ;
+    Format.pp_set_mark_tags Format.err_formatter true;
+    Format.pp_set_mark_tags Format.str_formatter true;
+    set_color Format.std_formatter ; 
+    set_color Format.err_formatter;
+    set_color Format.str_formatter
+  end
+
+
+
+let print_string_args (args : string array) =
+  for i  = 0 to Array.length args - 1 do
+    print_string (Array.unsafe_get args i) ;
+    print_string Ext_string.single_space;
+  done ;
+  print_newline ()

jscomp/bsb/bsb_log.mli

@@ -22,5 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
+val color_enabled : bool ref 
 
+val setup : unit -> unit 
 
+val print_string_args : string array -> unit

jscomp/bsb/bsb_main.ml

@@ -105,49 +105,9 @@ let make_world = ref false
 let set_make_world () = make_world := true
 
 
+;; Bsb_log.setup ()
 
 
-let color_enabled = ref (Unix.isatty Unix.stdin)
-let set_color ppf =
-  Format.pp_set_formatter_tag_functions ppf 
-    ({ (Format.pp_get_formatter_tag_functions ppf () ) with
-       mark_open_tag = (fun s ->  if !color_enabled then  Ext_color.ansi_of_tag s else Ext_string.empty) ;
-       mark_close_tag = (fun _ ->  if !color_enabled then Ext_color.reset_lit else Ext_string.empty);
-     })
-
-let () = 
-  begin 
-    Format.pp_set_mark_tags Format.std_formatter true ;
-    Format.pp_set_mark_tags Format.err_formatter true;
-    Format.pp_set_mark_tags Format.str_formatter true;
-    set_color Format.std_formatter ; 
-    set_color Format.err_formatter;
-    set_color Format.str_formatter
-  end
-
-
-
-let clean_bs_garbage cwd =
-  Format.fprintf Format.std_formatter "@{<info>Cleaning:@} in %s@." cwd ; 
-  let aux x =
-    let x = (cwd // x)  in
-    if Sys.file_exists x then
-      Bsb_unix.remove_dir_recursive x  in
-  try
-    List.iter aux Bsb_config.all_lib_artifacts
-  with
-    e ->
-    Format.fprintf Format.err_formatter "@{<warning>Failed@} to clean due to %s" (Printexc.to_string e)
-
-
-let clean_bs_deps () =
-  Bsb_build_util.walk_all_deps  cwd  (fun { cwd} ->
-      (* whether top or not always do the cleaning *)
-      clean_bs_garbage cwd
-    )
-
-let clean_self () = clean_bs_garbage cwd
-
 
 (** Regenerate ninja file if necessary   
     return None if we dont need regenerate
@@ -177,7 +137,7 @@ let regenerate_ninja
     | Other _ -> 
       if check_result = Bsb_bsc_version_mismatch then begin 
         print_endline "Also clean current repo due to we have detected a different compiler";
-        clean_self (); 
+        Bsb_clean.clean_self cwd; 
       end ; 
       Bsb_build_util.mkp (cwd // Bsb_config.lib_bs); 
       let config = 
@@ -206,19 +166,19 @@ let regenerate_ninja
 
 let bsb_main_flags : (string * Arg.spec * string) list=
   [
-    "-color", Arg.Set color_enabled,
+    "-color", Arg.Set Bsb_log.color_enabled,
     " forced color output"
     ;
-    "-no-color", Arg.Clear color_enabled,
+    "-no-color", Arg.Clear Bsb_log.color_enabled,
     " forced no color output";
     "-w", Arg.Set watch_mode,
     " Watch mode" ;     
     regen, Arg.Set force_regenerate,
     " (internal) Always regenerate build.ninja no matter bsconfig.json is changed or not (for debugging purpose)"
     ;
-    "-clean-world", Arg.Unit clean_bs_deps,
+    "-clean-world", Arg.Unit (fun _ -> Bsb_clean.clean_bs_deps cwd),
     " Clean all bs dependencies";
-    "-clean", Arg.Unit clean_self,
+    "-clean", Arg.Unit (fun _ -> Bsb_clean.clean_self cwd),
     " Clean only current project";
     "-make-world", Arg.Unit set_make_world,
     " Build all dependencies and itself ";
@@ -231,13 +191,6 @@ let bsb_main_flags : (string * Arg.spec * string) list=
   ]
 
 
-let print_string_args (args : string array) =
-  for i  = 0 to Array.length args - 1 do
-    print_string (Array.unsafe_get args i) ;
-    print_string Ext_string.single_space;
-  done ;
-  print_newline ()
-
 
 (* Note that [keepdepfile] only makes sense when combined with [deps] for optimization
    It has to be the last command of [bsb]
@@ -257,7 +210,7 @@ let ninja_command_exit  vendor_ninja ninja_args  =
         (Filename.quote vendor_ninja) "-C" Bsb_config.lib_bs
     else 
       let args = [|"ninja.exe"; "-C"; Bsb_config.lib_bs |] in
-      print_string_args args ;
+      Bsb_log.print_string_args args ;
       Unix.execvp vendor_ninja args
   else
     let fixed_args_length = 3 in
@@ -279,7 +232,7 @@ let ninja_command_exit  vendor_ninja ninja_args  =
                        | 1 -> "-C"
                        | 2 -> Bsb_config.lib_bs
                        | _ -> Array.unsafe_get ninja_args (i - fixed_args_length) )) in
-      print_string_args args ;
+      Bsb_log.print_string_args args ;
       Unix.execvp vendor_ninja args