Scripts/vendored stuff cleanup

Author: cknitt

.github/workflows/ci.yml

@@ -153,9 +153,6 @@ jobs:
  - name: Move artifacts
  run: ./scripts/moveArtifacts.sh
 
- - name: Create ninja.tar.gz
- run: git -C ninja archive --format=tar.gz HEAD -o ../vendor/ninja.tar.gz
-
  - name: Check artifact list
  run: node ./scripts/makeArtifactList.js -check
 

README.md

@@ -103,9 +103,6 @@ ReScript is licensed under LGPL version 3, with relaxed rules about creating and
 
 The ReScript parser (subdirectory `res_syntax`) is licensed under the [MIT License](res_syntax/LICENSE).
 
-`vendor/ocaml.tar.gz` contains the official [OCaml](https://ocaml.org) compiler (version 4.14.0).
-Refer to its copyright and license notices for information about its licensing.
-
 The `ninja` subdirectory contains the vendored [ninja](https://github.com/ninja-build/ninja) build system.
 Refer to its copyright and license notices for information about its licensing.
 

package.json

@@ -38,9 +38,7 @@
  "docs/docson/build-schema.json",
  "jscomp/stubs/ext_basic_hash_stubs.c",
  "lib",
- "scripts",
- "vendor/ninja.tar.gz",
- "vendor/ocaml.tar.gz"
+ "scripts"
  ],
  "repository": {
  "type": "git",

packages/artifacts.txt

@@ -950,16 +950,13 @@ package.json
 rescript
 scripts/bin_path.js
 scripts/buildNinjaBinary.js
-scripts/buildocaml.js
 scripts/config.js
 scripts/install.js
 scripts/installUtils.js
 scripts/rescript_arg.js
 scripts/rescript_convert.js
 scripts/rescript_dump.js
 scripts/rescript_format.js
-vendor/ninja.tar.gz
-vendor/ocaml.tar.gz
 win32/bsb_helper.exe
 win32/bsc.exe
 win32/ninja.exe

scripts/.npmignore

@@ -3,7 +3,6 @@
 *
 !bin_path.js
 !buildNinjaBinary.js
-!buildocaml.js
 !config.js
 !install.js
 !installUtils.js

scripts/buildocaml.js

@@ -41,20 +41,23 @@ if (all) {
  formatTest = true;
 }
 
+function checkOCamlCompilerAvailable() {
+ try {
+ var o = cp.execSync(`ocamlopt.opt -version`, {
+ encoding: "utf-8",
+ });
+ console.log("checking env compiler");
+ console.log(o);
+ return true;
+ } catch (e) {
+ console.log(e);
+ return false;
+ }
+}
+
 function init() {
- if (!require("./buildocaml.js").checkEnvCompiler()) {
- // No compiler available on path.
- // Assume that we built the compiler from source beforehand and add it to the path.
- var vendorOCamlPath = path.join(
- __dirname,
- "..",
- "native",
- require("./buildocaml.js").getVersionPrefix(),
- "bin"
- );
-
- process.env["PATH"] =
- vendorOCamlPath + path.delimiter + process.env["PATH"];
+ if (!checkOCamlCompilerAvailable()) {
+ throw new Error("OCaml compiler not found on path");
  }
 
  var ninjaPath = require("./bin_path").ninja_exe;

scripts/ciTest.js

@@ -22,11 +22,9 @@ var supported_os = ["darwin", "freebsd", "linux", "openbsd", "win32"];
 if (supported_os.indexOf(process.platform) < 0) {
  throw new Error("Not supported platform" + process.platform);
 }
-var is_windows = process.platform === "win32";
 
 var bsc_exe = require("./bin_path").bsc_exe;
 
-var ninja_bin_filename = process.platform === "win32" ? "ninja.exe" : "ninja";
 var ninja_bin_output = require("./bin_path").ninja_exe;
 
 var force_lib_rebuild = process.argv.includes("-force-lib-rebuild");

scripts/install.js

@@ -49,7 +49,7 @@ function getFilesAddedByCI() {
  const platforms = ["darwin", "darwinarm64", "linux", "win32"];
  const exes = ["bsb_helper.exe", "bsc.exe", "ninja.exe", "rescript.exe"];
 
- const files = ["ninja.COPYING", "vendor/ninja.tar.gz"];
+ const files = ["ninja.COPYING"];
 
  for (let platform of platforms) {
  for (let exe of exes) {

scripts/makeArtifactList.js

@@ -100,13 +100,8 @@ var getVersionString = () => {
  .substring(output.indexOf(searcher) + searcher.length)
  .trim();
  } catch (err) {
- //
- console.error(`This error probably came from that you don't have our vendored ocaml installed
- If this is the first time you clone the repo
- try this
- git submodule init && git submodule update
- node ./scripts/buildocaml.js
- `);
+ console.error(`This error probably came from that you don't have OCaml installed.
+Make sure you have the OCaml compiler available in your path.`);
  console.error(err.message);
  process.exit(err.status);
  }