Skip to content

Commit fdcdb5b

Browse files
author
Hongbo Zhang
committed
moving files into separate directories for easy contribution
1 parent 79c5007 commit fdcdb5b

Some content is hidden

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

86 files changed

+368
-336
lines changed

Diff for: .gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
jscomp/js_cmj_datasets.ml binary
1+
jscomp/js_cmj_datasets.ml binary
2+
jscomp/bin/compiler.ml binary

Diff for: jscomp/Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ lam_fold.ml: lambda_fold.mlp lambda.mlp
2020
@echo "Regenrating lambda_map.ml"
2121
$(CAMLP4OF) -filter map -filter trash -impl $< -printer o > $@
2222

23-
./bin/bsc: _build/compiler.cmxa
23+
./bin/bsc: _build/ext/ext.cmxa _build/common/common.cmxa _build/syntax/syntax.cmxa _build/core.cmxa
2424
echo "Linking"
2525
$(NATIVE) -g -linkall -o $@ -I +compiler-libs ocamlcommon.cmxa $^ 2>>build.compile
2626
# Note: we can remove main.cmx since we have js_main.cmx which use [js_implementation.implementation],
@@ -42,17 +42,17 @@ release:snapshot
4242
snapshot: ./bin/ocaml_pack snapshotcmj
4343
make snapshotml
4444

45-
snapshotml:./bin/ocaml_pack
45+
snapshotml:./bin/ocaml_pack ./bin/compiler.mllib
4646
@echo "Snapshot ml"
47-
$< compiler.mllib > bin/compiler.ml
47+
$< bin/compiler.mllib > bin/compiler.ml
4848
snapshotcmj:
4949
@echo "Collecting cmj files"
5050
ocamlbuild -cflags $(OCAMLBUILD_CFLAGS) js_pack.native --
5151

5252

5353
releasebuild:
5454
@echo "Make release compiler"
55-
$(NATIVE) -g -inline 100 -linkall -w -a -I +compiler-libs -I bin ocamlcommon.cmxa bin/compiler.mli bin/compiler.ml -o bin/bsc
55+
$(NATIVE) -g -inline 1000 -linkall -w -a -I +compiler-libs -I bin ocamlcommon.cmxa bin/compiler.mli bin/compiler.ml -o bin/bsc
5656

5757
stdlib:
5858
cd stdlib && ./build.sh
@@ -67,7 +67,7 @@ stdlib:
6767

6868
world:
6969
@echo "Making compiler"
70-
$(NATIVE) -g -inline 100 -linkall -w -a -I +compiler-libs -I bin ocamlcommon.cmxa bin/compiler.mli bin/compiler.ml -o bin/bsc
70+
$(NATIVE) -g -inline 1000 -linkall -w -a -I +compiler-libs -I bin ocamlcommon.cmxa bin/compiler.mli bin/compiler.ml -o bin/bsc
7171
@echo "Making compiler finished"
7272

7373
@echo "Making stdlib cmis"
@@ -103,7 +103,7 @@ TMP_OCAMLLIB=$(shell ocamlopt.opt -where)
103103

104104
big-world:bin/big_compiler.ml bin/big_compiler.mli
105105
@echo "Making compiler"
106-
ocamlopt.opt -g -inline 100 -linkall -w -a -I bin bin/big_compiler.mli bin/big_compiler.ml -o bin/bsc
106+
ocamlopt.opt -g -inline 1000 -linkall -w -a -I bin bin/big_compiler.mli bin/big_compiler.ml -o bin/bsc
107107
@echo "Making compiler finished"
108108

109109
@echo "Making runtime"
@@ -118,7 +118,7 @@ big-world:bin/big_compiler.ml bin/big_compiler.mli
118118
travis-world-test:./bin/ocaml_pack
119119
@echo "Generating the compiler"
120120
rm -f bin/compiler.ml
121-
./bin/ocaml_pack ./compiler.mllib > bin/compiler.ml
121+
./bin/ocaml_pack ./bin/compiler.mllib > bin/compiler.ml
122122
@echo "Generating the compiler finished"
123123
make world-test
124124

Diff for: jscomp/_tags

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
# true: use_ocamlcommon
1+
# <**/*.{ml,mli}> : use_ocamlcommon
22
# true: use_ocamlbytecomp
3-
true: nocmx
3+
<ext>:include
4+
<syntax>:include
5+
<common>:include
46
true: warn(-40)
57
true: debug
68
true: -traverse
7-
<node_modules>: -traverse
9+
<node_modules>: -traverse

0 commit comments

Comments
 (0)