Skip to content

clean up: branch bs.obj logic handling as early as we can #1076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 13, 2017
Merged

clean up: branch bs.obj logic handling as early as we can #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e558bd
clean up: branch bs.obj logic handling as early as we can
bobzhang Jan 12, 2017
3e23a8d
fix optionals with/without bs.obj
bobzhang Jan 12, 2017
3e2213b
final clean up
bobzhang Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions jscomp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ OUNIT_TESTS_SRCS = ounit_tests_util \
ounit_sexp_tests\
ounit_int_vec_tests\
ounit_ident_mask_tests\
ounit_cmd_util\
ounit_cmd_tests\
ounit_ffi_error_debug_test\
ounit_tests_main
OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))

Expand Down
23 changes: 15 additions & 8 deletions jscomp/all.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ syntax/ast_ffi_types.cmx : ext/ext_string.cmx ext/ext_pervasives.cmx \
common/bs_version.cmx syntax/ast_core_type.cmx syntax/ast_ffi_types.cmi
syntax/ast_external_attributes.cmx : common/lam_methname.cmx \
ext/ext_string.cmx ext/ext_pervasives.cmx common/bs_warnings.cmx \
common/bs_loc.cmx syntax/ast_payload.cmx syntax/ast_ffi_types.cmx \
syntax/ast_core_type.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
syntax/ast_external_attributes.cmi
common/bs_loc.cmx syntax/ast_payload.cmx syntax/ast_literal.cmx \
syntax/ast_ffi_types.cmx syntax/ast_core_type.cmx syntax/ast_comb.cmx \
syntax/ast_attributes.cmx syntax/ast_external_attributes.cmi
syntax/ast_util.cmx : ext/literals.cmx ext/ext_list.cmx \
syntax/ast_payload.cmx syntax/ast_pat.cmx syntax/ast_literal.cmx \
syntax/ast_external_attributes.cmx syntax/ast_external.cmx \
Expand Down Expand Up @@ -582,6 +582,7 @@ ounit/oUnitLogger.cmx : ounit/oUnitUtils.cmx ounit/oUnitTypes.cmx
ounit/oUnitTypes.cmx :
ounit/oUnitUtils.cmx : ounit/oUnitTypes.cmx
ounit/oUnitChooser.cmx : ounit/oUnitTypes.cmx
ounit_tests/ounit_cmd_util.cmi :
ounit_tests/ounit_tests_main.cmi :
ounit_tests/ounit_tests_util.cmx :
ounit_tests/ounit_array_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx \
Expand Down Expand Up @@ -616,8 +617,12 @@ ounit_tests/ounit_int_vec_tests.cmx : ounit/oUnit.cmx ext/int_vec_util.cmx \
ext/int_vec.cmx
ounit_tests/ounit_ident_mask_tests.cmx : ounit/oUnit.cmx \
ext/hash_set_ident_mask.cmx
ounit_tests/ounit_cmd_tests.cmx : ounit/oUnit.cmx ext/literals.cmx \
ext/ext_string.cmx
ounit_tests/ounit_cmd_util.cmx : ext/literals.cmx \
ounit_tests/ounit_cmd_util.cmi
ounit_tests/ounit_cmd_tests.cmx : ounit_tests/ounit_cmd_util.cmx \
ounit/oUnit.cmx ext/literals.cmx ext/ext_string.cmx
ounit_tests/ounit_ffi_error_debug_test.cmx : ounit_tests/ounit_cmd_util.cmx \
ounit/oUnit.cmx ext/ext_string.cmx
ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
ounit_tests/ounit_vec_test.cmx ounit_tests/ounit_union_find_tests.cmx \
ounit_tests/ounit_topsort_tests.cmx ounit_tests/ounit_string_tests.cmx \
Expand All @@ -628,9 +633,11 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
ounit_tests/ounit_json_tests.cmx ounit_tests/ounit_int_vec_tests.cmx \
ounit_tests/ounit_ident_mask_tests.cmx \
ounit_tests/ounit_hashtbl_tests.cmx ounit_tests/ounit_hash_stubs_test.cmx \
ounit_tests/ounit_hash_set_tests.cmx ounit_tests/ounit_cmd_tests.cmx \
ounit_tests/ounit_bal_tree_tests.cmx ounit_tests/ounit_array_tests.cmx \
ounit/oUnit.cmx ounit_tests/ounit_tests_main.cmi
ounit_tests/ounit_hash_set_tests.cmx \
ounit_tests/ounit_ffi_error_debug_test.cmx \
ounit_tests/ounit_cmd_tests.cmx ounit_tests/ounit_bal_tree_tests.cmx \
ounit_tests/ounit_array_tests.cmx ounit/oUnit.cmx \
ounit_tests/ounit_tests_main.cmi
bsb/bsb_build_schemas.cmx :
bsb/bsb_build_ui.cmx : ext/string_vec.cmx ext/string_set.cmx \
ext/string_map.cmx ext/ext_string.cmx ext/ext_json.cmx \
Expand Down
3 changes: 3 additions & 0 deletions jscomp/bin/all_ounit_tests.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ bin/all_ounit_tests.ml : ext/set_poly.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_bal_tree_tests.ml
bin/all_ounit_tests.ml : ext/literals.ml
bin/all_ounit_tests.ml : ext/literals.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_cmd_util.ml
bin/all_ounit_tests.ml : ounit_tests/ounit_cmd_util.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_cmd_tests.ml
bin/all_ounit_tests.ml : ounit_tests/ounit_ffi_error_debug_test.ml
bin/all_ounit_tests.ml : ext/ext_util.ml
bin/all_ounit_tests.ml : ext/ext_util.mli
bin/all_ounit_tests.ml : ext/hash_set_gen.ml
Expand Down
Loading