Merge pull request #1093 from bloomberg/make_world_better_error_handling

fix #1075

Author: bobzhang

docs/Manual.html

@@ -656,6 +656,7 @@ <h1><a href="https://github.com/bloomberg/bucklescript">BuckleScript</a> User Ma
 <li><a href="#_contributing_to_code_bsb_exe_code">Contributing to <code>bsb.exe</code></a></li>
 <li><a href="#_contributing_to_code_bsc_exe_code">Contributing to <code>bsc.exe</code></a></li>
 <li><a href="#_contributing_to_the_runtime">Contributing to the runtime</a></li>
+<li><a href="#_contributing_to_the_documentation">Contributing to the documentation</a></li>
 </ul>
 </li>
 <li><a href="#_comparisons">Comparisons</a>
@@ -4440,37 +4441,30 @@ <h3 id="_simple_ocaml_type"><a class="anchor" href="#_simple_ocaml_type"></a>Sim
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>'a Js.Null.t</code></p></td>
 <td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>either <code>'a</code> or <code>null</code></p>
+<p>either <code>'a</code> or <code>null</code>. <code>Js.Null.empty</code> represents <code>null</code> too.</p>
 </div>
 <div class="listingblock">
 <div class="title">Js.Null module</div>
 <div class="content">
 <pre class="pygments highlight"><code data-lang="ocaml"><span class="tok-k">val</span> <span class="tok-n">to_opt</span> <span class="tok-o">:</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">t</span> <span class="tok-o">-&gt;</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">option</span>
-
+<span class="tok-k">val</span> <span class="tok-n">from_opt</span> <span class="tok-o">:</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">option</span> <span class="tok-o">-&gt;</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">t</span>
 <span class="tok-k">val</span> <span class="tok-n">return</span> <span class="tok-o">:</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-o">-&gt;</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">t</span>
-
 <span class="tok-k">val</span> <span class="tok-n">test</span> <span class="tok-o">:</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">t</span> <span class="tok-o">-&gt;</span> <span class="tok-kt">bool</span></code></pre>
 </div>
 </div></div></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>'a Js.Undefined.t</code></p></td>
 <td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>either <code>'a</code> or <code>undefined</code></p>
-</div>
-<div class="listingblock">
-<div class="title">Js.Undefined</div>
-<div class="content">
-<pre class="pygments highlight"><code data-lang="ocaml"><span class="tok-k">val</span> <span class="tok-n">to_opt</span> <span class="tok-o">:</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">t</span> <span class="tok-o">-&gt;</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">option</span>
-<span class="tok-k">val</span> <span class="tok-n">return</span> <span class="tok-o">:</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-o">-&gt;</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">t</span>
-<span class="tok-k">val</span> <span class="tok-n">test</span> <span class="tok-o">:</span> <span class="tok-k">&#39;</span><span class="tok-n">a</span> <span class="tok-n">t</span> <span class="tok-o">-&gt;</span> <span class="tok-kt">bool</span></code></pre>
-</div>
+<p>either <code>'a</code> or <code>undefined</code>.
+Same operations as <code>'a Js.Null.t</code>.</p>
 </div></div></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>'a Js.Null_undefined.t</code></p></td>
 <td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>either <code>'a</code>, <code>null</code> or <code>undef</code></p>
+<p>either <code>'a</code>, <code>null</code> or <code>undef</code>.
+Same operations as <code>'a Js.Null.t</code>.</p>
 </div></div></td>
 </tr>
 </tbody>
@@ -4730,6 +4724,12 @@ <h3 id="_contributing_to_the_runtime"><a class="anchor" href="#_contributing_to_
 <p><code>npm run cover</code></p>
 </div>
 </div>
+<div class="sect2">
+<h3 id="_contributing_to_the_documentation"><a class="anchor" href="#_contributing_to_the_documentation"></a>Contributing to the documentation</h3>
+<div class="paragraph">
+<p>You&#8217;ll need <a href="http://asciidoctor.org/">Asciidoctor</a> installed. Modify the section you want in <code>site/docsource/</code>, then run <code>site/docsource/build.sh</code>.</p>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">

jscomp/bin/bsb.ml

@@ -6673,7 +6673,7 @@ val set_package_specs_from_array : Ext_json.t array -> unit
 val get_generate_merlin : unit -> bool 
 val set_generate_merlin : bool -> unit 
 
-val walk_all_deps : string -> (string -> unit) -> unit 
+val walk_all_deps : bool -> string -> (bool -> string -> unit) -> unit 
 end = struct
 #1 "bsb_default.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -6738,7 +6738,7 @@ let (|?)  m (key, cb) =
   TODO: check duplicate package name 
    ?use path as identity?
 *)
-let rec walk_all_deps dir cb =   
+let rec walk_all_deps top dir cb =   
   let bsconfig_json =  (dir // Literals.bsconfig_json) in 
   match Ext_json.parse_json_from_file bsconfig_json with 
   | `Obj map ->
@@ -6753,13 +6753,13 @@ let rec walk_all_deps dir cb =
             begin match Bs_pkg.resolve_bs_package ~cwd:dir new_package with 
             | None -> failwith (new_package ^ " not found as dependency of " ^ bsconfig_json )
             | Some package_dir  -> 
-              walk_all_deps package_dir cb  ;              
+              walk_all_deps  false package_dir cb  ;              
             end;            
           | _ -> () (* TODO: add a log framework, warning here *)
           end 
       )))
     |> ignore ;
-    cb dir 
+    cb top dir 
   | _ -> ()
   | exception _ -> failwith ( "failed to parse" ^ bsconfig_json ^ " properly")
 
@@ -7759,9 +7759,9 @@ type command =
 *)
 val run_commands : command list -> unit 
 
-val run_command_execv : command -> unit 
+val run_command_execv : bool ->  command -> unit 
 
-val run_command_execvp : command -> unit 
+(* val run_command_execvp : command -> unit *)
 end = struct
 #1 "bsb_unix.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -7855,7 +7855,7 @@ let run_command_execvp cmd =
           exit 2 
         end
 
-let run_command_execv cmd =
+let run_command_execv fail_exit cmd =
   match Unix.fork () with 
   | 0 -> 
     print_endline ( "* Entering " ^ cmd.cwd);
@@ -7875,8 +7875,9 @@ let run_command_execv cmd =
         if eid <> 0 then 
           begin 
             prerr_endline ("* Failure : " ^ cmd.cmd ^ "\n* Location: " ^ cmd.cwd);
-            exit eid
-          end
+            if fail_exit then exit eid    
+          end;
+        
       | Unix.WSIGNALED _ | Unix.WSTOPPED _ -> 
         begin 
           prerr_endline (cmd.cmd ^ " interrupted");
@@ -8149,15 +8150,15 @@ let watch () =
 let build_bs_deps ()   = 
     let bsc_dir = Bsb_build_util.get_bsc_dir cwd in 
     let bsb_exe = bsc_dir // "bsb.exe" in 
-    Bsb_default.walk_all_deps cwd 
-    (fun cwd -> Bsb_unix.run_command_execv 
+    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  |]})
 
 let clean_bs_deps () = 
   let bsc_dir = Bsb_build_util.get_bsc_dir cwd in 
     let bsb_exe = bsc_dir // "bsb.exe" in 
-    Bsb_default.walk_all_deps cwd 
-    (fun cwd -> Bsb_unix.run_command_execv 
+    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 ; "--" ; "-t" ; "clean"|]})
 let annoymous filename =
   String_vec.push  filename targets

jscomp/bsb/bsb_default.ml

@@ -60,7 +60,7 @@ let (|?)  m (key, cb) =
   TODO: check duplicate package name 
    ?use path as identity?
 *)
-let rec walk_all_deps dir cb =   
+let rec walk_all_deps top dir cb =   
   let bsconfig_json =  (dir // Literals.bsconfig_json) in 
   match Ext_json.parse_json_from_file bsconfig_json with 
   | `Obj map ->
@@ -75,13 +75,13 @@ let rec walk_all_deps dir cb =
             begin match Bs_pkg.resolve_bs_package ~cwd:dir new_package with 
             | None -> failwith (new_package ^ " not found as dependency of " ^ bsconfig_json )
             | Some package_dir  -> 
-              walk_all_deps package_dir cb  ;              
+              walk_all_deps  false package_dir cb  ;              
             end;            
           | _ -> () (* TODO: add a log framework, warning here *)
           end 
       )))
     |> ignore ;
-    cb dir 
+    cb top dir 
   | _ -> ()
   | exception _ -> failwith ( "failed to parse" ^ bsconfig_json ^ " properly")
 

jscomp/bsb/bsb_default.mli

@@ -65,4 +65,4 @@ val set_package_specs_from_array : Ext_json.t array -> unit
 val get_generate_merlin : unit -> bool 
 val set_generate_merlin : bool -> unit 
 
-val walk_all_deps : string -> (string -> unit) -> unit 
+val walk_all_deps : bool -> string -> (bool -> string -> unit) -> unit 

jscomp/bsb/bsb_main.ml

@@ -252,15 +252,15 @@ let watch () =
 let build_bs_deps ()   = 
     let bsc_dir = Bsb_build_util.get_bsc_dir cwd in 
     let bsb_exe = bsc_dir // "bsb.exe" in 
-    Bsb_default.walk_all_deps cwd 
-    (fun cwd -> Bsb_unix.run_command_execv 
+    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  |]})
 
 let clean_bs_deps () = 
   let bsc_dir = Bsb_build_util.get_bsc_dir cwd in 
     let bsb_exe = bsc_dir // "bsb.exe" in 
-    Bsb_default.walk_all_deps cwd 
-    (fun cwd -> Bsb_unix.run_command_execv 
+    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 ; "--" ; "-t" ; "clean"|]})
 let annoymous filename =
   String_vec.push  filename targets

jscomp/bsb/bsb_unix.ml

@@ -89,7 +89,7 @@ let run_command_execvp cmd =
           exit 2 
         end
 
-let run_command_execv cmd =
+let run_command_execv fail_exit cmd =
   match Unix.fork () with 
   | 0 -> 
     print_endline ( "* Entering " ^ cmd.cwd);
@@ -109,8 +109,9 @@ let run_command_execv cmd =
         if eid <> 0 then 
           begin 
             prerr_endline ("* Failure : " ^ cmd.cmd ^ "\n* Location: " ^ cmd.cwd);
-            exit eid
-          end
+            if fail_exit then exit eid    
+          end;
+        
       | Unix.WSIGNALED _ | Unix.WSTOPPED _ -> 
         begin 
           prerr_endline (cmd.cmd ^ " interrupted");

jscomp/bsb/bsb_unix.mli

@@ -35,6 +35,6 @@ type command =
 *)
 val run_commands : command list -> unit 
 
-val run_command_execv : command -> unit 
+val run_command_execv : bool ->  command -> unit 
 
-val run_command_execvp : command -> unit 
+(* val run_command_execvp : command -> unit *)