Skip to content

Use folders from esy ocaml for snapshots #3918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2019
Merged

Use folders from esy ocaml for snapshots #3918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c7dab8
Use folders from esy ocaml for snapshots
ulrikstrid Nov 1, 2019
fc30b57
Remove unneeded intermediate variable
ulrikstrid Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 4061.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"source": "./esy.json",
"override": {
"resolutions": {
"ocaml": "bucklescript/ocaml:package.json#4582c3fcce632aaa0f9794f5518bf5d9ad4a6385"
"ocaml": "ulrikstrid/ocaml:package.json#68e181a3a44f0b6be1b1ab1e585d2c9f2718c37b"
}
}
}
15 changes: 6 additions & 9 deletions jscomp/snapshot.ninja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ rule bspack
generator = true


NATIVE_OCAML_PATH=../ocaml/

OCAML_SRC_UTILS=$NATIVE_OCAML_PATH/utils
OCAML_SRC_PARSING=$NATIVE_OCAML_PATH/parsing
OCAML_SRC_TYPING=$NATIVE_OCAML_PATH/typing
OCAML_SRC_BYTECOMP=$NATIVE_OCAML_PATH/bytecomp
OCAML_SRC_DRIVER=$NATIVE_OCAML_PATH/driver
OCAML_SRC_TOOLS=$NATIVE_OCAML_PATH/tools
OCAML_SRC_UTILS=$native_ocaml_path/utils
OCAML_SRC_PARSING=$native_ocaml_path/parsing
OCAML_SRC_TYPING=$native_ocaml_path/typing
OCAML_SRC_BYTECOMP=$native_ocaml_path/bytecomp
OCAML_SRC_DRIVER=$native_ocaml_path/driver
OCAML_SRC_TOOLS=$native_ocaml_path/tools
includes = -I stubs -I ext -I common -I syntax -I depends -I core -I super_errors -I outcome_printer -I bsb -I ounit -I ounit_tests -I main
SNAP=../lib/$snapshot_path

Expand Down Expand Up @@ -71,4 +69,3 @@ build $SNAP/unstable/js_compiler.ml: bspack | ./bin/bspack.exe
# command = $ocamlopt -w -a unix.cmxa str.cmxa ./stubs/ext_basic_hash_stubs.c $in -o $out
# only check if it compiles
# build $SNAP/unstable/bsb_native.exe: bsbnative ./bin/bsb_native.ml

5 changes: 5 additions & 0 deletions scripts/ninja.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,11 @@ build all: phony runtime others $stdlib test
`
${getVendorConfigNinja()}
stdlib = ${version6() ? `stdlib-406` : `stdlib-402`}
native_ocaml_path = ${
process.env.ESY === "true"
? path.join(process.env.OCAMLLIB, "/../..")
: "../ocaml/"
}
snapshot_path = ${require("./buildocaml.js").getVersionPrefix()}
subninja compiler.ninja
subninja snapshot.ninja
Expand Down