Don't snapshot

Author: cknitt

.github/workflows/ci.yml

@@ -40,12 +40,18 @@ jobs:
           opam-pin: false
           opam-depext: false
 
+      - name: "Install OPAM dependencies"
+        run: opam install . --deps-only
+
+      - name: "Build compiler (pass 1 - dev)"
+        run: opam exec -- dune build
+
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 16
 
-      - name: NPM install
+      - name: Install npm packages
         run: opam exec -- npm ci --ignore-scripts
 
       - name: "Check if syntax subfolder has changed"
@@ -58,14 +64,6 @@ jobs:
             echo "syntax_status=changed" >> $GITHUB_ENV
           fi
 
-      - name: "Syntax: install OPAM dependencies"
-        if: env.syntax_status == 'changed'
-        run: opam install . --deps-only
-
-      - name: "Syntax: build CLI"
-        if: env.syntax_status == 'changed'
-        run: opam exec -- dune build
-
       - name: "Syntax: Run roundtrip tests"
         if: ${{ env.syntax_status == 'changed' && runner.os != 'Windows' }}
         run: opam exec -- make test-syntax-roundtrip
@@ -84,10 +82,13 @@ jobs:
       - name: Build ninja
         run: node scripts/buildNinjaBinary.js
 
-      - name: Run install script
-        run: opam exec -- node scripts/install.js
-        env:
-          RESCRIPT_FORCE_REBUILD: 1
+      - name: Build runtime/stdlib
+        # if: runner.os != 'Windows'
+        run: |
+          node scripts/copyExes.js
+          opam exec -- node ./scripts/ninja.js config
+          opam exec -- node ./scripts/ninja.js build
+          node scripts/install.js -force-lib-rebuild
 
       - name: Run tests
         if: runner.os != 'Windows'
@@ -113,17 +114,6 @@ jobs:
           name: lib-ocaml
           path: lib/ocaml
 
-      # Important: the ninja build must run after the artifact upload because for some reason
-      # the bsc.exe created by the ninja build does not find the Pervasives module.
-      # So this is run here just to test the normal dev workflow, too.
-      - name: ninja config
-        if: runner.os != 'Windows'
-        run: opam exec -- node ./scripts/ninja.js config
-
-      - name: ninja build
-        if: runner.os != 'Windows'
-        run: opam exec -- node ./scripts/ninja.js build
-
       - name: Check for changes in lib folder
         run: git diff --exit-code lib/js lib/es6
 

Makefile

@@ -2,6 +2,7 @@ SHELL = /bin/bash
 
 build:
 	dune build
+	./scripts/copyExes.js
 
 watch:
 	dune build -w
@@ -12,8 +13,11 @@ bench: build
 dce: build
 	opam exec reanalyze.exe -- -dce-cmt _build
 
+ninja/ninja:
+	node scripts/buildNinjaBinary.js
+
 test: build
-	npm test
+	dune exec -- node scripts/ciTest.js -all
 
 test-syntax: build
 	dune exec -- syntax_tests
@@ -36,7 +40,8 @@ test-all: test test-gentype
 # 	reanalyze.exe -set-exit-code -all-cmt _build/default -suppress syntax_tests,syntax_compiler_libs -exclude-paths syntax_compiler_libs 
 
 lib: build
-	node scripts/install -force-lib-rebuild
+	node scripts/ninja.js config
+	node scripts/ninja.js build
 
 artifacts: lib
 	./scripts/makeArtifactList.js

jscomp/common/dune

@@ -1,6 +1,9 @@
 (library
  (name common)
  (wrapped false)
+ (preprocess
+  (action
+   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
  (flags
   (:standard -w +a-9-40-42))
  (libraries napkin))

jscomp/common/js_config.ml

@@ -1,4 +1,3 @@
-# 1 "common/js_config.pp.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -35,11 +34,10 @@ let diagnose = ref false
 
 let get_diagnose () =
   !diagnose
-  
-# 38 "common/js_config.pp.ml"
+#ifndef RELEASE
   || Sys.getenv_opt "RES_DEBUG_FILE" <> None
+#endif
 
-# 41 "common/js_config.pp.ml"
 (* let (//) = Filename.concat *)
 
 (* let get_packages_info () = !packages_info *)

jscomp/common/js_config.pp.ml

@@ -1,4 +1,3 @@
-# 1 "core/bs_cmi_load.pp.ml"
 (* Copyright (C) Hongbo Zhang, Authors of ReScript
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -23,10 +22,55 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
+#ifdef RELEASE 
+(*true *)
+
+
+let load_cmi ~unit_name : Env.Persistent_signature.t option =
+  match Config_util.find_opt (unit_name ^".cmi") with 
+  | Some filename -> Some {filename; cmi = Cmi_format.read_cmi filename}
+  | None ->
+    if !Js_config.no_stdlib then None
+    else 
+      match Ext_string_array.find_sorted Builtin_cmi_datasets.module_names unit_name with
+      | Some cmi ->
+        if Js_config.get_diagnose () then
+          Format.fprintf Format.err_formatter ">Cmi: %s@." unit_name;
+        let cmi : Cmi_format.cmi_infos = 
+          Ext_marshal.from_string
+            Builtin_cmi_datasets.module_data.(cmi)  in   
+        if Js_config.get_diagnose () then
+          Format.fprintf Format.err_formatter "<Cmi: %s@." unit_name;
+        Some {filename = Sys.executable_name ; 
+              cmi }
+      | None -> None
+
+let check () = ()
+(*  
+  Ext_array.iter 
+    Builtin_cmi_datasets.module_sets_cmi
+    (fun (name,l) ->
+       prerr_endline (">checking " ^ name);
+       let cmi = Lazy.force l in 
+       (match cmi.cmi_crcs with 
+        | (unit , Some digest) :: _  ->
+          Format.fprintf Format.err_formatter "%s -> %s@." unit (Digest.to_hex digest)
+        | _ -> ());
+       prerr_endline ("<checking " ^ name);
+    );
+  Ext_array.iter 
+    Builtin_cmj_datasets.module_sets
+    (fun (name,l) ->
+       prerr_endline (">checking " ^ name);
+       let cmj = Lazy.force l in 
+       Format.fprintf Format.err_formatter "%b@." cmj.pure;
+       prerr_endline ("<checking " ^ name);
+    )  *)
+#else
 
-# 71 "core/bs_cmi_load.pp.ml"
 let check () = ()
 let load_cmi ~unit_name : Env.Persistent_signature.t option =
   match Config_util.find_opt (unit_name ^".cmi") with 
   | Some filename -> Some {filename; cmi = Cmi_format.read_cmi filename}
   | None -> None 
+#endif