Skip to content

Commit 57a4311

Browse files
bobzhangbobzhang
committed
add bsb -where
1 parent 3197588 commit 57a4311

File tree

6 files changed

+26
-28
lines changed

6 files changed

+26
-28
lines changed

Diff for: ‎bin/bsb

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var delegate_args = process.argv.slice(2)
1313
try {
1414
child_process.execFileSync(bsb_exe, delegate_args, { stdio: 'inherit' })
1515
} catch (e) {
16+
console.log(String(e))
1617
console.error('Error happened when running command', bsb_exe, 'with args', delegate_args)
1718
process.exit(2)
1819
}

Diff for: ‎bin/bsrefmt

100644100755
File mode changed.

Diff for: ‎jscomp/Makefile

+8-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COMPFLAGS=-g -w +6-40-30-23 -warn-error +a-40-30-23 -absname
1818

1919
print-% : ; @echo $* = $($*)
2020

21-
INCLUDES= -I +compiler-libs -I stubs -I ext -I common -I syntax -I depends -I core -I bsb -I ounit -I ounit_tests
21+
INCLUDES= -I +compiler-libs -I stubs -I ext -I common -I syntax -I depends -I core -I bsb -I ounit -I ounit_tests -I super_errors
2222

2323
.mli.cmi:
2424
$(NATIVE) $(INCLUDES) $(COMPFLAGS) -c $<
@@ -326,9 +326,10 @@ SUPER_ERRORS_SRCS=super_warnings super_typecore super_typetexp super_location su
326326

327327
BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))
328328
BSB_CMOS=$(addprefix bsb/, $(addsuffix .cmo, $(BSB_SRCS)))
329+
SUPER_ERRORS_CMXS=$(addprefix super_errors/, $(addsuffix .cmx, $(SUPER_ERRORS_SRCS)))
329330
MAIN_SRCS= jsgen_main jscmj_main bsb/bsb_main bsb/bsb_helper_main
330331
MAIN_CMXS=$(addsuffix .cmx, $(MAIN_SRCS))
331-
SUPER_ERRORS_CMXS=$(addsuffix .cmx, $(SUPER_ERRORS_SRCS))
332+
332333

333334
ounit.cmxa: $(OUNIT_CMXS)
334335
ocamlopt.opt -a $^ -o $@
@@ -348,6 +349,10 @@ bsb.cmxa:$(BSB_CMXS)
348349
ocamlopt.opt -a $^ -o $@
349350
bsb.cma:$(BSB_CMOS)
350351
ocamlc.opt -a $^ -o $@
352+
super.cmxa:$(SUPER_ERRORS_CMXS)
353+
ocamlopt.opt -a $^ -o $@
354+
super.cma:$(SUPER_ERRORS_CMOS)
355+
ocamlc.opt -a $^ -o $@
351356

352357
check: $(EXT_CMXS) $(COMMON_CMXS) $(SYNTAX_CMXS) $(DEPENDS_CMXS) $(CORE_CMXS) $(BSB_CMXS) $(OTHER_CORE_CMXS) $(MAIN_CMXS) $(SUPER_ERRORS_CMXS) $(OUNIT_CMXS) $(OUNIT_TESTS_CMXS)
353358

@@ -357,7 +362,7 @@ bin/bsb.exe: bs_hash.cmxa ext.cmxa common.cmxa bsb.cmxa bsb/bsb_main.cmx
357362
# bin/bsc: ext.cmxa common.cmxa depends.cmxa syntax.cmxa core.cmxa
358363
# $(NATIVE) -g -linkall -I +compiler-libs ocamlcommon.cmxa $^ -o $@
359364

360-
bin/bsc.exe: bs_hash.cmxa ext.cmxa common.cmxa syntax.cmxa depends.cmxa core.cmxa core/js_main.cmx super_errors/super_warnings.cmx super_errors/super_typetexp.cmx super_errors/super_typecore.cmx super_errors/super_location.cmx super_errors/super_main.cmx
365+
bin/bsc.exe: bs_hash.cmxa ext.cmxa common.cmxa syntax.cmxa depends.cmxa core.cmxa super.cmxa core/js_main.cmx
361366
@echo "Linking"
362367
$(NATIVE) -g -linkall -I +compiler-libs ocamlcommon.cmxa $^ -o $@
363368

Diff for: ‎jscomp/all.depend

+12-7
Original file line numberDiff line numberDiff line change
@@ -451,9 +451,10 @@ core/lam_compile_const.cmx : core/lam_compile_util.cmx core/lam.cmx \
451451
syntax/ast_arg.cmx core/lam_compile_const.cmi
452452
core/lam_inner.cmx : core/lam.cmx core/lam_inner.cmi
453453
core/lam_util.cmx : core/lam_stats.cmx core/lam_print.cmx \
454-
core/lam_id_kind.cmx core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx \
455-
ext/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
456-
ext/ext_array.cmx core/lam_util.cmi
454+
core/lam_id_kind.cmx core/lam_analysis.cmx core/lam.cmx \
455+
common/js_config.cmx ext/ident_set.cmx ext/ident_map.cmx \
456+
ext/ident_hashtbl.cmx common/ext_log.cmx ext/ext_list.cmx \
457+
ext/ext_filename.cmx ext/ext_array.cmx core/lam_util.cmi
457458
core/lam_eta_conversion.cmx : ext/literals.cmx core/lam.cmx ext/ext_list.cmx \
458459
ext/ext_ident.cmx core/lam_eta_conversion.cmi
459460
core/lam_group.cmx : core/lam_print.cmx core/lam.cmx core/lam_group.cmi
@@ -516,7 +517,9 @@ core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
516517
core/js_exp_make.cmx common/js_config.cmx core/js_closure.cmx core/j.cmx \
517518
ext/ident_set.cmx ext/ext_string.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx \
518519
ext/ext_list.cmx ext/ext_ident.cmx common/bs_version.cmx core/js_dump.cmi
519-
core/js_pass_debug.cmx : core/j.cmx core/js_pass_debug.cmi
520+
core/js_pass_debug.cmx : core/js_dump.cmx common/js_config.cmx core/j.cmx \
521+
ext/ext_pervasives.cmx common/ext_log.cmx ext/ext_filename.cmx \
522+
core/js_pass_debug.cmi
520523
core/js_of_lam_option.cmx : core/js_exp_make.cmx common/js_config.cmx \
521524
core/js_analyzer.cmx core/j.cmx core/js_of_lam_option.cmi
522525
core/js_output.cmx : core/lam_compile_defs.cmx core/lam_analysis.cmx \
@@ -582,7 +585,8 @@ core/lam_pass_eliminate_ref.cmx : core/lam.cmx ext/ident_set.cmx \
582585
core/lam_pass_lets_dce.cmx : core/lam_util.cmx \
583586
core/lam_pass_eliminate_ref.cmx core/lam_pass_count.cmx \
584587
core/lam_beta_reduce.cmx core/lam_analysis.cmx core/lam.cmx \
585-
ext/ident_hashtbl.cmx ext/ext_list.cmx core/lam_pass_lets_dce.cmi
588+
ext/ident_hashtbl.cmx common/ext_log.cmx ext/ext_list.cmx \
589+
core/lam_pass_lets_dce.cmi
586590
core/lam_pass_remove_alias.cmx : core/lam_util.cmx core/lam_stats.cmx \
587591
core/lam_inline_util.cmx core/lam_compile_env.cmx core/lam_closure.cmx \
588592
core/lam_beta_reduce.cmx core/lam_analysis.cmx core/lam.cmx \
@@ -605,8 +609,9 @@ core/lam_compile_group.cmx : core/lam_util.cmx core/lam_stats_export.cmx \
605609
core/js_pass_flatten.cmx core/js_pass_debug.cmx core/js_output.cmx \
606610
core/js_fold_basic.cmx core/js_exp_make.cmx core/js_dump.cmx \
607611
common/js_config.cmx core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx \
608-
ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_list.cmx \
609-
ext/ext_ident.cmx ext/ext_filename.cmx core/lam_compile_group.cmi
612+
ext/ext_string.cmx ext/ext_pervasives.cmx common/ext_log.cmx \
613+
ext/ext_list.cmx ext/ext_ident.cmx ext/ext_filename.cmx \
614+
core/lam_compile_group.cmi
610615
core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
611616
core/lam_compile_group.cmx core/lam_compile_env.cmx common/js_config.cmx \
612617
ext/ext_pervasives.cmx common/ext_log.cmx syntax/bs_ast_invariant.cmx \

Diff for: ‎jscomp/bsb/bsb_main.ml

+5-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ let bsb_main_flags : (string * Arg.spec * string) list=
6666
"-query", Arg.String (fun s -> Bsb_query.query ~cwd ~bsc_dir s ),
6767
" (internal)Query metadata about the build";
6868
"-themes", Arg.Unit Bsb_init.list_themes,
69-
" List all available themes"
69+
" List all available themes";
70+
"-where",
71+
Arg.Unit (fun _ ->
72+
print_endline (Filename.dirname Sys.executable_name)),
73+
" Show where bsb.exe is located"
7074
]
7175

7276

Diff for: ‎scripts/install.js

-17
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,6 @@ if (fs.existsSync(ninja_bin_output) && test_ninja_compatible (ninja_bin_output))
7878
console.log('ninja binary is ready: ', ninja_bin_output)
7979
}
8080
}
81-
// if (!test_ninja_compatible(ninja_bin_output)) {
82-
// if(is_windows){
83-
// fs.rename(path.join(ninja_vendor_dir,'ninja.win'),ninja_bin_output)
84-
// } else if(os_type==='Darwin'){
85-
// fs.renameSync(path.join(ninja_vendor_dir,'ninja.darwin'),ninja_bin_output)
86-
// } else if (os_type === 'Linux' && os_arch === 'x64'){
87-
// var binary = path.join(ninja_vendor_dir,'ninja.linux64');
88-
// if (test_ninja_compatible(binary)) {
89-
// fs.renameSync(binary, ninja_bin_output)
90-
// } else {
91-
// console.log('On linux, but the ninja linux binary is incompatible.');
92-
// build_ninja()
93-
// }
94-
// } else {
95-
// build_ninja()
96-
// }
97-
// }
9881

9982

10083
function non_windows_npm_release() {

0 commit comments

Comments
 (0)