Add vendor/ocaml.tar.gz so git submodule is not needed for developer who are not devs

Check getVersionPrefix is not hit in windows installation

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,19 @@ 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;
+
+/**
+ * @type {string}
+ */
+var ocamlVersion;
+
+/**
+ *
+ * @param {string} p
+ */
+function addPath(p) {
+  process.env.PATH = p + path.delimiter + process.env.PATH;
+}
 
 var ninja_bin_output = path.join(root_dir, "lib", "ninja.exe");
 
@@ -196,6 +198,10 @@ 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,
+    ocamlVersion.includes("4.02") ? "stdlib-402" : "stdlib-406"
+  );
   installDirBy(stdlib_dir, ocaml_dir, function(file) {
     var y = path.parse(file);
     return y.ext === ".ml" || y.ext === ".mli" || y.ext.includes("cm");
@@ -293,10 +299,15 @@ function copyPrebuiltCompilers() {
  */
 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"])
+    );
+
+    ocamlVersion = version.substr(
+      version.indexOf(":") + 1,
+      version.lastIndexOf(" ") - version.indexOf(":") - 1
+    );
+    console.log("checkoutput:", version, "ocaml version", ocamlVersion);
     console.log("Prebuilt compiler works good");
 
     return true;
@@ -350,6 +361,8 @@ function provideCompiler() {
   if (checkPrebuiltBscCompiler()) {
     copyPrebuiltCompilers();
   } else {
+    ocamlVersion = require("./buildocaml.js").getVersionPrefix();
+    addPath(path.join(__dirname, "..", "native", ocamlVersion, "bin"));
     // when not having bsc.exe
     tryToProvideOCamlCompiler();
     // Note this ninja file only works under *nix due to the suffix

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();