Skip to content

Commit af09b16

Browse files
committed
rebase changes of 8.3.1
1 parent 3ceb988 commit af09b16

File tree

6 files changed

+18
-15
lines changed

6 files changed

+18
-15
lines changed

.npmignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,6 @@ package/
3838
.nyc_output/
3939
themes
4040
vendor/js_of_ocaml.bc
41-
syntax/
41+
syntax/
42+
*.log
43+
ninja

Changes.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
`*` means potential break changes
22

3+
# 8.3.1
4+
This is a minor bug fix release for 8.3.0
5+
- capture warnings when rebuild without enforce warn-as-error
6+
- #4716 internal, make ninja a submodule in dev process
7+
- #4722 better dataflow for cases like `let {a;b} as obj = ...`
8+
- no need call `caml_enter_blocking_section` for single threaded compiler
9+
- #4739 fix the interaction of exotic filenames like `[id]` with the build system.
10+
311
# 8.3
412

513
- #4694, #4712 improving/customizing the underlying ninja build system, better performance

darwin/ninja.exe

0 Bytes
Binary file not shown.

jscomp/artifacts.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@
198198
"map.js",
199199
"marshal.js",
200200
"moreLabels.js",
201-
"nativeint.js",
202201
"node_buffer.js",
203202
"node_child_process.js",
204203
"node_fs.js",
@@ -364,7 +363,6 @@
364363
"map.js",
365364
"marshal.js",
366365
"moreLabels.js",
367-
"nativeint.js",
368366
"node_buffer.js",
369367
"node_child_process.js",
370368
"node_fs.js",
@@ -488,7 +486,6 @@
488486
"map.cmi",
489487
"marshal.cmi",
490488
"moreLabels.cmi",
491-
"nativeint.cmi",
492489
"node_buffer.cmi",
493490
"node_child_process.cmi",
494491
"node_fs.cmi",
@@ -619,7 +616,6 @@
619616
"map.cmt",
620617
"marshal.cmt",
621618
"moreLabels.cmt",
622-
"nativeint.cmt",
623619
"node_buffer.cmt",
624620
"node_child_process.cmt",
625621
"node_fs.cmt",
@@ -724,7 +720,6 @@
724720
"map.cmti",
725721
"marshal.cmti",
726722
"moreLabels.cmti",
727-
"nativeint.cmti",
728723
"node_process.cmti",
729724
"obj.cmti",
730725
"parsing.cmti",
@@ -857,7 +852,6 @@
857852
"mapm.cppo.ml",
858853
"marshal.ml",
859854
"moreLabels.ml",
860-
"nativeint.ml",
861855
"node_buffer.ml",
862856
"node_child_process.ml",
863857
"node_fs.ml",
@@ -969,7 +963,6 @@
969963
"mapm.cppo.mli",
970964
"marshal.mli",
971965
"moreLabels.mli",
972-
"nativeint.mli",
973966
"node_process.mli",
974967
"obj.mli",
975968
"parsing.mli",

scripts/prebuilt.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ if (!is_windows) {
5252
function createOCamlTar() {
5353
if (process.platform === hostPlatform) {
5454
require("./installUtils.js").install();
55-
console.log(`status in ocaml submodule:`)
55+
console.log(`status in ocaml submodule:`);
5656
cp.execSync(`git -C ocaml status -uno`, { cwd: root, stdio: [0, 1, 2] });
5757
cp.execSync(
5858
`git -C ocaml archive --format=tar.gz HEAD -o ../vendor/ocaml.tar.gz`,
5959
{ cwd: root, stdio: [0, 1, 2] }
6060
);
61+
console.log(`status in ninja submodule:`);
62+
cp.execSync(`git -C ninja status -uno`, { cwd: root, stdio: [0, 1, 2] });
63+
cp.execSync(
64+
`git -C ninja archive --format=tar.gz HEAD -o ../vendor/ninja.tar.gz`,
65+
{ cwd: root, stdio: [0, 1, 2] }
66+
);
6167
}
62-
console.log(`status in ninja submodule:`)
63-
cp.execSync(`git -C ninja status -uno`, { cwd: root, stdio: [0, 1, 2] });
64-
cp.execSync(
65-
`git -C ninja archive --format=tar.gz HEAD -o ../vendor/ninja.tar.gz`,
66-
{ cwd: root, stdio: [0, 1, 2] }
67-
);
6868
}
6969

7070
createOCamlTar();

win32/ninja.exe

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)