Skip to content

Commit 98f8fad

Browse files
committedNov 2, 2016
change bucklescript build system to make
the first release of bsb.exe (only for internal use yet), need more cleaning up
1 parent 03e8483 commit 98f8fad

File tree

265 files changed

+14190
-11997
lines changed

Some content is hidden

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

265 files changed

+14190
-11997
lines changed
 

Diff for: ‎.gitignore

+3-13
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,8 @@ ocaml_src
6161
# for npm publish
6262
!bin/bsc.exe
6363
!bin/bsppx
64-
!bin/ocaml
65-
!bin/ocamldep
66-
!bin/ocamldep.opt
67-
!bin/ocamlyacc
68-
!bin/ocamllex.opt
69-
!bin/ocamllex
70-
!bin/ocamlobjinfo
71-
!bin/ocamlopt
72-
!bin/ocamlopt.opt
73-
!bin/ocamlrun
74-
!bin/ocamlc
75-
!bin/ocamlc.opt
7664
!bin/bspack
65+
!/bin/bsb
7766
!ocaml.tar.gz
7867

7968
#ninja
@@ -84,4 +73,5 @@ ocaml_src
8473
*.d
8574
.bsbuild
8675
jscomp/bin/bsb
87-
jscomp/bin/bsc
76+
jscomp/bin/bsc
77+
jscomp/bin/config_whole_compiler.ml

Diff for: ‎bsconfig.json

+7-18
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,27 @@
33
"version": "1.2.2",
44
"ocaml-config" :
55
{
6-
"bsdep" : "jscomp/bin/bsdep.exe",
7-
"bsc" : "jscomp/bin/bsc.exe",
86
"bs-external-includes" : [
97
"jscomp/runtime",
108
"jscomp/stdlib",
119
"jscomp/others"
1210
],
13-
14-
1511
"bsc-flags" :
1612
[
1713
"-w", "-40", "-bs-no-version-header", "-bs-cross-module-opt"
1814
],
19-
"bs-copy-or-symlink" :
20-
// for out of source build, on Unix will do a symlink
21-
// on windows will copy
22-
[
23-
"jscomp/test/flow_parser_sample.js",
24-
"jscomp/test/joinClasses.js"
25-
]
26-
,
27-
// so the design is this way
28-
// if we find
29-
// "files" : [
30-
// ]
31-
// we will update it *before* spitting out build.ninja
32-
3315
"sources" :
3416
[
3517

3618
{
3719
"dir" : "jscomp/test/" ,
20+
"resources" :
21+
[
22+
"flow_parser_sample.js",
23+
"joinClasses.js"
24+
]
25+
,
26+
3827
"subdirs": [
3928
{
4029
"dir": "acyc",

0 commit comments

Comments
 (0)