Merge pull request #1100 from bloomberg/fix_empty_file_error

introduce dev group which will not be built during make-world

Author: bobzhang

bin/bsb

@@ -6,21 +6,33 @@ var fs = require('fs')
 var bsconfig = 'bsconfig.json'
 var bsb_exe = __filename + ".exe"
 var delegate_args = process.argv.slice(2)
-
-if(fs.existsSync(bsconfig)){
-    child_process.execFileSync(bsb_exe, delegate_args, {stdio:'inherit'})
+// function uncaughtHandler(err){
+//          console.error('command failed')         
+// }
+// process.on('uncaughtException',uncaughtHandler)
+if (fs.existsSync(bsconfig)) {
+    try {
+        child_process.execFileSync(bsb_exe, delegate_args, { stdio: 'inherit' })
+    } catch (e) {
+        console.error('Error happend when running command', bsb_exe, 'with args', delete_args)
+    }
 } else {
     var path = require('path')
     var last_dir = process.cwd()
-    var search_dir = last_dir 
-    do{
+    var search_dir = last_dir
+    do {
         last_dir = search_dir
-        search_dir = path.dirname(last_dir)        
-    }while(!fs.existsSync(path.join(search_dir,bsconfig)) && (search_dir.length !== search_dir.length))
-    if(search_dir.length === last_dir.length){
+        search_dir = path.dirname(last_dir)
+    } while (!fs.existsSync(path.join(search_dir, bsconfig)) && (search_dir.length !== last_dir.length))
+    if (search_dir.length === last_dir.length) {
         console.error('bsconfig.json not found in current directory and its parent')
         process.exit(2)
-    }else{
-        child_process.execFileSync(bsb_exe, delegate_args, {stdio:'inherit', cwd: search_dir} )
-    } 
+    } else {
+        console.log("Root project : " ,  search_dir)
+        try {
+            child_process.execFileSync(bsb_exe, delegate_args, { stdio: 'inherit', cwd: search_dir })
+        } catch (e) {
+            console.error('Error happend when running command', bsb_exe, 'with args', delete_args)
+        }
+    }
 }

docs/Manual.html

@@ -5102,4 +5102,4 @@ <h3 id="_1_0"><a class="anchor" href="#_1_0"></a>1.0</h3>
 </div>
 </div>
 </body>
-</html>
+</html>

jscomp/bin/bsb_helper.ml

@@ -2356,15 +2356,12 @@ let handle_bin_depfile oprefix  (fn : string) index : unit =
                    v
                end
         )  ([],String.length dependent_file) set in
-
+    (* https://github.com/ninja-build/ninja/issues/1229 *)
     let output = input_file ^ Literals.suffix_mlastd in        
-    if files = [] then 
-      close_out (open_out_bin output)
-    else 
-      let deps = Ext_string.unsafe_concat_with_length len
-          space
-          (dependent_file :: files) in 
-      Ext_pervasives.with_file_as_chan output  (fun v -> output_string v deps)
+    let deps = Ext_string.unsafe_concat_with_length len
+        space
+        (dependent_file :: files) in 
+    Ext_pervasives.with_file_as_chan output  (fun v -> output_string v deps)
 
   | None -> 
     begin match Ext_string.ends_with_then_chop fn Literals.suffix_mliast with 
@@ -2395,12 +2392,12 @@ let handle_bin_depfile oprefix  (fn : string) index : unit =
 
             )   ([], String.length dependent_file) set in 
         let output = input_file ^ Literals.suffix_mliastd in
-        if files = [] then close_out (open_out_bin output)            
-        else 
-          let deps = Ext_string.unsafe_concat_with_length len
-              space 
-              (dependent_file :: files)  in 
-          Ext_pervasives.with_file_as_chan output  (fun v -> output_string v deps)
+        (* https://github.com/ninja-build/ninja/issues/1229 *)
+        let deps = 
+          Ext_string.unsafe_concat_with_length len
+            space 
+            (dependent_file :: files)  in   
+        Ext_pervasives.with_file_as_chan output  (fun v -> output_string v deps)
       | None -> 
         raise (Arg.Bad ("don't know what to do with  " ^ fn))
     end

jscomp/depends/depends_post_process.ml

@@ -87,15 +87,12 @@ let handle_bin_depfile oprefix  (fn : string) index : unit =
                    v
                end
         )  ([],String.length dependent_file) set in
-
+    (* https://github.com/ninja-build/ninja/issues/1229 *)
     let output = input_file ^ Literals.suffix_mlastd in        
-    if files = [] then 
-      close_out (open_out_bin output)
-    else 
-      let deps = Ext_string.unsafe_concat_with_length len
-          space
-          (dependent_file :: files) in 
-      Ext_pervasives.with_file_as_chan output  (fun v -> output_string v deps)
+    let deps = Ext_string.unsafe_concat_with_length len
+        space
+        (dependent_file :: files) in 
+    Ext_pervasives.with_file_as_chan output  (fun v -> output_string v deps)
 
   | None -> 
     begin match Ext_string.ends_with_then_chop fn Literals.suffix_mliast with 
@@ -126,12 +123,12 @@ let handle_bin_depfile oprefix  (fn : string) index : unit =
 
             )   ([], String.length dependent_file) set in 
         let output = input_file ^ Literals.suffix_mliastd in
-        if files = [] then close_out (open_out_bin output)            
-        else 
-          let deps = Ext_string.unsafe_concat_with_length len
-              space 
-              (dependent_file :: files)  in 
-          Ext_pervasives.with_file_as_chan output  (fun v -> output_string v deps)
+        (* https://github.com/ninja-build/ninja/issues/1229 *)
+        let deps = 
+          Ext_string.unsafe_concat_with_length len
+            space 
+            (dependent_file :: files)  in   
+        Ext_pervasives.with_file_as_chan output  (fun v -> output_string v deps)
       | None -> 
         raise (Arg.Bad ("don't know what to do with  " ^ fn))
     end