Skip to content

Commit 6382572

Browse files
authored
Merge pull request rescript-lang#863 from bloomberg/tweak_build
out of source build and fix output_prefix for js location
2 parents 2f04c22 + f6d73c8 commit 6382572

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+39754
-41982
lines changed

bs.el

Lines changed: 442 additions & 0 deletions
Large diffs are not rendered by default.

build.ninja

Lines changed: 1254 additions & 0 deletions
Large diffs are not rendered by default.

docs/js-demo/exports.js

Lines changed: 11646 additions & 11661 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jscomp/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ snapshotml:./bin/bspack.exe ./bin/compiler.mllib
5858
$< -bs-mllib bin/compiler.mllib -o bin/compiler.ml
5959
$< -bs-log-mllib bin/bsppx.mllib -prelude-str 'module Config = Config_bsppx' -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I common -I ext -I syntax -bs-main bsppx_main.ml -o bin/bsppx.ml
6060
$< -bs-log-mllib bin/whole_compiler.mllib -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o bin/whole_compiler.ml -bs-main js_main.ml -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I ext -I syntax -I depends -I common
61-
BS_OCAMLDEP=true $< -bs-log-mllib bin/bsdep.mllib -prelude-str 'module Config = Config_bsdep' -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I common -I ext -I syntax -I . -bs-main ../ocaml/tools/ocamldep.ml -o bin/bsdep.ml
62-
$< -bs-log-mllib bin/bsbuild.mllib -prelude-str 'module Config = Config_bsdep' -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I common -I ext -I syntax -I depends -bs-main ./bsbuild_main.ml -o bin/bsbuild.ml
61+
BS_OCAMLDEP=true $< -bs-log-mllib bin/bsdep.mllib -prelude-str 'module Config = Config_bsdep' -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I common -I ext -I syntax -I depends -I . -bs-main ../ocaml/tools/ocamldep.ml -o bin/bsdep.ml
62+
$< -bs-log-mllib bin/bsbuild.mllib -I common -I ext -I syntax -I depends -bs-main ./bsbuild_main.ml -o bin/bsbuild.ml
6363
BS_MIN_LEX_DEPS=true $< -bs-log-mllib bin/bspp.mllib -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing?parser -I common -I ext -I syntax -I depends -I bspp -bs-main bspp_main.ml -o bin/bspp.ml
6464

6565

jscomp/bin/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bspp.exe: bspp.mli bspp.ml
1515
bsdep.exe: config_bsdep.mli config_bsdep.ml bsdep.mli bsdep.ml
1616
$(NATIVE) -g -inline 1000 -linkall -w -a $^ -o $@
1717

18-
bsbuild.exe: config_bsdep.mli config_bsdep.ml bsbuild.mli bsbuild.ml
18+
bsbuild.exe: bsbuild.mli bsbuild.ml
1919
$(NATIVE) -g -inline 1000 -linkall unix.cmxa -w -a $^ -o $@
2020

2121
bsc.exe: config_whole_compiler.mli config_whole_compiler.ml whole_compiler.mli whole_compiler.ml

jscomp/bin/bsbuild.ml

Lines changed: 638 additions & 5044 deletions
Large diffs are not rendered by default.

jscomp/bin/bsbuild.mllib

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,12 @@
1-
../ocaml/utils/terminfo
2-
../ocaml/utils/warnings
3-
../ocaml/parsing/location
4-
common/bs_exception
5-
../ocaml/utils/clflags
6-
../ocaml/parsing/asttypes
7-
../ocaml/utils/misc
8-
../ocaml/parsing/longident
9-
../ocaml/parsing/parsetree
10-
depends/depend
1+
ext/string_map
2+
depends/binary_cache
3+
ext/ext_array
114
ext/ext_pervasives
125
ext/ext_bytes
136
ext/ext_string
147
ext/literals
158
ext/ext_filename
16-
ext/ext_format
179
ext/ext_list
18-
common/js_config
19-
ext/string_map
20-
depends/ast_extract
21-
./binary_ast
22-
ext/ext_array
2310
./sexp_lexer
2411
./sexp_eval
2512
./bsbuild_main

0 commit comments

Comments
 (0)