Merge pull request #3812 from BuckleScript/fix_3674

fix #3674

Author: bobzhang

jscomp/core/ocaml_options.ml

@@ -253,7 +253,7 @@ let show_config () =
 
 let bs_version_string = 
   "BuckleScript " ^ Bs_version.version ^
-  " (Using OCaml" ^ Config.version ^ " )" 
+  " ( Using OCaml:" ^ Config.version ^ " )" 
 
 let print_version_string () = 
   print_string bs_version_string;

lib/4.02.3/whole_compiler.ml

@@ -123692,7 +123692,7 @@ let show_config () =
 
 let bs_version_string = 
   "BuckleScript " ^ Bs_version.version ^
-  " (Using OCaml" ^ Config.version ^ " )" 
+  " ( Using OCaml:" ^ Config.version ^ " )" 
 
 let print_version_string () = 
   print_string bs_version_string;

scripts/buildocaml.js

@@ -4,6 +4,7 @@ var cp = require("child_process");
 var path = require("path");
 var fs = require("fs");
 
+var ocamlSrcDir = path.join(__dirname, "..", "ocaml");
 /**
  * @type {string}
  */
@@ -18,36 +19,18 @@ function getVersionPrefix() {
     return cached;
   }
 
-  var file = path.join(__dirname, "..", "OCAML_VERSION");
-  if (fs.existsSync(file)) {
-    console.log(`${file} is used in version detection`)
-    var version = fs.readFileSync(file, "ascii");
-    cached = version.substr(0, version.indexOf("+"));
-    return cached;
-  }
-  
-
-  file = path.join(__dirname, "..", "ocaml", "VERSION");
-  if (fs.existsSync(file)) {
-    console.log(`${file} is used in version detection`)
-    var version = fs.readFileSync(file, "ascii");
-    cached = version.substr(0, version.indexOf("+"));
-    return cached;
+  var file = path.join(__dirname, "..", "ocaml", "VERSION");
+  if (!fs.existsSync(file)) {
+    cp.execSync(`tar xzvf ../vendor/ocaml.tar.gz`, {
+      cwd: ocamlSrcDir,
+      stdio: [0, 1, 2]
+    });
   }
-  
-
-  console.warn(
-    "You should create OCAML_VERSION or ocaml/VERSION file to specify OCaml version like '4.02.3+buckle-master'"
-  );
-  console.warn(`for example,
-bucklescript>cat ocaml/VERSION 
-4.02.3+BS
-
-# The version string is the first line of this file.
-# It must be in the format described in stdlib/sys.mli
-`);
 
-  throw new Error("version file not found");
+  console.log(`${file} is used in version detection`);
+  var version = fs.readFileSync(file, "ascii");
+  cached = version.substr(0, version.indexOf("+"));
+  return cached;
 }
 exports.getVersionPrefix = getVersionPrefix;
 
@@ -56,12 +39,11 @@ exports.getVersionPrefix = getVersionPrefix;
  * @param {boolean} config
  */
 function build(config) {
-  var ocamlSrcDir = path.join(__dirname, "..", "ocaml");
   if (!fs.existsSync(ocamlSrcDir)) {
     fs.mkdirSync(ocamlSrcDir);
   }
   if (!fs.existsSync(path.join(ocamlSrcDir, "VERSION"))) {
-    cp.execSync(`tar xzvf ../ocaml.tar.gz`, {
+    cp.execSync(`tar xzvf ../vendor/ocaml.tar.gz`, {
       cwd: ocamlSrcDir,
       stdio: [0, 1, 2]
     });

scripts/install.js

@@ -27,17 +27,6 @@ var is_windows = config.is_windows;
 var sys_extension = config.sys_extension;
 
 process.env.BS_RELEASE_BUILD = "true";
-var ocamlVersion = require("./buildocaml.js").getVersionPrefix();
-var stdlib_dir = path.join(
-  jscomp_dir,
-  ocamlVersion.includes("4.02") ? "stdlib-402" : "stdlib-406"
-);
-// Add vendor bin path
-// So that second try will work
-process.env.PATH =
-  path.join(__dirname, "..", "native", ocamlVersion, "bin") +
-  path.delimiter +
-  process.env.PATH;
 
 var ninja_bin_output = path.join(root_dir, "lib", "ninja.exe");
 
@@ -187,7 +176,11 @@ function ensureExists(dir) {
     fs.mkdirSync(dir);
   }
 }
-function install() {
+
+/**
+ * @param {string} stdlib
+ */
+function install(stdlib) {
   installDirBy(runtime_dir, ocaml_dir, function(file) {
     var y = path.parse(file);
     return y.name === "js" || y.ext.includes("cm");
@@ -196,58 +189,13 @@ function install() {
     var y = path.parse(file);
     return y.ext === ".ml" || y.ext === ".mli" || y.ext.includes("cm");
   });
+  var stdlib_dir = path.join(jscomp_dir, stdlib);
   installDirBy(stdlib_dir, ocaml_dir, function(file) {
     var y = path.parse(file);
     return y.ext === ".ml" || y.ext === ".mli" || y.ext.includes("cm");
   });
 }
 
-/**
- * raise an exception if not matched
- */
-function matchedCompilerExn() {
-  var output = cp.execSync("ocamlc.opt -v", { encoding: "ascii" });
-
-  if (output.indexOf(ocamlVersion) >= 0) {
-    console.log(output);
-    console.log("Use the compiler above");
-  } else {
-    console.log(
-      "version",
-      output,
-      "needed version",
-      ocamlVersion,
-      "No matched compiler found, may re-try"
-    );
-    throw "";
-  }
-}
-function tryToProvideOCamlCompiler() {
-  try {
-    if (process.env.BS_ALWAYS_BUILD_YOUR_COMPILER) {
-      throw "FORCED TO REBUILD";
-    }
-    matchedCompilerExn();
-  } catch (e) {
-    console.log(
-      "Build a local version of OCaml compiler, it may take a couple of minutes"
-    );
-    try {
-      require("./buildocaml.js").build(true);
-    } catch (e) {
-      console.log(e.stdout.toString());
-      console.log(e.stderr.toString());
-      console.log(
-        "Building a local version of the OCaml compiler failed, check the output above for more information. A possible problem is that you don't have a compiler installed."
-      );
-      throw e;
-    }
-    console.log("configure again with local ocaml installed");
-    matchedCompilerExn();
-    console.log("config finished");
-  }
-}
-
 /**
  *
  * @param {string} sys_extension
@@ -289,31 +237,42 @@ function copyPrebuiltCompilers() {
 }
 
 /**
- * @returns {boolean}
+ * @returns {string|undefined}
  */
 function checkPrebuiltBscCompiler() {
   try {
-    var version = cp.execFileSync(path.join(lib_dir, "bsc" + sys_extension), [
-      "-v"
-    ]);
-    console.log("checkoutput:", String(version));
+    var version = String(
+      cp.execFileSync(path.join(lib_dir, "bsc" + sys_extension), ["-v"])
+    );
+
+    var myOCamlVersion = version.substr(
+      version.indexOf(":") + 1,
+      version.lastIndexOf(" ") - version.indexOf(":") - 1
+    );
+    console.log("checkoutput:", version, "ocaml version", myOCamlVersion);
     console.log("Prebuilt compiler works good");
 
-    return true;
+    return myOCamlVersion;
   } catch (e) {
     console.log("No working prebuilt buckleScript compiler");
-    return false;
+    if (is_windows) {
+      throw new Error("no prebuilt bsc compiler on windows");
+    }
+    return;
   }
 }
-
-function buildLibs() {
+/**
+ *
+ * @param {string} stdlib
+ */
+function buildLibs(stdlib) {
   ensureExists(lib_dir);
   ensureExists(ocaml_dir);
   ensureExists(path.join(lib_dir, "js"));
   ensureExists(path.join(lib_dir, "es6"));
   process.env.NINJA_IGNORE_GENERATOR = "true";
   var releaseNinja = `
-stdlib = ${ocamlVersion.includes("4.06") ? "stdlib-406" : "stdlib-402"}
+stdlib = ${stdlib}
 subninja runtime/release.ninja
 subninja others/release.ninja
 subninja $stdlib/release.ninja
@@ -341,23 +300,35 @@ build all: phony runtime others $stdlib
   console.log("Build finished");
 }
 
+/**
+ * @returns {string}
+ */
 function provideCompiler() {
-  // FIXME: weird logic
-  // if (fs.existsSync(path.join(lib_dir,'ocaml','pervasives.cmi'))) {
-  //     console.log('Found pervasives.cmi, assume it was already built')
-  //     return true // already built before
-  // }
-  if (checkPrebuiltBscCompiler()) {
+  var myVersion = checkPrebuiltBscCompiler();
+  if (myVersion !== undefined) {
     copyPrebuiltCompilers();
+    return myVersion;
   } else {
-    // when not having bsc.exe
-    tryToProvideOCamlCompiler();
+    myVersion = require("./buildocaml.js").getVersionPrefix();
+    var ocamlopt = path.join(
+      __dirname,
+      "..",
+      "native",
+      myVersion,
+      "bin",
+      "ocamlopt.opt"
+    );
+    if (!fs.existsSync(ocamlopt)) {
+      require("./buildocaml.js").build(true);
+    } else {
+      console.log(ocamlopt, "is already there");
+    }
     // Note this ninja file only works under *nix due to the suffix
     // under windows require '.exe'
     var releaseNinja = require("./ninjaFactory.js").libNinja({
-      ocamlopt: "ocamlopt.opt",
+      ocamlopt: ocamlopt,
       ext: ".exe",
-      INCL: ocamlVersion,
+      INCL: myVersion,
       isWin: is_windows
     });
 
@@ -368,17 +339,15 @@ function provideCompiler() {
       stdio: [0, 1, 2]
     });
     fs.unlinkSync(filePath);
+    return myVersion;
   }
 }
 
 provideNinja();
 
-if (is_windows) {
-  copyPrebuiltCompilers();
-} else {
-  provideCompiler();
-}
+var ocamlVersion = provideCompiler();
 
-buildLibs();
+var stdlib = ocamlVersion.includes("4.02") ? "stdlib-402" : "stdlib-406";
 
-install();
+buildLibs(stdlib);
+install(stdlib);

scripts/prebuilt.js

@@ -55,13 +55,13 @@ function createOCamlTar() {
   if (os.platform() === hostPlatform) {
     cp.execSync(`git -C ocaml status -uno`, { cwd: root, stdio: [0, 1, 2] });
     cp.execSync(
-      `git  -C ocaml archive --format=tar.gz HEAD -o ../ocaml.tar.gz`,
+      `git  -C ocaml archive --format=tar.gz HEAD -o ../vendor/ocaml.tar.gz`,
       { cwd: root, stdio: [0, 1, 2] }
     );
-    fs.copyFileSync(
-      path.join(root, "ocaml", "VERSION"),
-      path.join(root, "OCAML_VERSION")
-    );
+    // fs.copyFileSync(
+    //   path.join(root, "ocaml", "VERSION"),
+    //   path.join(root, "OCAML_VERSION")
+    // );
   }
 }
 createOCamlTar();