format the project

Author: bobzhang

.gitignore

@@ -1,6 +1,5 @@
 *~
 _build
-_esy
 *.obj
 *.out
 *.compile

scripts/buildocaml.js

@@ -4,10 +4,7 @@ var cp = require("child_process");
 var path = require("path");
 var fs = require("fs");
 
-var ocamlSrcDir =
-  process.env.ESY === "true"
-    ? process.env.OCAMLLIB
-    : path.join(__dirname, "..", "ocaml");
+var ocamlSrcDir = path.join(__dirname, "..", "ocaml");
 var ocamlVersionFilePath = path.join(ocamlSrcDir, "VERSION");
 
 /**
@@ -21,7 +18,7 @@ function ensureOCamlExistsSync() {
   if (!fs.existsSync(ocamlVersionFilePath)) {
     cp.execSync(`tar xzvf ../vendor/ocaml.tar.gz`, {
       cwd: ocamlSrcDir,
-      stdio: [0, 1, 2]
+      stdio: [0, 1, 2],
     });
   }
 }
@@ -56,26 +53,24 @@ exports.getVersionPrefix = getVersionPrefix;
 function build(config) {
   ensureOCamlExistsSync();
 
-  if (process.env.ESY !== "true") {
-    var prefix = path.normalize(
-      path.join(__dirname, "..", "native", getVersionPrefix())
-    );
-
-    if (config) {
-      var { make } = require("./config.js");
-      cp.execSync(
-        "./configure -cc \"gcc -Wno-implicit-function-declaration -fcommon\" -flambda -prefix " +
-          prefix +
-          ` -no-ocamlbuild  -no-curses -no-graph -no-pthread -no-debugger && ${make} clean`,
-        { cwd: ocamlSrcDir, stdio: [0, 1, 2] }
-      );
-    }
+  var prefix = path.normalize(
+    path.join(__dirname, "..", "native", getVersionPrefix())
+  );
 
-    cp.execSync(`${make} -j9 world.opt && ${make} install `, {
-      cwd: ocamlSrcDir,
-      stdio: [0, 1, 2]
-    });
+  if (config) {
+    var { make } = require("./config.js");
+    cp.execSync(
+      './configure -cc "gcc -Wno-implicit-function-declaration -fcommon" -flambda -prefix ' +
+        prefix +
+        ` -no-ocamlbuild  -no-curses -no-graph -no-pthread -no-debugger && ${make} clean`,
+      { cwd: ocamlSrcDir, stdio: [0, 1, 2] }
+    );
   }
+
+  cp.execSync(`${make} -j9 world.opt && ${make} install `, {
+    cwd: ocamlSrcDir,
+    stdio: [0, 1, 2],
+  });
 }
 
 exports.build = build;

scripts/install.js

@@ -178,17 +178,14 @@ function provideCompiler() {
     return myVersion;
   } else {
     myVersion = "4.06.1";
-    var ocamlopt =
-      process.env.ESY === "true"
-        ? "ocamlopt.opt"
-        : path.join(
-            __dirname,
-            "..",
-            "native",
-            myVersion,
-            "bin",
-            "ocamlopt.opt"
-          );
+    var ocamlopt = path.join(
+      __dirname,
+      "..",
+      "native",
+      myVersion,
+      "bin",
+      "ocamlopt.opt"
+    );
     if (!fs.existsSync(ocamlopt)) {
       require("./buildocaml.js").build(true);
     } else {

scripts/ninja.js

@@ -76,18 +76,14 @@ exports.vendorNinjaPath = vendorNinjaPath;
  * Note ocamldep.opt has built-in macro handling OCAML_VERSION
  */
 var getOcamldepFile = () => {
-  if (process.env.ESY === "true") {
-    return `ocamldep.opt`;
-  } else {
-    return path.join(
-      __dirname,
-      "..",
-      "native",
-      require("./buildocaml.js").getVersionPrefix(),
-      "bin",
-      "ocamldep.opt"
-    );
-  }
+  return path.join(
+    __dirname,
+    "..",
+    "native",
+    require("./buildocaml.js").getVersionPrefix(),
+    "bin",
+    "ocamldep.opt"
+  );
 };
 
 /**
@@ -749,7 +745,7 @@ function collectTarget(sourceFiles) {
           break;
         case "HAS_BOTH_RE":
         case "HAS_BOTH":
-        case "HAS_BOTH_RES":  
+        case "HAS_BOTH_RES":
           break;
       }
     }
@@ -1466,7 +1462,6 @@ function setSortedToStringAsNativeDeps(xs) {
  * @returns {string}
  */
 function getVendorConfigNinja() {
-  if (process.env.ESY === "true") return getEnnvConfigNinja();
   var prefix = `../native/${require("./buildocaml.js").getVersionPrefix()}/bin`;
   return `
 ocamlopt = ${prefix}/ocamlopt.opt
@@ -1476,15 +1471,6 @@ ocamlmklib = ${prefix}/ocamlmklib
 ocaml = ${prefix}/ocaml
 `;
 }
-function getEnnvConfigNinja() {
-  return `
-ocamlopt = ocamlopt.opt
-ocamlc = ocamlc.opt
-ocamllex = ocamllex.opt
-ocamlmklib = ocamlmklib
-ocaml = ocaml
-`;
-}
 
 /**
  * @returns {string}