Skip to content
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

Jump to bottom

update jsoo for testing #1909

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

update jsoo for testing #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f05d21d
update jsoo for testing
phated Sep 4, 2023
03dc521
debug times for jsoo
phated Sep 4, 2023
ac48c17
pin jsoo for testing
phated Oct 15, 2023
b5fe78a
remove jobs on windows
phated Oct 15, 2023
010726b
remove jsoo debug flag
phated Oct 15, 2023
17cc349
no js-string
phated Oct 16, 2023
6cd928a
and tests
phated Oct 16, 2023
e101009
new ref in resolution
phated Oct 16, 2023
33cf816
no more flags
Oct 17, 2023
7fa9cd4
small simplification
Oct 17, 2023
7a7cb55
pin ocamlfind + ocamlbuild
ospencer Jun 29, 2024
70cceaf
Only record backtrace when not running in jsoo
ospencer Jul 1, 2024
e6d84ea
dune 3 and hacks.js
ospencer Jul 1, 2024
f41b8fd
test jsoo master
ospencer Jul 28, 2024
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
5 changes: 5 additions & 0 deletions compiler/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@
(name js)
(deps grainc/grainc.bc.js graindoc/graindoc.bc.js
grainformat/grainformat.bc.js grainlsp/grainlsp.bc.js test/test.bc.js))

(env
(_
(js_of_ocaml
(flags :standard --no-sourcemap --no-extern-fs --disable use-js-string))))
2 changes: 1 addition & 1 deletion compiler/dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(lang dune 2.3)
(lang dune 3.0)
(name grain)
(version 0.6.4)
(using menhir 2.0)
Expand Down
14 changes: 8 additions & 6 deletions compiler/esy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"name": "@grain/compiler",
"version": "0.6.4",
"esy": {
"build": [
"dune build @native --no-buffer"
],
"build": ["dune build @native --no-buffer"],
"buildEnv": {
"DUNE_BUILD_DIR": "#{self.target_dir}",
"GRAIN_STDLIB": "#{self.root / '..' / 'stdlib'}",
Expand All @@ -25,7 +23,7 @@
"copy:exe": "cp #{$GRAINC_BIN_PATH} #{$GRAINDOC_BIN_PATH} #{$GRAINFORMAT_BIN_PATH} #{$GRAINLSP_BIN_PATH} #{$CLI_BIN_DIR}",
"copy:js": "cp #{$GRAINC_JS_PATH} #{$GRAINDOC_JS_PATH} #{$GRAINFORMAT_JS_PATH} #{$GRAINLSP_JS_PATH} #{$CLI_BIN_DIR}",
"clean": "rm -rf #{self.root}/_esy",
"build:js": "esy b dune build @js --no-buffer #{os == 'windows' ? '-j 2' : ''}",
"build:js": "esy b dune build @js --no-buffer",
"test": "#{$TEST_EXEC_PATH}",
"test:js": "node #{$TEST_JS_PATH}",
"format": "dune build @fmt --auto-promote",
Expand Down Expand Up @@ -54,19 +52,23 @@
"ocaml": "4.14.1000"
},
"devDependencies": {
"@opam/js_of_ocaml-compiler": "5.0.1",
"@opam/js_of_ocaml-compiler": ">=5.4.0",
"@opam/ocaml-lsp-server": "1.14.1",
"@opam/rely": "^4.0.0"
},
"resolutions": {
"@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#7221b9c8a6e54a2f008c8868abc62acf4825c993",
"@opam/fp": "reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0",
"@opam/fs": "reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0",
"@opam/ppx_deriving_cmdliner": "hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c",
"@opam/utf8": "reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0",
"@opam/cli": "reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0",
"@opam/file-context-printer": "reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0",
"@opam/pastel": "reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0",
"@opam/rely": "reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0"
"@opam/rely": "reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0",
"@opam/ocamlfind": "1.9.3",
"@opam/ocamlbuild": "0.14.2+win",
"@opam/num": "1.5"
},
"installConfig": {
"pnp": false
Expand Down
Loading
Loading