Merge pull request #2245 from BuckleScript/fix_2207

fix #2207

Author: bobzhang

scripts/install.js

@@ -114,21 +114,24 @@ function tryToProvideOCamlCompiler() {
     }
 }
 
-function non_windows_npm_release() {
+// copy all [*.sys_extension] files into [*.exe]
+function copyBinToExe() {
+    var indeed_windows_release = 0
+    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"
+            build_util.poor_copy_sync(path.join(lib_dir, f), path.join(lib_dir, new_file));
+            // we do have .win file which means windows npm release
+            ++indeed_windows_release
+        }
 
-    if (checkPrebuilt()) {
-        child_process.execSync(make + " libs && " + make + " install", root_dir_config)
-    } else {
-        tryToProvideOCamlCompiler()
-        child_process.execSync(make + " world && " + make + " install", root_dir_config)
-    }
+    })
+    return indeed_windows_release > 1
 }
+
 function checkPrebuilt() {
     try {
-        if(fs.existsSync(path.join(lib_dir,'bsc.exe'))){
-            console.log('Found bsc.exe, assume it was already built')
-            return true // already built before
-        }
         var version = child_process.execFileSync(path.join(lib_dir, 'bsc' + sys_extension), ['-v'])
         console.log("checkoutput:", String(version))
         return copyBinToExe()
@@ -138,20 +141,21 @@ function checkPrebuilt() {
     }
 }
 
-function copyBinToExe() {
-    var indeed_windows_release = 0
-    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"
-            build_util.poor_copy_sync(path.join(lib_dir, f), path.join(lib_dir, new_file));
-            // we do have .win file which means windows npm release
-            ++indeed_windows_release
-        }
 
-    })
-    return indeed_windows_release > 1
+
+function non_windows_npm_release() {
+    if (fs.existsSync(path.join(lib_dir, 'bsc.exe'))) {
+        console.log('Found bsc.exe, assume it was already built')
+        return true // already built before
+    }
+    if (checkPrebuilt()) {
+        child_process.execSync(make + " libs && " + make + " install", root_dir_config)
+    } else {
+        tryToProvideOCamlCompiler()
+        child_process.execSync(make + " world && " + make + " install", root_dir_config)
+    }
 }
+
 var build_util = require('./build_util.js')
 
 setUpNinja()
@@ -161,7 +165,6 @@ if (is_windows) {
             path.join(__dirname, 'win_build.bat'),
             { cwd: path.join(root_dir, 'jscomp'), stdio: [0, 1, 2] }
         )
-        // clean.clean()
         console.log("Installing")
         build_util.install()
     } else {