Add restat for dev mode

Author: bobzhang

jscomp/compiler.ninja

@@ -48,6 +48,8 @@ OCAML_SRC_TOOLS=../vendor/ocaml/tools
 build ./bin/bspack.exe: link ./stubs/ext_basic_hash_stubs.c ./bin/bspack.mli ./bin/bspack.ml
     libs = unix.cmxa
     flags = -I ./bin -w -40-30
+build ./bin/cmjdump.exe: link ./stubs/stubs.cmxa ext/ext.cmxa common/common.cmxa syntax/syntax.cmxa depends/depends.cmxa core/core.cmxa main/cmjdump_main.cmx   
+    libs = ocamlcommon.cmxa
 rule bspack    
     command = ./bin/bspack.exe $flags -bs-main $main -o $out
     depfile = $out.d

jscomp/others/build.ninja

@@ -1,9 +1,11 @@
 
 bsc = ../lib/bsc.exe
-bsc_flags =  -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output amdjs:lib/amdjs -bs-package-output es6:lib/es6  -nostdlib -nopervasives  -unsafe -warn-error A -w -40-49-103 -bin-annot -bs-noassertfalse -open Bs_stdlib_mini -I ./runtime
+bsc_flags = -absname -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output amdjs:lib/amdjs -bs-package-output es6:lib/es6  -nostdlib -nopervasives  -unsafe -warn-error A -w -40-49-103 -bin-annot -bs-noassertfalse -open Bs_stdlib_mini -I ./runtime
 rule cc
     command = $bsc $bsc_flags -bs-no-implicit-include  -I others -c $in
-    description = $in -> $out    
+    description = $in -> $out
+    restat = 1        
+
 rule cppo
     command = cppo -D $type $in -o $out
     generator = true

jscomp/others/release.ninja

@@ -3,7 +3,9 @@ bsc = ../lib/bsc.exe
 bsc_flags = -absname -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output amdjs:lib/amdjs -bs-package-output es6:lib/es6  -nostdlib -nopervasives  -unsafe -warn-error A -w -40-49-103 -bin-annot -bs-noassertfalse -open Bs_stdlib_mini -I ./runtime
 rule cc
     command = $bsc $bsc_flags -bs-no-implicit-include  -I others -c $in
-    description = $in -> $out    
+    description = $in -> $out
+        
+
 
 
 build others/belt.cmj others/belt.cmi : cc others/belt.ml | runtime

jscomp/release.ninja

@@ -1,7 +1,7 @@
 
 subninja runtime/release.ninja
-subninja others/build.ninja
-subninja stdlib-402/build.ninja
+subninja others/release.ninja
+subninja stdlib-402/release.ninja
 
 build all: phony runtime others stdlib-402
 

jscomp/runtime/build.ninja

@@ -5,6 +5,8 @@ bsc_flags = $bsc_no_open_flags -open Bs_stdlib_mini
 rule cc
     command = $bsc $bsc_flags -bs-no-implicit-include  -I runtime -c $in
     description = $in -> $out
+    restat = 1    
+    
 build runtime/bs_stdlib_mini.cmi : cc runtime/bs_stdlib_mini.mli | ../lib/bsc.exe
     bsc_flags = -nostdlib -nopervasives
 build runtime/js.cmj runtime/js.cmi : cc runtime/js.ml | ../lib/bsc.exe

jscomp/runtime/release.ninja

@@ -5,6 +5,8 @@ bsc_flags = $bsc_no_open_flags -open Bs_stdlib_mini
 rule cc
     command = $bsc $bsc_flags -bs-no-implicit-include  -I runtime -c $in
     description = $in -> $out
+    
+    
 build runtime/bs_stdlib_mini.cmi : cc runtime/bs_stdlib_mini.mli
     bsc_flags = -nostdlib -nopervasives
 build runtime/js.cmj runtime/js.cmi : cc runtime/js.ml

jscomp/stdlib-402/build.ninja

@@ -3,7 +3,9 @@ bsc = ../lib/bsc.exe
 bsc_flags = -absname -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output amdjs:lib/amdjs -bs-package-output es6:lib/es6  -nostdlib -warn-error A -w -40-49-103 -bin-annot  -bs-no-warn-unimplemented-external  -I ./runtime  -I ./others
 rule cc
     command = $bsc $bsc_flags -bs-no-implicit-include  -I stdlib-402 -c $in
-    description = $in -> $out    
+    description = $in -> $out 
+    restat = 1
+
 build stdlib-402/camlinternalFormatBasics.cmi : cc stdlib-402/camlinternalFormatBasics.mli | others
     bsc_flags = $bsc_flags -nopervasives
 build stdlib-402/camlinternalFormatBasics.cmj : cc stdlib-402/camlinternalFormatBasics.ml | stdlib-402/camlinternalFormatBasics.cmi others

jscomp/stdlib-402/release.ninja

@@ -4,6 +4,7 @@ bsc_flags = -absname -no-alias-deps -bs-no-version-header -bs-diagnose -bs-cross
 rule cc
     command = $bsc $bsc_flags -bs-no-implicit-include -I test -c $in
     description = $in -> $out
+    restat = 1
 rule mll    
     command = ocamllex.opt $in
     generator = true

jscomp/test/build.ninja

@@ -22,7 +22,7 @@ function buildCompiler() {
 	})
 }
 if(!is_windows){
-  require('./runtimeDeps.js').updateAllLibsNinja()
+  require('./runtimeDeps.js').updateRelease()
 }
 
 buildCompiler()

scripts/prebuilt.js

@@ -493,7 +493,11 @@ bsc_flags = $bsc_no_open_flags -open Bs_stdlib_mini
 rule cc
     command = $bsc $bsc_flags -bs-no-implicit-include  -I ${ninjaCwd} -c $in
     description = $in -> $out
-    restat = 1
+${
+devmode? `    restat = 1` : 
+``
+}    
+    
 ${ninjaQuickBuidList([
     ['bs_stdlib_mini.cmi', 'bs_stdlib_mini.mli', 
         'cc', ninjaCwd, [["bsc_flags", "-nostdlib -nopervasives"]], [],externalDeps],
@@ -551,11 +555,15 @@ async function othersNinja(devmode=true) {
     var cppoRule = `cppo`
     var templateOthersRules = `
 ${BSC_COMPILER}
-bsc_flags =  -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output amdjs:lib/amdjs -bs-package-output es6:lib/es6  -nostdlib -nopervasives  -unsafe -warn-error A -w -40-49-103 -bin-annot -bs-noassertfalse -open Bs_stdlib_mini -I ./runtime
+bsc_flags = -absname -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output amdjs:lib/amdjs -bs-package-output es6:lib/es6  -nostdlib -nopervasives  -unsafe -warn-error A -w -40-49-103 -bin-annot -bs-noassertfalse -open Bs_stdlib_mini -I ./runtime
 rule cc
     command = $bsc $bsc_flags -bs-no-implicit-include  -I ${ninjaCwd} -c $in
-    description = $in -> $out    
-    restat = 1
+    description = $in -> $out
+${
+devmode? `    restat = 1` : 
+``
+}        
+
 ${ devmode ?
 `rule ${cppoRule}
     command = cppo -D $type $in -o $out
@@ -689,9 +697,10 @@ ${ninjaQuickBuidList([
     )
 }
 
-async function stdlibNinja(){
+async function stdlibNinja(devmode=true){
     var ninjaCwd = stdlibVersion
     var externalDeps = [othersTarget]
+    var ninjaOutput = devmode? 'build.ninja' : 'release.ninja'
     var bsc_flags = 'bsc_flags'
     /**
      * @type [string,string][]
@@ -702,8 +711,12 @@ ${BSC_COMPILER}
 ${bsc_flags} = -absname -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output amdjs:lib/amdjs -bs-package-output es6:lib/es6  -nostdlib -warn-error A -w -40-49-103 -bin-annot  -bs-no-warn-unimplemented-external  -I ./runtime  -I ./others
 rule cc
     command = $bsc $${bsc_flags} -bs-no-implicit-include  -I ${ninjaCwd} -c $in
-    description = $in -> $out    
-    restat = 1
+    description = $in -> $out 
+${
+devmode? `    restat = 1` : 
+``
+}
+
 ${ninjaQuickBuidList([
     ['camlinternalFormatBasics.cmi', 'camlinternalFormatBasics.mli', 
         'cc', ninjaCwd, bsc_builtin_overrides, [], externalDeps],
@@ -746,7 +759,7 @@ ${ninjaQuickBuidList([
     output.push(phony(stdlibTarget,fileTargets(allTargets),stdlibVersion))
 
     writeFile(
-        path.join(stdlibDir,'build.ninja'),
+        path.join(stdlibDir,ninjaOutput),
         templateStdlibRules  + output.join('\n') + '\n'    
     )    
 }
@@ -965,27 +978,31 @@ if (require.main === module) {
     }    
     var dev = process.argv.includes('-dev')
     var release = process.argv.includes('-release')
-    if (dev) {
-        udpateLibsDevNinja()
+    var all = process.argv.includes('-all')
+    if(all){
+        updateDev()
+        updateRelease()
+    } else if (dev) {
+        updateDev()
     } else if (release) {
-        updateAllLibsNinja()
+        updateRelease()
     }
 }
-function updateAllLibsNinja(){
+function updateRelease(){
     runtimeNinja(false)
-    stdlibNinja()
+    stdlibNinja(false)
     othersNinja(false)
 }
 
-function udpateLibsDevNinja(){
+function updateDev(){
     runtimeNinja()
     stdlibNinja()
     othersNinja()
     testNinja()
     nativeNinja()
 }
-exports.updateLibsDevNinja = udpateLibsDevNinja
-exports.updateAllLibsNinja = updateAllLibsNinja
+exports.updateDev = updateDev
+exports.updateRelease = updateRelease
 
 /**
  * 

scripts/runtimeDeps.js

@@ -53,7 +53,7 @@ function buildFinished(code,signal){
         // TODO: check ninja exit error code
         if(code===0){
             // This is not always correct
-            require('./runtimeDeps').updateLibsDevNinja()
+            require('./runtimeDeps').updateDev()
         }
 
     }