Add prebuilt.ext.ninja and copy.prebuilt.ninja build.ninja

1. prebuilt.ext.ninja is for prebuilt
2. copy.prebuilt.ninja is for copy when installation
3. build.ninja is for built from source (not supported under windows)

Author: bobzhang

jscomp/runtime/release.ninja

@@ -0,0 +1,21 @@
+
+flags = -g -w -a ../jscomp/stubs/ext_basic_hash_stubs.c
+rule cc
+    command = $ocamlopt $flags -o $out $in
+# -inline 1000 makes size too large
+# TODO: make sure it can be bootstrapped, at least is a very good
+# test case of our optimizations
+
+# build bsdep.exe: cc bsdep.mli bsdep.ml
+build bsppx.$ext: cc bsppx.mli bsppx.ml
+# build bspp.exe:  cc bspp.mli bspp.ml
+build bsb.$ext:  cc bsb.mli bsb.ml
+    flags = $flags unix.cmxa str.cmxa
+build bsb_helper.$ext:  cc bsb_helper.mli bsb_helper.ml
+    flags = $flags unix.cmxa -w -a
+build refmt.$ext: cc refmt_main3.mli refmt_main3.ml
+    flags = $flags -w -40-30 -no-alias-deps -I +compiler-libs ocamlcommon.cmxa 
+build reactjs_jsx_ppx_2.$ext: cc reactjs_jsx_ppx_v2.mli reactjs_jsx_ppx_v2.ml
+    flags = $flags -w -40-30 -no-alias-deps -I +compiler-libs ocamlcommon.cmxa
+build bsc.$ext: cc whole_compiler.mli whole_compiler.ml
+

lib/body.ninja

@@ -1,29 +1,7 @@
 
-flags = -g -w -a ../jscomp/stubs/ext_basic_hash_stubs.c
-
-# ocamlopt = ../vendor/ocaml/bin/ocamlopt.opt
-ocamlopt = ocamlopt.opt
-# we relies on its dynamic behavior for finding a proper ocamlopt
-rule cc
-    command = $ocamlopt $flags -o $out $in
-
-# -inline 1000 makes size too large
-# TODO: make sure it can be bootstrapped, at least is a very good
-# test case of our optimizations
-
-
-
-
-# build bsdep.exe: cc bsdep.mli bsdep.ml
-build bsppx.exe: cc bsppx.mli bsppx.ml
-# build bspp.exe:  cc bspp.mli bspp.ml
-build bsb.exe:  cc bsb.mli bsb.ml
-    flags = $flags unix.cmxa str.cmxa
-build bsb_helper.exe:  cc bsb_helper.mli bsb_helper.ml
-    flags = $flags unix.cmxa -w -a
-build refmt.exe: cc refmt_main3.mli refmt_main3.ml
-    flags = $flags -w -40-30 -no-alias-deps -I +compiler-libs ocamlcommon.cmxa 
-build reactjs_jsx_ppx_2.exe: cc reactjs_jsx_ppx_v2.mli reactjs_jsx_ppx_v2.ml
-    flags = $flags -w -40-30 -no-alias-deps -I +compiler-libs ocamlcommon.cmxa
-build bsc.exe: cc whole_compiler.mli whole_compiler.ml
 
+# used mostly by platforms which does not provide
+# prebuilt binaries, so we output .exe directly
+ocamlopt = ocamlopt.opt 
+ext = exe 
+include body.ninja

lib/build.ninja

@@ -0,0 +1,7 @@
+
+
+rule cp 
+    command = cp $in $out
+
+ext = darwin
+include copy.ninja

lib/copy.darwin.ninja

@@ -0,0 +1,11 @@
+
+
+
+build bsc.exe: cp bsc.$ext    
+build bsb.exe: cp bsb.$ext    
+build bsb_helper.exe: cp bsb_helper.$ext
+build bsppx.exe: cp bsppx.$ext
+build refmt.exe: cp refmt.$ext
+build reactjs_jsx_ppx_2.exe: cp reactjs_jsx_ppx_2.$ext
+
+

lib/copy.ninja

@@ -0,0 +1,2 @@
+rule cp
+    command = cmd /q /c copy $in $out 1>nul

lib/copy.win32.ninja

@@ -0,0 +1,11 @@
+
+
+
+# ocamlopt = ../vendor/ocaml/bin/ocamlopt.opt
+ocamlopt = ocamlopt.opt
+# we relies on its dynamic behavior for finding a proper ocamlopt
+
+ext = darwin
+include body.ninja
+
+

lib/prebuilt.darwin.ninja

@@ -0,0 +1,7 @@
+
+
+ocamlopt = ocamlopt.opt.exe
+
+ext = win32
+
+include body.ninja

lib/prebuilt.win32.ninja

@@ -3,7 +3,7 @@ var os = require('os')
 var os_type = os.type()
 
 var is_windows = !(os_type.indexOf('Windows') < 0)
-var is_bsd = !(os_type.indexOf('BSD') < 0)
+// var is_bsd = !(os_type.indexOf('BSD') < 0)
 
 exports.is_windows = is_windows
 var sys_extension;
@@ -17,5 +17,7 @@ switch (os.type()) {
 }
 
 exports.sys_extension  = sys_extension
-var make = is_bsd ? 'gmake' : 'make'
-exports.make  = make
+// var make = is_bsd ? 'gmake' : 'make'
+// exports.make  = make
+
+

scripts/config.js

@@ -14,19 +14,13 @@
 var cp = require('child_process')
 var fs = require('fs')
 var path = require('path')
-// var os = require('os')
-
-// var os_type = os.type()
 var root_dir = path.join(__dirname, '..')
 var lib_dir = path.join(root_dir, 'lib')
 var jscomp_dir = path.join(root_dir, 'jscomp')
 var runtime_dir = path.join(jscomp_dir,'runtime')
 var others_dir = path.join(jscomp_dir,'others')
 var stdlib_dir = path.join(jscomp_dir, 'stdlib-402')
-var root_dir_config = { cwd: root_dir, stdio: [0, 1, 2] }
 
-// var dest_bin = path.join(root_dir, 'lib')
-// var dest_lib = path.join(root_dir, 'lib', 'ocaml')
 
 var ocaml_dir = path.join(lib_dir,'ocaml')
 var config = require('./config.js')
@@ -43,7 +37,13 @@ process.env.PATH =
     process.env.PATH
 
 var ninja_bin_output = path.join(root_dir, 'lib', 'ninja.exe')
-// Make sure `ninja_bin_output` exists    
+
+
+/**
+ * Make sure `ninja_bin_output` exists    
+ * The installation of `ninja.exe` is re-entrant, since we always pre-check if it is already installed
+ * This is less problematic since `ninja.exe` is very stable
+ */
 function provideNinja() {
     var vendor_ninja_version = '1.8.2'    
     var ninja_source_dir = path.join(root_dir, 'vendor', 'ninja')
@@ -77,7 +77,7 @@ function provideNinja() {
 
     var ninja_os_path = path.join(ninja_source_dir,'snapshot', 'ninja' + sys_extension)
     if (fs.existsSync(ninja_bin_output) && test_ninja_compatible(ninja_bin_output)) {
-        console.log("ninja binary is already cached: ", ninja_bin_output)
+        console.log("ninja binary is already cached and installed: ", ninja_bin_output)
     }
     else if (fs.existsSync(ninja_os_path)) {
         if(fs.copyFileSync){
@@ -213,18 +213,10 @@ function tryToProvideOCamlCompiler() {
     }
 }
 
-function renamePrebuiltCompilers() {
-    fs.readdirSync(lib_dir).forEach(function (f) {
-        var last_index = f.lastIndexOf(sys_extension)
-        if (last_index !== -1) {
-            var new_file = f.slice(0, - sys_extension.length) + ".exe"
-            var x = path.join(lib_dir, f)
-            var y = path.join(lib_dir,new_file)
-            console.log(x,'-->',y)
-            fs.renameSync(x, y);
-            // we do have .win file which means windows npm release
-        }
-    })
+function copyPrebuiltCompilers() {
+    cp.execFileSync(ninja_bin_output,
+        ["-f", "copy" + sys_extension + ".ninja"],
+        { cwd: lib_dir, stdio: [0, 1, 2] })
 }
 
 /**
@@ -235,7 +227,7 @@ function checkPrebuilt() {
         var version = cp.execFileSync(path.join(lib_dir, 'bsc' + sys_extension), ['-v'])
         console.log("checkoutput:", String(version))
         console.log("Prebuilt compiler works good")
-        renamePrebuiltCompilers()
+        
         return true
     } catch (e) {
         console.log("No working prebuilt buckleScript compiler")
@@ -255,7 +247,10 @@ function provideCompiler() {
         console.log('Found pervasives.cmi, assume it was already built')
         return true // already built before
     }
-    if (!checkPrebuilt()) {
+    if (checkPrebuilt()) {
+        copyPrebuiltCompilers()
+    }
+    else {
         // when not having bsc.exe
         tryToProvideOCamlCompiler()
         // Note this ninja file only works under *nix due to the suffix
@@ -268,7 +263,7 @@ function provideCompiler() {
 provideNinja()
 
 if(is_windows){
-    renamePrebuiltCompilers()
+    copyPrebuiltCompilers()
 } else{
     provideCompiler()
 }

scripts/install.js

@@ -1,6 +1,5 @@
 //@ts-check
 var child_process = require('child_process')
-var fs = require('fs')
 var path = require('path')
 var {sys_extension, is_windows} = require('./config.js')
 
@@ -11,15 +10,7 @@ process.env.BS_RELEASE_BUILD = 'true'
 
 
 function buildCompiler() {
-	child_process.execSync('make -j1 -B -C lib all', root_config)
-	fs.readdirSync(path.join(root, 'lib')).forEach(function (f) {
-		var last_index = f.lastIndexOf('.exe')
-		if (last_index !== -1) {
-			var new_file = f.slice(0, -4) + sys_extension
-			console.log(f + " --> " + new_file)
-			fs.renameSync(path.join(root, 'lib', f), path.join(root, 'lib', new_file))
-		}
-	})
+	child_process.execSync(`ninja -C lib -f prebuilt${sys_extension}.ninja -t clean && ninja -C lib -f prebuilt${sys_extension}.ninja`,root_config)
 }
 if(!is_windows){
   require('./runtimeDeps.js').updateRelease()