Merge pull request #1118 from chenglou/lol-dangling

Fix bsb -w silently failing

Author: bobzhang

jscomp/bin/bsb.ml

@@ -8156,7 +8156,7 @@ let revise_merlin new_content =
       output_string ochan merlin_trailer ;
       output_string ochan "\n";
       close_out ochan
-    else if header >=0 && tail >= 0  then 
+    else if header >=0 && tail >= 0  then
       (* there is one, hit it everytime,
          should be fixed point
       *)
@@ -8207,12 +8207,12 @@ let write_ninja_file bsc_dir cwd =
                          FLG -ppx %s\n\
                         " lib_ocaml_dir lib_ocaml_dir bsppx
         ) in
-    let () = 
-      match Bsb_default.get_bsc_flags () with 
+    let () =
+      match Bsb_default.get_bsc_flags () with
       | [] -> ()
-      | xs -> 
-        Buffer.add_string buffer 
-          (Printf.sprintf "\nFLG %s" (String.concat " " xs) ) in 
+      | xs ->
+        Buffer.add_string buffer
+          (Printf.sprintf "\nFLG %s" (String.concat " " xs) ) in
     let () =
       Bsb_default.get_bs_dependencies ()
       |> List.iter (fun package ->
@@ -8270,7 +8270,7 @@ let write_ninja_file bsc_dir cwd =
       |? (Bsb_build_schemas.refmt, `Str (Bsb_default.set_refmt ~cwd))
 
       |? (Bsb_build_schemas.sources, `Obj (fun x ->
-          let res : Bsb_build_ui.t =  
+          let res : Bsb_build_ui.t =
             Bsb_build_ui.parsing_source
               Bsb_build_ui.lib_dir_index
               Filename.current_dir_name x in
@@ -8279,7 +8279,7 @@ let write_ninja_file bsc_dir cwd =
       |?  (Bsb_build_schemas.sources, `Arr (fun xs ->
 
           let res : Bsb_build_ui.t  =
-            Bsb_build_ui.parsing_sources 
+            Bsb_build_ui.parsing_sources
               Bsb_build_ui.lib_dir_index
               Filename.current_dir_name xs
           in
@@ -8353,50 +8353,50 @@ let separator = "--"
 
 
 let internal_package_specs = "-internal-package-specs"
-let internal_install = "-internal-install"    
-let build_bs_deps package_specs   = 
-  let bsc_dir = Bsb_build_util.get_bsc_dir cwd in 
-  let bsb_exe = bsc_dir // "bsb.exe" in 
-  Bsb_default.walk_all_deps true cwd 
-    (fun top cwd -> 
-       if not top then 
+let internal_install = "-internal-install"
+let build_bs_deps package_specs   =
+  let bsc_dir = Bsb_build_util.get_bsc_dir cwd in
+  let bsb_exe = bsc_dir // "bsb.exe" in
+  Bsb_default.walk_all_deps true cwd
+    (fun top cwd ->
+       if not top then
          Bsb_unix.run_command_execv true
-           {cmd = bsb_exe; 
-            cwd = cwd; 
-            args  = 
+           {cmd = bsb_exe;
+            cwd = cwd;
+            args  =
               [| bsb_exe ; internal_install ; no_dev; internal_package_specs; package_specs; regen; separator |]})
 
 let annoymous filename =
   String_vec.push  filename targets
 
-let watch_mode = ref false 
-let make_world = ref false 
+let watch_mode = ref false
+let make_world = ref false
 
 let lib_bs = "lib" // "bs"
 let lib_amdjs = "lib" // "amdjs"
 let lib_goog = "lib" // "goog"
 let lib_js = "lib" // "js"
 let lib_ocaml = "lib" // "ocaml" (* installed binary artifacts *)
-let clean_bs_garbage cwd = 
+let clean_bs_garbage cwd =
   print_string "Doing cleaning in ";
-  print_endline cwd; 
-  let aux x = 
-    let x = (cwd // x)  in 
-    if Sys.file_exists x then 
-      Bsb_unix.remove_dir_recursive x  in 
-  try 
-    aux lib_bs ; 
-    aux lib_amdjs ; 
+  print_endline cwd;
+  let aux x =
+    let x = (cwd // x)  in
+    if Sys.file_exists x then
+      Bsb_unix.remove_dir_recursive x  in
+  try
+    aux lib_bs ;
+    aux lib_amdjs ;
     aux lib_goog;
     aux lib_js ;
-    aux lib_ocaml   
-  with 
-    e -> 
+    aux lib_ocaml
+  with
+    e ->
     prerr_endline ("Failed to clean due to " ^ Printexc.to_string e)
 
-let clean_bs_deps () =   
-  Bsb_default.walk_all_deps true cwd  (fun top cwd -> 
-      clean_bs_garbage cwd 
+let clean_bs_deps () =
+  Bsb_default.walk_all_deps true cwd  (fun top cwd ->
+      clean_bs_garbage cwd
     )
 
 
@@ -8407,22 +8407,22 @@ let bsb_main_flags =
     "-w", Arg.Set watch_mode,
     " Watch mode" ;
     internal_install, Arg.Set Bsb_config.install,
-    " (internal)Install public interface or not, when make-world it will install(in combination with -regen to make sure it has effect)"; 
-    no_dev, Arg.Set Bsb_config.no_dev, 
+    " (internal)Install public interface or not, when make-world it will install(in combination with -regen to make sure it has effect)";
+    no_dev, Arg.Set Bsb_config.no_dev,
     " (internal)Build dev dependencies in make-world and dev group(in combination with -regen)";
     regen, Arg.Set force_regenerate,
     " Always regenerate build.ninja no matter bsconfig.json is changed or not (for debugging purpose)"
     ;
-    internal_package_specs, Arg.String Bsb_default.internal_override_package_specs, 
-    " (internal)Overide package specs (in combination with -regen)"; 
+    internal_package_specs, Arg.String Bsb_default.internal_override_package_specs,
+    " (internal)Overide package specs (in combination with -regen)";
     "-clean-world", Arg.Unit clean_bs_deps,
     " Clean all bs dependencies";
     "-make-world", Arg.Set make_world,
     " Build all dependencies and itself "
   ]
 
-(** Regenerate ninja file and return None if we dont need regenerate 
-    otherwise return some info 
+(** Regenerate ninja file and return None if we dont need regenerate
+    otherwise return some info
 *)
 let regenerate_ninja cwd bsc_dir forced : Bsb_default.package_specs option =
   let output_deps = Bsb_config.lib_bs // bsdeps in
@@ -8446,43 +8446,43 @@ let regenerate_ninja cwd bsc_dir forced : Bsb_default.package_specs option =
       Some (Bsb_default.get_package_specs ())
       (* This makes sense since we did parse the json file *)
     end
-  else None   
+  else None
 
 let ninja_error_message = "ninja (required for bsb build system) is not installed, \n\
                            please visit https://github.com/ninja-build/ninja to have it installed\n"
-let () = 
-  Printexc.register_printer (function 
-      | Unix.Unix_error(Unix.ENOENT, "execvp", "ninja") -> 
+let () =
+  Printexc.register_printer (function
+      | Unix.Unix_error(Unix.ENOENT, "execvp", "ninja") ->
         Some ninja_error_message
       | _ -> None
     )
 
-let print_string_args (args : string array) = 
-  for i  = 0 to Array.length args - 1 do 
-    print_string (Array.unsafe_get args i) ; 
+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 " ";
-  done ; 
-  print_newline ()  
+  done ;
+  print_newline ()
 
 (* Note that [keepdepfile] only makes sense when combined with [deps] for optimizatoin *)
-let ninja_command ninja ninja_args = 
+let ninja_command ninja ninja_args =
   let ninja_args_len = Array.length ninja_args in
-  if ninja_args_len = 0 then     
-    begin 
-      let args = [|"ninja"; "-C"; Bsb_config.lib_bs |]    in 
-      print_string_args args ; 
-      Unix.execvp ninja args 
-    end    
-  else 
-    let fixed_args_length = 3 in 
+  if ninja_args_len = 0 then
+    begin
+      let args = [|"ninja"; "-C"; Bsb_config.lib_bs |]    in
+      print_string_args args ;
+      Unix.execvp ninja args
+    end
+  else
+    let fixed_args_length = 3 in
     let args = (Array.init (fixed_args_length + ninja_args_len)
-                  (fun i -> match i with 
+                  (fun i -> match i with
                      | 0 -> "ninja"
                      | 1 -> "-C"
                      | 2 -> Bsb_config.lib_bs
-                     | _ -> Array.unsafe_get ninja_args (i - fixed_args_length) )) in 
+                     | _ -> Array.unsafe_get ninja_args (i - fixed_args_length) )) in
     print_string_args args ;
-    Unix.execvp ninja args 
+    Unix.execvp ninja args
 
 
 
@@ -8502,37 +8502,37 @@ let usage = "Usage : bsb.exe <bsb-options> <files> -- <ninja_options>\n\
 
 
   (*
-  let bsb_exe = bsc_dir // "bsb.exe" in 
-  Bsb_default.walk_all_deps true cwd 
+  let bsb_exe = bsc_dir // "bsb.exe" in
+  Bsb_default.walk_all_deps true cwd
     (fun top cwd -> Bsb_unix.run_command_execv (not top)
         {cmd = bsb_exe; cwd = cwd; args  = [| bsb_exe ; separator; "-t" ; "clean"|]})
   *)
-let make_world_deps deps =  
+let make_world_deps deps =
   print_endline "\nMaking the dependency world!";
-  let deps = 
-    match deps with 
-    | None -> 
-      let json = Ext_json.parse_json_from_file Literals.bsconfig_json in 
-      begin match json with 
-        | `Obj map -> 
-          map 
-          |? (Bsb_build_schemas.package_specs, 
+  let deps =
+    match deps with
+    | None ->
+      let json = Ext_json.parse_json_from_file Literals.bsconfig_json in
+      begin match json with
+        | `Obj map ->
+          map
+          |? (Bsb_build_schemas.package_specs,
               `Arr Bsb_default.set_package_specs_from_array)
           |> ignore ;
           Bsb_default.get_package_specs ()
         | _ -> assert false
-      end 
-    | Some spec -> spec in                               
-  build_bs_deps (  String_set.fold 
-                     (fun k acc -> k ^ "," ^ acc ) deps Ext_string.empty ) 
+      end
+    | Some spec -> spec in
+  build_bs_deps (  String_set.fold
+                     (fun k acc -> k ^ "," ^ acc ) deps Ext_string.empty )
 let () =
   let bsc_dir = Bsb_build_util.get_bsc_dir cwd in
-  let ninja = 
-    if Sys.win32 then 
+  let ninja =
+    if Sys.win32 then
       bsc_dir // "ninja.exe"
-    else 
-      "ninja" 
-  in 
+    else
+      "ninja"
+  in
   (* try *)
   (* see discussion #929 *)
   if Array.length Sys.argv <= 1 then
@@ -8546,30 +8546,33 @@ let () =
       | `No_split
         ->
         begin
-          Arg.parse bsb_main_flags annoymous usage;          
+          Arg.parse bsb_main_flags annoymous usage;
           (* [-make-world] should never be combined with [-package-specs] *)
-          if !make_world then
+          if !make_world then begin
             (* don't regenerate files when we only run [bsb -clean-world] *)
-            let deps = regenerate_ninja cwd bsc_dir !force_regenerate in 
-            make_world_deps deps ;  
-            if  !watch_mode then 
-              watch ()
-              (* ninja is not triggered in this case *)
+            let deps = regenerate_ninja cwd bsc_dir !force_regenerate in
+            make_world_deps deps
+          end;
+          if !watch_mode then begin
+            watch ()
+            (* ninja is not triggered in this case *)
+          end
         end
       | `Split (bsb_args,ninja_args)
         ->
         begin
           Arg.parse_argv bsb_args bsb_main_flags annoymous usage ;
-          let deps = (regenerate_ninja cwd bsc_dir !force_regenerate) in 
+          let deps = (regenerate_ninja cwd bsc_dir !force_regenerate) in
           (* [-make-world] should never be combined with [-package-specs] *)
-          if !make_world then 
-            make_world_deps deps ;   
-          if !watch_mode then watch ()  
+          if !make_world then
+            make_world_deps deps ;
+          if !watch_mode then watch ()
           else ninja_command ninja ninja_args
         end
     end
 (*with x ->
   prerr_endline @@ Printexc.to_string x ;
   exit 2*)
-(* with [try, with], there is no stacktrace anymore .. *)  
+(* with [try, with], there is no stacktrace anymore .. *)
+
 end