Skip to content

Commit 6cd086a

Browse files
authored
Merge pull request #1069 from bloomberg/1.4.1
prepare a new release
2 parents 0372d05 + cb1ec1a commit 6cd086a

File tree

10 files changed

+16
-22
lines changed

10 files changed

+16
-22
lines changed

jscomp/Makefile

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,14 @@ SNAPSHOT_DEPS=$(SNAPSHOT_SRCS:.ml=.d)
349349
# To work around this problem, we should touch a global stamp file , too complex to maintain..
350350
# Gave up, make can not handle delete/adding new files correctly
351351
# Let's make it still work and fail to build, delegating `make clean`
352+
# Actually we can not make it correct by including..
353+
# if we force it, then the initial build will fail
354+
# if we don't force it, then if we remove bin/bsb.d
355+
# The build will never be re-triggered -- ninja seems to have special support for this semantics
356+
# if we move files around, it will cause file failure
357+
# Note the currently snapshot mode means if we don't
358+
# generate ml files it will not be included
359+
352360

353361
snapshotml:./bin/bspack.exe $(SNAPSHOT_SRCS)
354362

@@ -357,35 +365,25 @@ force-snapshotml:
357365
make snapshotml
358366

359367
bin/bsppx.ml:./bin/bspack.exe
360-
$< -bs-MD -prelude-str 'module Config = Config_bsppx' -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I common -I ext -I syntax -I core -bs-main Bsppx_main -o $@
361-
368+
BS_DEBUG=false $< -bs-MD -prelude-str 'module Config = Config_bsppx' -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I common -I ext -I syntax -I core -bs-main Bsppx_main -o $@
362369

363370
bin/whole_compiler.ml:./bin/bspack.exe
364-
$< -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Js_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I stubs -I ext -I syntax -I depends -I common -I core
371+
BS_DEBUG=false $< -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Js_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I stubs -I ext -I syntax -I depends -I common -I core
365372

366373
bin/bsdep.ml:./bin/bspack.exe
367-
BS_OCAMLDEP=true $< -bs-MD -prelude-str 'module Config = Config_bsdep' -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I ../ocaml/tools -I common -I ext -I syntax -I depends -I core -bs-main Ocamldep -o $@
374+
BS_DEBUG=false BS_OCAMLDEP=true $< -bs-MD -prelude-str 'module Config = Config_bsdep' -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I ../ocaml/tools -I common -I ext -I syntax -I depends -I core -bs-main Ocamldep -o $@
368375

369376
bin/bsb_helper.ml:./bin/bspack.exe
370-
$< -bs-MD -I common -I ext -I syntax -I depends -I bsb -bs-main Bsb_helper_main -o $@
371-
377+
BS_DEBUG=false $< -bs-MD -I common -I ext -I syntax -I depends -I bsb -bs-main Bsb_helper_main -o $@
372378

373379
bin/bsb.ml:./bin/bspack.exe
374-
$< -bs-MD -I common -I ext -I syntax -I depends -I bsb -I ext -bs-main Bsb_main -o $@
380+
BS_DEBUG=false $< -bs-MD -I common -I ext -I syntax -I depends -I bsb -I ext -bs-main Bsb_main -o $@
375381

376-
# Actually we can not make it correct by including..
377-
# if we force it, then the initial build will fail
378-
# if we don't force it, then if we remove bin/bsb.d
379-
# The build will never be re-triggered
380-
# if we move files around, it will cause file failure
381-
# Note the currently snapshot mode means if we don't
382-
# generate ml files it will not be included
383382
bin/bspp.ml:./bin/bspack.exe
384-
BS_MIN_LEX_DEPS=true $< -bs-MD -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing?parser -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Bspp_main -o $@
385-
383+
BS_DEBUG=false BS_MIN_LEX_DEPS=true $< -bs-MD -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing?parser -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Bspp_main -o $@
386384

387385
bin/js_compiler.ml:./bin/bspack.exe
388-
BS_COMPILER_IN_BROWSER=true bspack.exe -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Jsoo_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I ext -I syntax -I depends -I common -I core
386+
BS_DEBUG=false BS_COMPILER_IN_BROWSER=true bspack.exe -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Jsoo_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I ext -I syntax -I depends -I common -I core
389387

390388
bin/all_ounit_tests.ml:./bin/bspack.exe
391389
$< -bs-MD -I ounit -I ounit_tests -I stubs -I bsb -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Ounit_tests_main -o $@

jscomp/bin/bsb.win

14.3 KB
Binary file not shown.

jscomp/bin/bsb_helper.win

2.78 KB
Binary file not shown.

jscomp/bin/bsc.win

26.2 KB
Binary file not shown.

jscomp/bin/bsdep.win

5.73 KB
Binary file not shown.

jscomp/bin/bspack.win

0 Bytes
Binary file not shown.

jscomp/bin/bspp.win

0 Bytes
Binary file not shown.

jscomp/bin/bsppx.win

5.73 KB
Binary file not shown.

jscomp/bin/whole_compiler.ml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97325,8 +97325,6 @@ let compile ~filename output_prefix env _sigs
9732597325
|> Lam_pass_exits.simplify_exits
9732697326
|> _d "simplify_lets"
9732797327

97328-
|> Lam.check (Js_config.get_current_file () )
97329-
9733097328
in
9733197329
(* Debug identifier table *)
9733297330
(* Lam_stats_util.pp_alias_tbl Format.err_formatter meta.alias_tbl; *)
@@ -97452,8 +97450,6 @@ let lambda_as_module
9745297450
begin
9745397451
Js_config.set_current_file filename ;
9745497452

97455-
Js_config.set_debug_file "rec_value_test.ml";
97456-
9745797453
let lambda_output = compile ~filename output_prefix env sigs lam in
9745897454
let (//) = Filename.concat in
9745997455
let basename =

jscomp/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ watchman watch-del .
44
git clean -dfx . ../lib
55
make clean
66
make -j9 check
7-
make force-snapshotml
7+
BS_DEUBG=false make force-snapshotml
88
make -j1 world
99

1010

0 commit comments

Comments
 (0)