Skip to content

Commit 00844d0

Browse files
committed
simplify package name handling, remove google package support
1 parent bcb383d commit 00844d0

14 files changed

+194
-279
lines changed

jscomp/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ CORE_SRCS= js_runtime_modules \
307307
lam_pass_lets_dce \
308308
lam_pass_remove_alias \
309309
lam_coercion \
310-
lam_compile_group\
310+
lam_compile_main\
311311
js_implementation ocaml_batch_compile
312312
CORE_CMXS=$(addprefix core/, $(addsuffix .cmx, $(CORE_SRCS)))
313313

jscomp/all.depend

+11-10
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ core/lam_pass_lets_dce.cmi : core/lam.cmi
365365
core/lam_pass_remove_alias.cmi : core/lam_stats.cmi core/lam.cmi
366366
core/lam_coercion.cmi : core/lam_stats.cmi core/lam_group.cmi core/lam.cmi \
367367
ext/ident_set.cmi ext/ident_map.cmi
368-
core/lam_compile_group.cmi : core/j.cmx
368+
core/lam_compile_main.cmi : core/j.cmx
369369
core/js_implementation.cmi :
370370
core/ocaml_batch_compile.cmi :
371371
core/js_runtime_modules.cmx :
@@ -619,7 +619,7 @@ core/lam_coercion.cmx : ext/string_hash_set.cmx core/lam_util.cmx \
619619
core/lam_stats_util.cmx core/lam_stats.cmx core/lam_group.cmx \
620620
core/lam_dce.cmx core/lam.cmx ext/ident_set.cmx ext/ident_map.cmx \
621621
ext/ident_hashtbl.cmx depends/bs_exception.cmx core/lam_coercion.cmi
622-
core/lam_compile_group.cmx : ext/literals.cmx core/lam_util.cmx \
622+
core/lam_compile_main.cmx : ext/literals.cmx core/lam_util.cmx \
623623
core/lam_stats_export.cmx core/lam_stats.cmx \
624624
core/lam_pass_remove_alias.cmx core/lam_pass_lets_dce.cmx \
625625
core/lam_pass_exits.cmx core/lam_pass_deep_flatten.cmx \
@@ -630,14 +630,15 @@ core/lam_compile_group.cmx : ext/literals.cmx core/lam_util.cmx \
630630
core/js_shake.cmx core/js_runtime_modules.cmx \
631631
core/js_pass_tailcall_inline.cmx core/js_pass_scope.cmx \
632632
core/js_pass_flatten_and_mark_dead.cmx core/js_pass_flatten.cmx \
633-
core/js_pass_debug.cmx core/js_packages_state.cmx core/js_output.cmx \
634-
core/js_fold_basic.cmx core/js_exp_make.cmx core/js_dump_program.cmx \
635-
common/js_config.cmx core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx \
636-
ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
637-
common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
638-
ext/ext_filename.cmx core/lam_compile_group.cmi
633+
core/js_pass_debug.cmx core/js_packages_state.cmx \
634+
core/js_packages_info.cmx core/js_output.cmx core/js_fold_basic.cmx \
635+
core/js_exp_make.cmx core/js_dump_program.cmx common/js_config.cmx \
636+
core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx ext/ext_string.cmx \
637+
ext/ext_pervasives.cmx ext/ext_namespace.cmx common/ext_log.cmx \
638+
ext/ext_list.cmx ext/ext_ident.cmx ext/ext_filename.cmx \
639+
core/lam_compile_main.cmi
639640
core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
640-
core/lam_compile_group.cmx core/lam_compile_env.cmx common/js_config.cmx \
641+
core/lam_compile_main.cmx core/lam_compile_env.cmx common/js_config.cmx \
641642
ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
642643
common/ext_log.cmx ext/ext_io.cmx syntax/bs_ast_invariant.cmx \
643644
depends/binary_ast.cmx core/js_implementation.cmi
@@ -655,7 +656,7 @@ core/bsppx_main.cmx : syntax/ppx_entry.cmx
655656
core/bspack_main.cmx : ext/string_set.cmx ext/string_hashtbl.cmx \
656657
ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_list.cmx ext/ext_io.cmx \
657658
ext/ext_filename.cmx depends/ast_extract.cmx core/bspack_main.cmi
658-
core/jsoo_main.cmx : syntax/ppx_entry.cmx core/lam_compile_group.cmx \
659+
core/jsoo_main.cmx : syntax/ppx_entry.cmx core/lam_compile_main.cmx \
659660
core/lam_compile_env.cmx core/js_dump_program.cmx ext/ext_pp.cmx \
660661
common/bs_version.cmx core/bs_conditional_initial.cmx core/jsoo_main.cmi
661662
core/bspp_main.cmx : core/bspp_main.cmi

0 commit comments

Comments
 (0)