Skip to content

Commit 4233395

Browse files
authored
Merge pull request #668 from bloomberg/bump
bump
2 parents ed3166a + 25a78af commit 4233395

File tree

4 files changed

+193
-189
lines changed

4 files changed

+193
-189
lines changed

jscomp/Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ lam_fold.ml: lambda_fold.mlp lambda.mlp
3131

3232
release:snapshot
3333
$(MAKE) releasebuild
34-
ocamlbuild -lflags -no-check-prims -use-ocamlfind -I bin -no-hygiene -pkgs compiler-libs.common -no-links bin/reason.byte
35-
js_of_ocaml -I +compiler-libs --toplevel +weak.js +toplevel.js ./polyfill.js _build/bin/reason.byte -I ./runtime/ --file js.cmi:/cmis/js.cmi --file js_unsafe.cmi:/cmis/js_unsafe.cmi --file js_re.cmi:/cmis/js_re.cmi -o bin/compiler.js
34+
# ocamlbuild -no-ocamlfind -lflags -no-check-prims -use-ocamlfind -I bin -no-hygiene -pkgs compiler-libs.common -no-links bin/reason.byte
35+
# js_of_ocaml -I +compiler-libs --toplevel +weak.js +toplevel.js ./polyfill.js _build/bin/reason.byte -I ./runtime/ --file js.cmi:/cmis/js.cmi --file js_unsafe.cmi:/cmis/js_unsafe.cmi --file js_re.cmi:/cmis/js_re.cmi -o bin/compiler.js
36+
37+
#TODO: seems dependency on jsoo and reason should not block our release
3638

3739

3840
# Note: this target also built bin/bsc which is used in release mode
@@ -67,12 +69,14 @@ bootbspack: ./bin/bspack
6769
@echo "Bootstrap seems finished, please check diffs in bspack"
6870
git diff bin/bspack.ml
6971

70-
releasebuild:
72+
releasebuild:./bin/bspack
7173
@echo "Make release compiler"
7274
$(NATIVE) -g -inline 1000 -linkall -w -a -I +compiler-libs -I bin ocamlcommon.cmxa bin/compiler.mli bin/compiler.ml -o bin/bsc
7375

7476
@echo "Make release ppx"
7577
$(NATIVE) -g -inline 1000 -linkall -w -a -I +compiler-libs -I bin ocamlcommon.cmxa bin/bs_ppx.mli bin/bs_ppx.ml -o bin/bsppx
78+
79+
7680
stdlib:
7781
cd stdlib && ./build.sh
7882

jscomp/bin/bs_ppx.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(** Bundled by bspack 08/23-11:37 *)
1+
(** Bundled by bspack 08/23-11:54 *)
22
module String_map : sig
33
#1 "string_map.mli"
44
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.

0 commit comments

Comments
 (0)