fix bsb -clean bug

Author: bobzhang

jscomp/bsb/bsb_clean.ml

@@ -31,9 +31,12 @@ let ninja_clean bsc_dir proj_dir =
     let cmd = bsc_dir // "ninja.exe" in 
     let cwd =  proj_dir // Bsb_config.lib_bs in 
     if Sys.file_exists cwd then 
-      Bsb_unix.run_command_execv { cmd ; args = [|cmd; "-t"; "clean"|] ; cwd  };
+      let eid = 
+        (Bsb_unix.run_command_execv { cmd ; args = [|cmd; "-t"; "clean"|] ; cwd  }) in
+      if eid <> 0 then  
+        Bsb_log.warn "@{<warning>ninja clean failed@}@."
   with  e -> 
-    Bsb_log.warn "@{<warning>ninja clean failed : %s @." (Printexc.to_string e)
+    Bsb_log.warn "@{<warning>ninja clean failed@} : %s @." (Printexc.to_string e)
 
 let clean_bs_garbage bsc_dir proj_dir =
   Bsb_log.info "@{<info>Cleaning:@} in %s@." proj_dir ; 

jscomp/bsb/bsb_unix.ml

@@ -36,11 +36,12 @@ let log cmd =
   Bsb_log.info "@{<info>Entering@} %s @." cmd.cwd ;  
   Bsb_log.info "@{<info>Cmd:@} " ; 
   Bsb_log.info_args cmd.args
-  
-let fail cmd =
-  Bsb_log.error "@{<error>Failure:@} %s \n Location: %s@." cmd.cmd cmd.cwd
 
-let run_command_execv_unix  cmd =
+let command_fatal_error cmd eid =
+  Bsb_log.error "@{<error>Failure:@} %s \n Location: %s@." cmd.cmd cmd.cwd;
+  exit eid 
+
+let run_command_execv_unix  cmd : int =
   match Unix.fork () with 
   | 0 -> 
     log cmd;
@@ -51,16 +52,11 @@ let run_command_execv_unix  cmd =
     | pid, process_status ->       
       match process_status with 
       | Unix.WEXITED eid ->
-        if eid <> 0 then 
-          begin 
-            fail cmd;
-            exit eid    
-          end;
+        eid    
       | Unix.WSIGNALED _ | Unix.WSTOPPED _ -> 
-        begin 
-          Bsb_log.error "@{<error>Interrupted:@} %s@." cmd.cmd;
-          exit 2 
-        end        
+        Bsb_log.error "@{<error>Interrupted:@} %s@." cmd.cmd;
+        2 
+
 
 
 (** TODO: the args are not quoted, here 
@@ -75,15 +71,9 @@ let run_command_execv_win (cmd : command) =
     Sys.command 
       (String.concat Ext_string.single_space 
          ( Filename.quote cmd.cmd ::( List.tl  @@ Array.to_list cmd.args))) in 
-  if eid <> 0 then 
-    begin 
-      fail cmd;
-      exit eid    
-    end
-  else  begin 
-    Bsb_log.info "@{<info>Leaving@} %s => %s  @." cmd.cwd  old_cwd;
-    Unix.chdir old_cwd
-  end
+  Bsb_log.info "@{<info>Leaving@} %s => %s  @." cmd.cwd  old_cwd;
+  Unix.chdir old_cwd;
+  eid
 
 
 let run_command_execv = 

jscomp/bsb/bsb_unix.mli

@@ -30,9 +30,9 @@ type command =
   }  
 
 
+val command_fatal_error : command -> int -> unit 
 
-
-val run_command_execv :   command -> unit 
+val run_command_execv :   command -> int
 
 
 val remove_dir_recursive : string -> unit 

jscomp/bsb/bsb_world.ml

@@ -83,11 +83,16 @@ let build_bs_deps cwd deps =
                ~override_package_specs:(Some deps) 
                ~forced:true
                cwd bsc_dir  in (* set true to force regenrate ninja file so we have [config_opt]*)
-           Bsb_unix.run_command_execv
-             {cmd = vendor_ninja;
+           let command = 
+            {Bsb_unix.cmd = vendor_ninja;
               cwd = cwd // Bsb_config.lib_bs;
               args  = [|vendor_ninja|]
-             };
+             } in     
+           let eid =
+             Bsb_unix.run_command_execv
+             command in 
+           if eid <> 0 then   
+            Bsb_unix.command_fatal_error command eid;
            (* When ninja is not regenerated, ninja will still do the build, 
               still need reinstall check
               Note that we can check if ninja print "no work to do", 

jscomp/ext/ext_namespace.ml

@@ -64,6 +64,9 @@ type file_kind =
 let suffix_js = ".js"  
 let bs_suffix_js = ".bs.js"
 
+let ends_with_bs_suffix_then_chop s = 
+  Ext_string.ends_with_then_chop s bs_suffix_js
+  
 let js_name_of_basename bs_suffix s =   
   remove_ns_suffix  s ^ 
   (if bs_suffix then bs_suffix_js else  suffix_js )

jscomp/ext/ext_namespace.mli

@@ -31,6 +31,13 @@ val make : ns:string -> string -> string
 val try_split_module_name :
   string -> (string * string ) option
 
+(** [ends_with_bs_suffix_then_chop filename]
+  is used to help we have dangling modules
+*)
+val ends_with_bs_suffix_then_chop : 
+  string -> string option   
+
+
 (* 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)`
    relevant issues: #1609, #913