fix rescript-lang#1626

Author: bobzhang

Diff for: jscomp/Makefile

@@ -289,7 +289,6 @@ BSB_SRCS= bsb_config \
 	bsb_build_util \
 	bsb_helper_linker\
 	bsb_helper_extract\
-	bsb_dir \
 	bsb_rule\
 	bsb_ninja \
 	bsb_build_ui \

Diff for: jscomp/others/.depend

@@ -19,7 +19,7 @@ bs_result.cmj :
 node_child_process.cmj : node.cmj
 js_boolean.cmj : js_boolean.cmi
 js_math.cmj :
-js_dict.cmj : js_dict.cmi
+js_dict.cmj : js_array.cmj js_dict.cmi
 js_date.cmj :
 js_global.cmj :
 js_cast.cmj : js_cast.cmi

Diff for: jscomp/others/node_process.ml

@@ -36,7 +36,7 @@ type t =
   >   Js.t
 
 external process : t = "" [@@bs.module]
-
+external argv : string array = "" [@@bs.module "process"]
 external exit : int -> unit = "" [@@bs.module "process"]
 external cwd : unit -> string = "" [@@bs.module "process"]
 (** The process.uptime() method returns the number of seconds 

Diff for: jscomp/others/node_process.mli

@@ -34,7 +34,7 @@ type t =
   >   Js.t
 
 external process : t = "" [@@bs.module]
-
+external argv : string array = "" [@@bs.module "process"]
 external exit : int -> unit = "" [@@bs.module "process"]
 external cwd : unit -> string = "" [@@bs.module "process"]
 (** The process.uptime() method returns the number of seconds 

Diff for: jscomp/xwatcher/xwatcher_current.js

@@ -8,6 +8,7 @@ import * as Bs_vector     from "../../lib/es6/bs_vector.js";
 import * as Js_primitive  from "../../lib/es6/js_primitive.js";
 import * as Node_process  from "../../lib/es6/node_process.js";
 import * as Xwatcher_util from "./xwatcher_util.js";
+import * as Child_process from "child_process";
 
 Bs_option.getExn(Js_primitive.undefined_to_opt(typeof (__dirname) === "undefined" ? undefined : (__dirname)));
 
@@ -25,8 +26,10 @@ var lock = Xwatcher_util.makeLock(/* () */0);
 
 var events = Xwatcher_util.makeEventObj(/* () */0);
 
+var command = "./watch-build.sh";
+
 function exec() {
-  return Xwatcher_util.buildWithShell("./watch-build.sh", events, lock, function () {
+  return Xwatcher_util.buildWithShell(command, events, lock, function () {
               return /* () */0;
             });
 }
@@ -43,25 +46,41 @@ function watch(dir) {
 
 Node_process.putEnvVar("BS_VSCODE", "1");
 
-Bs_vector.iter(function (x) {
-      watch(Path.join(jscomp, x));
-      return /* () */0;
-    }, /* array */[
-      "core",
-      "syntax",
-      "ext",
-      "depends",
-      "others",
-      "ounit",
-      "ounit_tests",
-      "test",
-      "runtime",
-      "xwatcher",
-      "bsb",
-      "common"
-    ]);
-
-exec(/* () */0);
+var match = Process.argv.slice(2);
+
+var exit = 0;
+
+if (match.length !== 1) {
+  exit = 1;
+} else {
+  var match$1 = match[0];
+  if (match$1 === "-build") {
+    Child_process.spawn(command, ( [ ]), ( { "stdio" : "inherit", "shell" : true }));
+  } else {
+    exit = 1;
+  }
+}
+
+if (exit === 1) {
+  Bs_vector.iter(function (x) {
+        watch(Path.join(jscomp, x));
+        return /* () */0;
+      }, /* array */[
+        "core",
+        "syntax",
+        "ext",
+        "depends",
+        "others",
+        "ounit",
+        "ounit_tests",
+        "test",
+        "runtime",
+        "xwatcher",
+        "bsb",
+        "common"
+      ]);
+  exec(/* () */0);
+}
 
 export {
 

Diff for: jscomp/xwatcher/xwatcher_current.ml

@@ -35,21 +35,27 @@ let watch dir   =
        || Js.String.endsWith ".cppo" fileName then 
          exec ()
     )
-let () = 
 
+let () = 
   Node.Process.putEnvVar "BS_VSCODE" "1";
-  Bs.Vector.iter (fun [@bs] x -> 
-      ignore @@ watch (Node.Path.join [|jscomp; x|])
-    ) 
-    [| "core"; "syntax"; "ext"; "depends"; 
-       "others";
-       "ounit"; "ounit_tests"; "test"; 
-       "runtime";
-       "xwatcher";
-       "bsb";
-       "common"
-       |];
-
-  exec ()
+  match Js.Array.sliceFrom 2  Node.Process.argv  with 
+  | [|"-build"|] -> 
+    Xwatcher_util.spawnInheritIgnore command
+  | _ -> 
+    begin 
+      Bs.Vector.iter (fun [@bs] x -> 
+          ignore @@ watch (Node.Path.join [|jscomp; x|])
+        ) 
+        [| "core"; "syntax"; "ext"; "depends"; 
+           "others";
+           "ounit"; "ounit_tests"; "test"; 
+           "runtime";
+           "xwatcher";
+           "bsb";
+           "common"
+        |];
+
+      exec ()
+    end
 
 

Diff for: jscomp/xwatcher/xwatcher_util.ml

@@ -47,6 +47,11 @@ external spawnInherit : string ->
 
 external onExit : (_ [@bs.as "exit"]) -> (unit -> unit [@bs.uncurry]) -> unit = "on" [@@bs.send.pipe: t]
 
+
+external spawnInheritIgnore : string -> 
+  (_ [@bs.as {json| [ ]|json}]) -> 
+  (_ [@bs.as {json| { "stdio" : "inherit", "shell" : true }|json}]) -> unit = "spawn" [@@bs.module "child_process"]
+
 (* let (acquireBuild, releaseBuild) =  *)
 (*   let isBuilding = ref false in  *)
 (*   (fun [@bs]() ->  if !isBuilding then false else begin isBuilding := true ; true end), *)

Diff for: jscomp/xwatcher/xwatcher_util.mli

@@ -23,3 +23,7 @@ val findFile : prev:string -> cwd:string -> string -> string
 val getWatchFiles : string -> Js.String.t Js.Array.t
 type watcher = { dir : string ; watcher : Node.Fs.Watch.t }
 val makeWatcher : string -> (string -> string -> unit [@bs]) -> watcher
+
+external spawnInheritIgnore : string -> 
+  (_ [@bs.as {json| [ ]|json}]) -> 
+  (_ [@bs.as {json| { "stdio" : "inherit", "shell" : true }|json}]) -> unit = "spawn" [@@bs.module "child_process"]

Diff for: scripts/watcher.js

@@ -220,8 +220,10 @@ var lock = makeLock(/* () */0);
 
 var events = makeEventObj(/* () */0);
 
+var command = "./watch-build.sh";
+
 function exec() {
-  return buildWithShell("./watch-build.sh", events, lock, function () {
+  return buildWithShell(command, events, lock, function () {
               return /* () */0;
             });
 }
@@ -238,25 +240,41 @@ function watch$1(dir) {
 
 putEnvVar("BS_VSCODE", "1");
 
-iter$$1(function (x) {
-      watch$1(Path.join(jscomp, x));
-      return /* () */0;
-    }, /* array */[
-      "core",
-      "syntax",
-      "ext",
-      "depends",
-      "others",
-      "ounit",
-      "ounit_tests",
-      "test",
-      "runtime",
-      "xwatcher",
-      "bsb",
-      "common"
-    ]);
-
-exec(/* () */0);
+var match = Process.argv.slice(2);
+
+var exit = 0;
+
+if (match.length !== 1) {
+  exit = 1;
+} else {
+  var match$1 = match[0];
+  if (match$1 === "-build") {
+    Child_process.spawn(command, ( [ ]), ( { "stdio" : "inherit", "shell" : true }));
+  } else {
+    exit = 1;
+  }
+}
+
+if (exit === 1) {
+  iter$$1(function (x) {
+        watch$1(Path.join(jscomp, x));
+        return /* () */0;
+      }, /* array */[
+        "core",
+        "syntax",
+        "ext",
+        "depends",
+        "others",
+        "ounit",
+        "ounit_tests",
+        "test",
+        "runtime",
+        "xwatcher",
+        "bsb",
+        "common"
+      ]);
+  exec(/* () */0);
+}
 
 
 /*  Not a pure module */