Merge pull request #4109 from BuckleScript/improve_dev_workflow

improve dev workflow so that no restart needed in most time

Author: bobzhang

jscomp/test/string_set.ml

@@ -1,4 +1,4 @@
-# 1 "ext/set.cppo.ml"
+
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  * 
  * This program is free software: you can redistribute it and/or modify

scripts/ninja.js

@@ -1608,12 +1608,14 @@ function nativeNinja() {
   var templateNative = `
 subninja ${getPreprocessorFileName()}
 rule optc
-    command = $ocamlopt -safe-string -I +compiler-libs -opaque ${includes} -g -w +6-40-30-23 -warn-error +a-40-30-23 -absname -c $in
+    command = $ocamlopt -safe-string -I +compiler-libs -opaque ${includes} -g -w a-50+6-40-30-23 -warn-error +a -absname -c $in
     description = $out : $in
 rule archive
     command = $ocamlopt -a $in -o $out
+    description = arcive -> $out
 rule link
     command =  $ocamlopt -g  -I +compiler-libs $flags $libs $in -o $out
+    description = linking -> $out
 rule mk_bsversion
     command = node $in
     generator = true

scripts/tasks.js

@@ -1,83 +1,121 @@
-
 //@ts-check
 
-process.env["BS_VSCODE"] = '1'
-
-var fs = require('fs')
-var path = require('path')
-var cp = require('child_process')
-var sourceDirs =
-    ['ext',
-        'common',
-        'syntax',
-        'depends',
-        'core',
-        'super_errors',
-        'outcome_printer',
-        'bsb',
-        'main',
-        'others',
-        'stdlib-406',
-        'runtime',
-        'test',
-        'ounit_tests',
-        'bsb_helper'
-    ]
+process.env["BS_VSCODE"] = "1";
 
+var fs = require("fs");
+var path = require("path");
+var cp = require("child_process");
+var sourceDirs = [
+  "ext",
+  "common",
+  "syntax",
+  "depends",
+  "core",
+  "super_errors",
+  "outcome_printer",
+  "bsb",
+  "main",
+  "others",
+  "stdlib-406",
+  "runtime",
+  "test",
+  "ounit_tests",
+  "bsb_helper"
+];
 
-var buildAppending = false
-var isBuilding = false
-var ninjaFile = require('./ninja.js')
-var jscompDir = path.join('..','jscomp')
-function rebuild(){
-    console.log(">>>> Start compiling")
-    if(isBuilding){
-        buildAppending = true
-    } else {
-        isBuilding = true
-        var p = cp.spawn(ninjaFile.vendorNinjaPath, [], {stdio:['inherit','inherit','pipe']})
-        p.on('exit',buildFinished)
-    }
+var buildAppending = false;
+var isBuilding = false;
+var ninjaFile = require("./ninja.js");
+var jscompDir = path.join("..", "jscomp");
+function rebuild() {
+  if (isBuilding) {
+    buildAppending = true;
+  } else {
+    console.log(">>>> Start compiling");
+    isBuilding = true;
+    var p = cp.spawn(ninjaFile.vendorNinjaPath, [], {
+      stdio: ["inherit", "inherit", "pipe"]
+    });
+    p.on("exit", buildFinished);
+  }
 }
 /**
- * 
+ *
  * @param {number} code
  * @param {string} signal
  */
-function buildFinished(code,signal){
-    isBuilding = false    
-    if(buildAppending ) {
-        buildAppending = false
-        rebuild()
-    } else{
-        if(code !== 0){
-            console.log(`File "BUILD", line 1, characters 1-1:`)
-            console.log(`Error: Failed to build`)
-        }
-        console.log(">>>> Finish compiling")
-        // TODO: check ninja exit error code
-        if(code===0){
-            // This is not always correct
-            ninjaFile.updateDev()
-        }
-        
+function buildFinished(code, signal) {
+  isBuilding = false;
+  if (buildAppending) {
+    buildAppending = false;
+    rebuild();
+  } else {
+    if (code !== 0) {
+      console.log(`File "BUILD", line 1, characters 1-1:`);
+      console.log(`Error: Failed to build`);
+    }
+    console.log(">>>> Finish compiling (options: R|clean|config)");
+    // TODO: check ninja exit error code
+    if (code === 0) {
+      // This is not always correct
+      ninjaFile.updateDev();
     }
-    
+  }
 }
 /**
- * 
- * @param {string} eventType 
- * @param {string} filename 
+ *
+ * @param {string} eventType
+ * @param {string} filename
  */
-function onSourceChange(eventType, filename){
-    // console.log('event ', eventType,filename)
-    if(filename.endsWith('.ml') || filename.endsWith('.mli')){
-        rebuild()
-    }
-
+function onSourceChange(eventType, filename) {
+  // console.log('event ', eventType,filename)
+  if (filename.endsWith(".ml") || filename.endsWith(".mli")) {
+    rebuild();
+  }
 }
 
-sourceDirs.forEach(x=>{
-    fs.watch(path.join(jscompDir,x), 'utf8',onSourceChange)
-}) 
-rebuild()
+sourceDirs.forEach(x => {
+  fs.watch(path.join(jscompDir, x), "utf8", onSourceChange);
+});
+rebuild();
+
+var child_process = require("child_process");
+var readline = require("readline");
+readline
+  .createInterface({
+    input: process.stdin,
+    output: process.stdout
+  })
+  .on("line", input => {
+    switch (input.toLowerCase()) {
+      case "r":
+        rebuild();
+        break;
+      case "config":
+        if (isBuilding) {
+          console.log(`it's building`);
+        } else {
+          isBuilding = true;
+          child_process
+            .fork(path.join(__dirname, "ninja.js"), ["config"])
+            .on("close", () => {
+              isBuilding = false;
+              rebuild();
+            });
+        }
+        break;
+      case "clean":
+        if (isBuilding) {
+          console.log(`it's building`);
+        } else {
+          isBuilding = true;
+          child_process
+            .fork(path.join(__dirname, "ninja.js"), ["cleanbuild"])
+            .on("close", () => {
+              isBuilding = false;
+            });
+        }
+
+        break;
+    }
+  });