Skip to content

Commit 7850b86

Browse files
committed
for dev version the bsc compiler is called bsc instead of bsc.exe
For CI mode, always do a clean
1 parent 3b1a111 commit 7850b86

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,5 @@ native/
140140
vendor/ocaml
141141
jscomp/.lsp
142142
.vscode/launch.json
143-
tracing*.json
143+
tracing*.json
144+
darwin/bsc

scripts/install.js

+4
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@ function provideCompiler() {
203203

204204
var filePath = path.join(lib_dir, "release.ninja");
205205
fs.writeFileSync(filePath, releaseNinja, "ascii");
206+
cp.execFileSync(ninja_bin_output, ["-f", "release.ninja","-t", "clean"], {
207+
cwd: lib_dir,
208+
stdio: [0, 1, 2]
209+
});
206210
cp.execFileSync(ninja_bin_output, ["-f", "release.ninja"], {
207211
cwd: lib_dir,
208212
stdio: [0, 1, 2]

scripts/ninja.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ function ninjaBuild(outputs, inputs, rule, deps, cwd, overrides) {
407407
var fileOutputs = targetsToString(outputs, cwd);
408408
var fileInputs = targetsToString(inputs, cwd);
409409
var stmt = `build ${fileOutputs} : ${rule} ${fileInputs}`;
410-
// deps.push(pseudoTarget('../lib/bsc.exe'))
410+
// deps.push(pseudoTarget('../lib/bsc'))
411411
if (deps.length > 0) {
412412
var fileDeps = targetsToString(deps, cwd);
413413
stmt += ` | ${fileDeps}`;
@@ -861,7 +861,7 @@ function generateNinja(depsMap, allTargets, cwd, extraDeps = []) {
861861
return build_stmts;
862862
}
863863

864-
var COMPILIER = `../${process.platform}/bsc.exe`;
864+
var COMPILIER = `../${process.platform}/bsc`;
865865
var BSC_COMPILER = `bsc = ${COMPILIER}`;
866866
var compilerTarget = pseudoTarget(COMPILIER);
867867

@@ -1634,7 +1634,7 @@ build common/bs_version.ml : mk_bsversion build_version.js ../package.json
16341634
16351635
build ../${
16361636
process.platform
1637-
}/bsc.exe: link js_parser/js_parser.cmxa stubs/stubs.cmxa ext/ext.cmxa common/common.cmxa syntax/syntax.cmxa depends/depends.cmxa super_errors/super_errors.cmxa outcome_printer/outcome_printer.cmxa core/core.cmxa main/js_main.cmx
1637+
}/bsc: link js_parser/js_parser.cmxa stubs/stubs.cmxa ext/ext.cmxa common/common.cmxa syntax/syntax.cmxa depends/depends.cmxa super_errors/super_errors.cmxa outcome_printer/outcome_printer.cmxa core/core.cmxa main/js_main.cmx
16381638
libs = ocamlcommon.cmxa
16391639
build ../${
16401640
process.platform

0 commit comments

Comments
 (0)