Skip to content

Commit 592fe22

Browse files
author
Hongbo Zhang
committed
when make world, it does not build ocaml_pack..
1 parent 495df73 commit 592fe22

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

jscomp/Makefile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,17 @@ world:
8080
cd stdlib && make all
8181
@echo "Making lib finished"
8282

83+
# no depend on ./bin/ocaml_pack ./bin/bsc
84+
# since in npm mode, they are generated from a single file
85+
install:
86+
cp ./bin/bsc ../bin/
87+
cp ./runtime/*.cmt* ../lib/ocaml/
88+
cp ./runtime/*.cmj* ../lib/ocaml/
89+
cp ./stdlib/*.cm* ../lib/ocaml/
90+
8391
TMP_OCAMLLIB=$(shell ocamlopt.opt -where)
8492

93+
8594
big-world:bin/big_compiler.ml bin/big_compiler.mli
8695
@echo "Making compiler"
8796
ocamlopt.opt -g -inline 100 -linkall -w -a -I bin bin/big_compiler.mli bin/big_compiler.ml -o bin/bsc
@@ -99,7 +108,6 @@ big-world:bin/big_compiler.ml bin/big_compiler.mli
99108
cd stdlib && make all
100109
@echo "Making lib finished"
101110

102-
103111
world-test:
104112
@echo "Making compiler"
105113
ocamlopt.opt -g -inline 100 -w -a -linkall -I +compiler-libs -I bin ocamlcommon.cmxa bin/compiler.mli bin/compiler.ml -o bin/bsc
@@ -128,13 +136,6 @@ travis-world-test:./bin/ocaml_pack
128136
@echo "Generating the compiler finished"
129137
make world-test
130138

131-
# no depend on ./bin/ocaml_pack ./bin/bsc
132-
# since in npm mode, they are generated from a single file
133-
install:
134-
cp ./bin/ocaml_pack ./bin/bsc ../bin/
135-
cp ./runtime/*.cmt* ../lib/ocaml/
136-
cp ./runtime/*.cmj* ../lib/ocaml/
137-
cp ./stdlib/*.cm* ../lib/ocaml/
138139

139140
.PHONY: stdlib
140141
.PHONY: test quicktest release snapshot snapshotcmj

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626

2727
"name": "bs-platform",
28-
"version": "0.2.3",
28+
"version": "0.2.4",
2929
"description": "bucklescript compiler, ocaml standard libary by bucklescript and its required runtime support",
3030

3131
"repository": {

0 commit comments

Comments
 (0)