force regenerate build.ninja

Author: aspeddro

jscomp/bsb_exe/rescript_main.ml

@@ -32,8 +32,6 @@ let do_install = ref false
 
 let warning_as_error = ref None
 
-let force_regenerate = ref false
-
 type spec = Bsb_arg.spec
 
 let call_spec f : spec = Unit (Unit_call f)
@@ -130,11 +128,6 @@ let build_subcommand ~start argv argv_len =
       (* This should be put in a subcommand
          previously it works with the implication `bsb && bsb -install`
       *)
-      ( "-regen",
-        unit_set_spec force_regenerate,
-        "*internal* \n\
-         Always regenerate build.ninja no matter bsconfig.json is changed or \
-         not" );
       ("-no-deps", unit_set_spec no_deps_mode, "*internal* Needed for watcher to build without dependencies on file change");
       ("-warn-error", string_call (fun s -> warning_as_error := Some s), "Warning numbers and whether to turn them into errors, e.g., \"+8+32-102\"")
     |]
@@ -155,7 +148,7 @@ let build_subcommand ~start argv argv_len =
         Bsb_ninja_regen.regenerate_ninja
           ~package_kind:Toplevel
           ~per_proj_dir:Bsb_global_paths.cwd
-          ~forced:!force_regenerate
+          ~forced:true
           ~warn_legacy_config:true
           ~warn_as_error
         in

jscomp/build_tests/build_warn_as_error/input.js

@@ -1,17 +1,48 @@
 var p = require("child_process");
 var assert = require("assert");
-var { rescript_exe } = require("#cli/bin_path");
+var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
 
-var o = p.spawnSync(rescript_exe, ["build", "-warn-error", "+110"], {
+var o1 = p.spawnSync(rescript_exe, ["build"], {
   encoding: "utf8",
   cwd: __dirname,
 });
 
-var error_message = o.stdout
+var first_message = o1.stdout
   .split("\n")
   .map(s => s.trim())
-  .includes("Warning number 110 (configured as error)");
+  .find(s => s == "Warning number 110");
 
-if (!error_message) {
-  assert.fail(o.stdout);
+if (!first_message) {
+  assert.fail(o1.stdout);
+}
+
+// Second build using -warn-error +110
+var o2 = p.spawnSync(rescript_exe, ["build", "-warn-error", "+110"], {
+  encoding: "utf8",
+  cwd: __dirname,
+});
+
+var second_message = o2.stdout
+  .split("\n")
+  .map(s => s.trim())
+  .find(s => s == "Warning number 110 (configured as error)");
+
+if (!second_message) {
+  assert.fail(o2.stdout);
+}
+
+// Third build, without -warn-error +110
+// The result should not be a warning as error
+var o3 = p.spawnSync(rescript_exe, ["build"], {
+  encoding: "utf8",
+  cwd: __dirname,
+});
+
+var third_message = o3.stdout
+  .split("\n")
+  .map(s => s.trim())
+  .find(s => s == "Dependency Finished");
+
+if (!third_message) {
+  assert.fail(o3.stdout);
 }

jscomp/build_tests/in_source/input.js

@@ -6,7 +6,7 @@ var { rescript_exe } = require("#cli/bin_path");
 
 assert.throws(
   () => {
-    var output = child_process.execSync(`${rescript_exe} build -regen`, {
+    var output = child_process.execSync(`${rescript_exe} build`, {
       cwd: __dirname,
       encoding: "utf8",
     });

jscomp/build_tests/xpkg/input.js

@@ -2,7 +2,7 @@ var p = require("child_process");
 var assert = require("assert");
 var { rescript_exe } = require("#cli/bin_path");
 try {
-  var output = p.spawnSync(`${rescript_exe} build -regen`, {
+  var output = p.spawnSync(`${rescript_exe} build`, {
     shell: true,
     encoding: "utf8",
   });