simplify path name handling, add more tests for es6 global module, vendor rollup for testing

Author: bobzhang

jscomp/Makefile

@@ -218,7 +218,9 @@ EXT_SRCS = 	literals \
 	hash_set_poly\
 	ident_hashtbl\
 	int_hashtbl\
+	ext_path\
 	ext_filename\
+	ext_modulename\
 	ext_namespace
 
 EXT_CMXS=$(addprefix ext/, $(addsuffix .cmx, $(EXT_SRCS)))

jscomp/all.depend

@@ -89,8 +89,11 @@ ext/ident_hashtbl.cmx : ext/hashtbl_gen.cmx ext/ext_ident.cmx \
     stubs/bs_hash_stubs.cmx ext/ident_hashtbl.cmi
 ext/int_hashtbl.cmx : ext/hashtbl_gen.cmx ext/ext_int.cmx \
     stubs/bs_hash_stubs.cmx ext/int_hashtbl.cmi
+ext/ext_path.cmx : ext/literals.cmx ext/ext_string.cmx \
+    ext/ext_pervasives.cmx ext/ext_path.cmi
 ext/ext_filename.cmx : ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_pervasives.cmx ext/ext_filename.cmi
+    ext/ext_pervasives.cmx ext/ext_path.cmx ext/ext_filename.cmi
+ext/ext_modulename.cmx : ext/ext_path.cmx ext/ext_modulename.cmi
 ext/ext_namespace.cmx : ext/literals.cmx ext/ext_namespace.cmi
 ext/literals.cmi :
 ext/ext_util.cmi :
@@ -151,7 +154,9 @@ ext/ident_hash_set.cmi : ext/hash_set_gen.cmx
 ext/hash_set_poly.cmi :
 ext/ident_hashtbl.cmi : ext/hashtbl_gen.cmx
 ext/int_hashtbl.cmi : ext/hashtbl_gen.cmx
+ext/ext_path.cmi :
 ext/ext_filename.cmi :
+ext/ext_modulename.cmi :
 ext/ext_namespace.cmi :
 common/bs_version.cmx : common/bs_version.cmi
 common/js_config.cmx : common/js_config.cmi
@@ -261,8 +266,8 @@ depends/binary_ast.cmi : common/ml_binary.cmi
 depends/bs_exception.cmx : depends/bs_exception.cmi
 depends/ast_extract.cmx : ext/string_map.cmx ext/string_hashtbl.cmx \
     common/ml_binary.cmx common/js_config.cmx ext/ext_string.cmx \
-    ext/ext_list.cmx ext/ext_format.cmx ext/ext_filename.cmx \
-    depends/bs_exception.cmx depends/ast_extract.cmi
+    ext/ext_path.cmx ext/ext_modulename.cmx ext/ext_list.cmx \
+    ext/ext_format.cmx depends/bs_exception.cmx depends/ast_extract.cmi
 depends/binary_ast.cmx : common/ml_binary.cmx depends/ast_extract.cmx \
     depends/binary_ast.cmi
 core/config_util.cmi :
@@ -371,9 +376,9 @@ core/ocaml_batch_compile.cmi :
 core/js_runtime_modules.cmx :
 core/config_util.cmx : core/config_util.cmi
 core/js_packages_info.cmx : core/lam_module_ident.cmx ext/ext_sys.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
-    ext/ext_filename.cmx core/config_util.cmx depends/bs_exception.cmx \
-    core/js_packages_info.cmi
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_path.cmx \
+    ext/ext_namespace.cmx ext/ext_filename.cmx core/config_util.cmx \
+    depends/bs_exception.cmx core/js_packages_info.cmi
 core/js_packages_state.cmx : core/js_packages_info.cmx \
     ext/ext_pervasives.cmx ext/ext_namespace.cmx core/js_packages_state.cmi
 core/type_int_to_string.cmx :
@@ -466,8 +471,8 @@ core/lam_inner.cmx : core/lam.cmx core/lam_inner.cmi
 core/lam_util.cmx : core/lam_stats.cmx core/lam_print.cmx \
     core/lam_id_kind.cmx core/lam_analysis.cmx core/lam.cmx \
     common/js_config.cmx ext/ident_set.cmx ext/ident_map.cmx \
-    ext/ident_hashtbl.cmx common/ext_log.cmx ext/ext_list.cmx \
-    ext/ext_filename.cmx ext/ext_array.cmx core/lam_util.cmi
+    ext/ident_hashtbl.cmx ext/ext_path.cmx common/ext_log.cmx \
+    ext/ext_list.cmx ext/ext_array.cmx core/lam_util.cmi
 core/lam_eta_conversion.cmx : ext/literals.cmx core/lam.cmx ext/ext_list.cmx \
     ext/ext_ident.cmx core/lam_eta_conversion.cmi
 core/lam_group.cmx : core/lam_print.cmx core/lam.cmx core/lam_group.cmi
@@ -510,9 +515,9 @@ core/lam_stats_export.cmx : ext/string_map.cmx core/lam_stats_util.cmx \
     core/lam_arity.cmx core/lam_analysis.cmx core/lam.cmx \
     core/js_packages_state.cmx common/js_config.cmx core/js_cmj_format.cmx \
     ext/ident_set.cmx ext/ident_map.cmx ext/ident_hashtbl.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_option.cmx \
-    common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
-    ext/ext_filename.cmx ext/ext_array.cmx core/lam_stats_export.cmi
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_path.cmx \
+    ext/ext_option.cmx common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
+    ext/ext_array.cmx core/lam_stats_export.cmi
 core/lam_pass_alpha_conversion.cmx : core/lam_stats_util.cmx \
     core/lam_stats.cmx core/lam_eta_conversion.cmx core/lam.cmx \
     ext/ext_list.cmx core/lam_pass_alpha_conversion.cmi
@@ -540,7 +545,7 @@ core/js_dump_program.cmx : core/lam_module_ident.cmx \
     core/j.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx common/bs_version.cmx \
     core/js_dump_program.cmi
 core/js_pass_debug.cmx : core/js_dump_program.cmx common/js_config.cmx \
-    core/j.cmx ext/ext_pervasives.cmx common/ext_log.cmx ext/ext_filename.cmx \
+    core/j.cmx ext/ext_pervasives.cmx ext/ext_path.cmx common/ext_log.cmx \
     core/js_pass_debug.cmi
 core/js_of_lam_option.cmx : core/js_runtime_modules.cmx core/js_exp_make.cmx \
     core/js_analyzer.cmx core/j.cmx core/js_of_lam_option.cmi
@@ -634,18 +639,18 @@ core/lam_compile_main.cmx : ext/literals.cmx core/lam_util.cmx \
     core/js_packages_info.cmx core/js_output.cmx core/js_fold_basic.cmx \
     core/js_exp_make.cmx core/js_dump_program.cmx common/js_config.cmx \
     core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx ext/ext_string.cmx \
-    ext/ext_pervasives.cmx ext/ext_namespace.cmx common/ext_log.cmx \
-    ext/ext_list.cmx ext/ext_ident.cmx ext/ext_filename.cmx \
-    core/lam_compile_main.cmi
+    ext/ext_pervasives.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
+    common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
+    ext/ext_filename.cmx core/lam_compile_main.cmi
 core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
     core/lam_compile_main.cmx core/lam_compile_env.cmx common/js_config.cmx \
     ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \
     common/ext_log.cmx ext/ext_io.cmx syntax/bs_ast_invariant.cmx \
     depends/binary_ast.cmx core/js_implementation.cmi
 core/ocaml_batch_compile.cmx : core/ocaml_parse.cmx \
     core/js_implementation.cmx common/js_config.cmx ext/ext_ref.cmx \
-    ext/ext_pervasives.cmx ext/ext_namespace.cmx ext/ext_format.cmx \
-    ext/ext_filename.cmx depends/bs_exception.cmx depends/ast_extract.cmx \
+    ext/ext_pervasives.cmx ext/ext_namespace.cmx ext/ext_modulename.cmx \
+    ext/ext_format.cmx depends/bs_exception.cmx depends/ast_extract.cmx \
     core/ocaml_batch_compile.cmi
 core/bspack_main.cmi :
 core/jsoo_main.cmi :
@@ -654,8 +659,9 @@ core/js_cmi_datasets.cmi : ext/string_map.cmi
 core/js_main.cmi :
 core/bsppx_main.cmx : syntax/ppx_entry.cmx
 core/bspack_main.cmx : ext/string_set.cmx ext/string_hashtbl.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_list.cmx ext/ext_io.cmx \
-    ext/ext_filename.cmx depends/ast_extract.cmx core/bspack_main.cmi
+    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_path.cmx \
+    ext/ext_list.cmx ext/ext_io.cmx depends/ast_extract.cmx \
+    core/bspack_main.cmi
 core/jsoo_main.cmx : syntax/ppx_entry.cmx core/lam_compile_main.cmx \
     core/lam_compile_env.cmx core/js_dump_program.cmx ext/ext_pp.cmx \
     common/bs_version.cmx core/bs_conditional_initial.cmx core/jsoo_main.cmi
@@ -706,7 +712,7 @@ ounit_tests/ounit_list_test.cmx : ounit/oUnit.cmx ext/ext_list.cmx
 ounit_tests/ounit_bal_tree_tests.cmx : ext/set_poly.cmx ext/set_int.cmx \
     ext/set_gen.cmx ounit_tests/ounit_tests_util.cmx ounit/oUnit.cmx
 ounit_tests/ounit_path_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx \
-    ext/ext_filename.cmx
+    ext/ext_path.cmx
 ounit_tests/ounit_union_find_tests.cmx : ext/union_find.cmx ounit/oUnit.cmx \
     ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_string.cmx
 ounit_tests/ounit_hash_stubs_test.cmx : ounit_tests/ounit_tests_util.cmx \
@@ -769,19 +775,20 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
     ounit/oUnit.cmx ounit_tests/ounit_tests_main.cmi
 bsb/bsb_bsdeps.cmx : common/bs_version.cmx bsb/bsb_bsdeps.cmi
 bsb/bsb_build_cache.cmx : ext/string_map.cmx ext/ext_string.cmx \
-    ext/ext_pervasives.cmx ext/ext_filename.cmx bsb/bsb_build_cache.cmi
+    ext/ext_pervasives.cmx ext/ext_path.cmx ext/ext_modulename.cmx \
+    bsb/bsb_build_cache.cmi
 bsb/bsb_build_schemas.cmx :
 bsb/bsb_build_util.cmx : ext/string_map.cmx ext/string_hashtbl.cmx \
-    ext/literals.cmx ext/ext_sys.cmx ext/ext_string.cmx ext/ext_list.cmx \
-    ext/ext_json_types.cmx ext/ext_json_parse.cmx ext/ext_json.cmx \
-    ext/ext_filename.cmx ext/ext_array.cmx bsb/bsb_pkg.cmx \
-    bsb/bsb_exception.cmx bsb/bsb_build_schemas.cmx bsb/bsb_build_util.cmi
-bsb/bsb_clean.cmx : ext/ext_filename.cmx bsb/bsb_unix.cmx bsb/bsb_config.cmx \
+    ext/literals.cmx ext/ext_sys.cmx ext/ext_string.cmx ext/ext_path.cmx \
+    ext/ext_list.cmx ext/ext_json_types.cmx ext/ext_json_parse.cmx \
+    ext/ext_json.cmx ext/ext_array.cmx bsb/bsb_pkg.cmx bsb/bsb_exception.cmx \
+    bsb/bsb_build_schemas.cmx bsb/bsb_build_util.cmi
+bsb/bsb_clean.cmx : ext/ext_path.cmx bsb/bsb_unix.cmx bsb/bsb_config.cmx \
     bsb/bsb_build_util.cmx bsb/bsb_clean.cmi
-bsb/bsb_config.cmx : ext/ext_filename.cmx bsb/bsb_config.cmi
+bsb/bsb_config.cmx : ext/ext_path.cmx bsb/bsb_config.cmi
 bsb/bsb_config_parse.cmx : ext/string_map.cmx ext/string_hash_set.cmx \
-    ext/literals.cmx ext/ext_namespace.cmx ext/ext_json_types.cmx \
-    ext/ext_json_parse.cmx ext/ext_json.cmx ext/ext_filename.cmx \
+    ext/literals.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
+    ext/ext_json_types.cmx ext/ext_json_parse.cmx ext/ext_json.cmx \
     ext/ext_file_pp.cmx ext/ext_array.cmx bsb/bsb_watcher_gen.cmx \
     bsb/bsb_pkg.cmx bsb/bsb_parse_sources.cmx bsb/bsb_package_specs.cmx \
     bsb/bsb_exception.cmx bsb/bsb_dir_index.cmx bsb/bsb_default.cmx \
@@ -802,63 +809,64 @@ bsb/bsb_helper_dep_graph.cmx : ext/string_set.cmx ext/string_map.cmx \
 bsb/bsb_helper_extract.cmx : ext/string_set.cmx ext/ext_string.cmx \
     bsb/bsb_helper_extract.cmi
 bsb/bsb_helper_linker.cmx : ext/string_map.cmx ext/literals.cmx \
-    ext/ext_filename.cmx bsb/bsb_helper_extract.cmx \
+    ext/ext_path.cmx ext/ext_modulename.cmx bsb/bsb_helper_extract.cmx \
     bsb/bsb_helper_dep_graph.cmx bsb/bsb_helper_linker.cmi
-bsb/bsb_helper_main.cmx : ext/ext_filename.cmx bsb/bsb_helper_packer.cmx \
+bsb/bsb_helper_main.cmx : ext/ext_path.cmx bsb/bsb_helper_packer.cmx \
     bsb/bsb_helper_linker.cmx bsb/bsb_dir_index.cmx bsb/bsb_depfile_gen.cmx \
     bsb/bsb_helper_main.cmi
 bsb/bsb_helper_packer.cmx : ext/string_set.cmx ext/string_map.cmx \
-    ext/literals.cmx ext/ext_filename.cmx bsb/bsb_helper_extract.cmx \
-    bsb/bsb_helper_dep_graph.cmx bsb/bsb_helper_packer.cmi
+    ext/literals.cmx ext/ext_path.cmx ext/ext_modulename.cmx \
+    bsb/bsb_helper_extract.cmx bsb/bsb_helper_dep_graph.cmx \
+    bsb/bsb_helper_packer.cmi
 bsb/bsb_init.cmx : ext/string_hashtbl.cmx bsb/oCamlRes.cmx \
     ext/ext_string.cmx ext/ext_io.cmx bsb/bsb_templates.cmx bsb/bsb_regex.cmx \
     common/bs_version.cmx bsb/bsb_init.cmi
 bsb/bsb_log.cmx : ext/ext_string.cmx ext/ext_color.cmx bsb/bsb_log.cmi
-bsb/bsb_main.cmx : ext/ext_sys.cmx ext/ext_string.cmx ext/ext_filename.cmx \
+bsb/bsb_main.cmx : ext/ext_sys.cmx ext/ext_string.cmx ext/ext_path.cmx \
     ext/ext_array.cmx bsb/bsb_world.cmx bsb/bsb_query.cmx \
     bsb/bsb_ninja_regen.cmx bsb/bsb_log.cmx bsb/bsb_init.cmx \
     bsb/bsb_config.cmx bsb/bsb_clean.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_main.cmi
 bsb/bsb_merlin_gen.cmx : ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_filename.cmx bsb/bsb_parse_sources.cmx bsb/bsb_config_types.cmx \
+    ext/ext_path.cmx bsb/bsb_parse_sources.cmx bsb/bsb_config_types.cmx \
     bsb/bsb_config.cmx bsb/bsb_merlin_gen.cmi
 bsb/bsb_ninja_file_groups.cmx : ext/string_set.cmx ext/string_map.cmx \
     ext/string_hash_set.cmx ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_pervasives.cmx ext/ext_namespace.cmx ext/ext_filename.cmx \
+    ext/ext_pervasives.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
     bsb/bsb_rule.cmx bsb/bsb_parse_sources.cmx bsb/bsb_package_specs.cmx \
     bsb/bsb_ninja_util.cmx bsb/bsb_ninja_global_vars.cmx \
     bsb/bsb_dir_index.cmx bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx \
     bsb/bsb_build_cache.cmx bsb/bsb_ninja_file_groups.cmi
 bsb/bsb_ninja_gen.cmx : ext/string_map.cmx ext/literals.cmx \
-    ext/ext_string.cmx ext/ext_list.cmx ext/ext_filename.cmx bsb/bsb_rule.cmx \
+    ext/ext_string.cmx ext/ext_path.cmx ext/ext_list.cmx bsb/bsb_rule.cmx \
     bsb/bsb_pkg_map_gen.cmx bsb/bsb_parse_sources.cmx bsb/bsb_ninja_util.cmx \
     bsb/bsb_ninja_global_vars.cmx bsb/bsb_ninja_file_groups.cmx \
     bsb/bsb_dir_index.cmx bsb/bsb_config_types.cmx bsb/bsb_config.cmx \
     bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx bsb/bsb_build_cache.cmx \
     bsb/bsb_ninja_gen.cmi
 bsb/bsb_ninja_global_vars.cmx :
-bsb/bsb_ninja_regen.cmx : ext/literals.cmx ext/ext_filename.cmx \
+bsb/bsb_ninja_regen.cmx : ext/literals.cmx ext/ext_path.cmx \
     bsb/bsb_ninja_gen.cmx bsb/bsb_merlin_gen.cmx bsb/bsb_config_parse.cmx \
     bsb/bsb_config.cmx bsb/bsb_clean.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_bsdeps.cmx bsb/bsb_ninja_regen.cmi
 bsb/bsb_ninja_util.cmx : ext/ext_string.cmx bsb/bsb_rule.cmx \
     bsb/bsb_ninja_util.cmi
 bsb/bsb_os_dependent.cmx :
 bsb/bsb_package_specs.cmx : ext/string_map.cmx ext/literals.cmx \
-    ext/ext_string.cmx ext/ext_namespace.cmx ext/ext_json_types.cmx \
-    ext/ext_json.cmx ext/ext_filename.cmx bsb/bsb_exception.cmx \
+    ext/ext_string.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
+    ext/ext_json_types.cmx ext/ext_json.cmx bsb/bsb_exception.cmx \
     bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx bsb/bsb_package_specs.cmi
 bsb/bsb_parse_sources.cmx : ext/string_vec.cmx ext/string_set.cmx \
-    ext/string_map.cmx ext/ext_string.cmx ext/ext_json_types.cmx \
-    ext/ext_json.cmx ext/ext_filename.cmx ext/ext_file_pp.cmx \
-    ext/ext_array.cmx bsb/bsb_exception.cmx bsb/bsb_dir_index.cmx \
-    bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx bsb/bsb_build_cache.cmx \
-    bsb/bsb_parse_sources.cmi
+    ext/string_map.cmx ext/ext_string.cmx ext/ext_path.cmx \
+    ext/ext_json_types.cmx ext/ext_json.cmx ext/ext_filename.cmx \
+    ext/ext_file_pp.cmx ext/ext_array.cmx bsb/bsb_exception.cmx \
+    bsb/bsb_dir_index.cmx bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx \
+    bsb/bsb_build_cache.cmx bsb/bsb_parse_sources.cmi
 bsb/bsb_pkg.cmx : ext/string_hashtbl.cmx ext/literals.cmx \
     bsb/bsb_exception.cmx bsb/bsb_pkg.cmi
 bsb/bsb_pkg_cmi_create.cmx :
 bsb/bsb_pkg_map_gen.cmx : ext/string_map.cmx ext/literals.cmx \
-    ext/ext_filename.cmx bsb/bsb_parse_sources.cmx bsb/bsb_pkg_map_gen.cmi
+    ext/ext_path.cmx bsb/bsb_parse_sources.cmx bsb/bsb_pkg_map_gen.cmi
 bsb/bsb_query.cmx : ext/string_map.cmx ext/ext_json_noloc.cmx \
     ext/ext_array.cmx bsb/bsb_parse_sources.cmx bsb/bsb_ninja_regen.cmx \
     bsb/bsb_config_types.cmx bsb/bsb_query.cmi
@@ -867,11 +875,11 @@ bsb/bsb_rule.cmx : ext/string_set.cmx ext/string_map.cmx ext/ext_sys.cmx \
     bsb/bsb_rule.cmi
 bsb/bsb_templates.cmx : bsb/oCamlRes.cmx bsb/bsb_templates.cmi
 bsb/bsb_unix.cmx : ext/ext_sys.cmx ext/ext_string.cmx bsb/bsb_unix.cmi
-bsb/bsb_watcher_gen.cmx : ext/ext_list.cmx ext/ext_json_noloc.cmx \
-    ext/ext_filename.cmx ext/ext_array.cmx bsb/bsb_parse_sources.cmx \
+bsb/bsb_watcher_gen.cmx : ext/ext_path.cmx ext/ext_list.cmx \
+    ext/ext_json_noloc.cmx ext/ext_array.cmx bsb/bsb_parse_sources.cmx \
     bsb/bsb_config.cmx bsb/bsb_watcher_gen.cmi
 bsb/bsb_world.cmx : ext/string_hash_set.cmx ext/literals.cmx \
-    ext/ext_namespace.cmx ext/ext_filename.cmx bsb/bsb_unix.cmx \
+    ext/ext_path.cmx ext/ext_namespace.cmx bsb/bsb_unix.cmx \
     bsb/bsb_ninja_regen.cmx bsb/bsb_file.cmx bsb/bsb_config_types.cmx \
     bsb/bsb_config_parse.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_world.cmi

jscomp/bin/Makefile

@@ -46,4 +46,12 @@ bspack.exe: bspack.mli bspack.ml
 bspack.js:	bspack.mli bspack.ml
 	$(BSC) $(BSC_FLAGS) $^
 
+test.exe:all_ounit_tests.mli all_ounit_tests.ml
+	$(NATIVE) $(OCAMLOPT_FLAGS) -I +compiler-libs ocamlcommon.cmxa unix.cmxa str.cmxa $^ -o $@
+
+test:test.exe
+	./test.exe	
+
 all: bsppx.exe bspp.exe bsdep.exe bsc.exe bspack.exe bsb.exe bsb_helper.exe refmt.exe reactjs_jsx_ppx.exe reactjs_jsx_ppx_2.exe
+
+.PHONY: test

jscomp/bin/all_ounit_tests.d

@@ -11,6 +11,7 @@ bin/all_ounit_tests.ml : ext/ext_char.ml
 bin/all_ounit_tests.ml : ext/ext_int.mli
 bin/all_ounit_tests.ml : ext/ext_json.ml
 bin/all_ounit_tests.ml : ext/ext_list.ml
+bin/all_ounit_tests.ml : ext/ext_path.ml
 bin/all_ounit_tests.ml : ext/ext_scc.mli
 bin/all_ounit_tests.ml : ext/ext_sexp.ml
 bin/all_ounit_tests.ml : ext/ext_utf8.ml
@@ -30,6 +31,7 @@ bin/all_ounit_tests.ml : ext/ext_char.mli
 bin/all_ounit_tests.ml : ext/ext_ident.ml
 bin/all_ounit_tests.ml : ext/ext_json.mli
 bin/all_ounit_tests.ml : ext/ext_list.mli
+bin/all_ounit_tests.ml : ext/ext_path.mli
 bin/all_ounit_tests.ml : ext/ext_sexp.mli
 bin/all_ounit_tests.ml : ext/ext_utf8.mli
 bin/all_ounit_tests.ml : ext/ext_util.mli
@@ -50,7 +52,6 @@ bin/all_ounit_tests.ml : ext/hashtbl_gen.ml
 bin/all_ounit_tests.ml : ext/int_vec_vec.ml
 bin/all_ounit_tests.ml : ext/string_map.mli
 bin/all_ounit_tests.ml : ext/union_find.mli
-bin/all_ounit_tests.ml : ext/ext_filename.ml
 bin/all_ounit_tests.ml : ext/ext_js_regex.ml
 bin/all_ounit_tests.ml : ext/ext_position.ml
 bin/all_ounit_tests.ml : ext/ext_topsort.mli
@@ -61,7 +62,6 @@ bin/all_ounit_tests.ml : ext/int_vec_vec.mli
 bin/all_ounit_tests.ml : ext/resize_array.ml
 bin/all_ounit_tests.ml : ounit/oUnitTypes.ml
 bin/all_ounit_tests.ml : ounit/oUnitUtils.ml
-bin/all_ounit_tests.ml : ext/ext_filename.mli
 bin/all_ounit_tests.ml : ext/ext_js_regex.mli
 bin/all_ounit_tests.ml : ext/ext_namespace.ml
 bin/all_ounit_tests.ml : ext/ext_position.mli