Update lib

Author: Coobaha

lib/4.06.1/bsb.ml

@@ -7889,6 +7889,8 @@ module Bsb_real_path : sig
 #1 "bsb_real_path.mli"
 val real_path : string -> string 
 
+val is_same_paths_via_io : string -> string -> bool 
+
 end = struct
 #1 "bsb_real_path.ml"
 let (//) = Filename.concat
@@ -7922,6 +7924,11 @@ let real_path p =
     | base -> dir // base
 
 
+let is_same_paths_via_io a b =
+  if a = b
+  then true
+  else (real_path a) = (real_path b)
+
 end
 module Hash_gen
 = struct
@@ -8408,11 +8415,6 @@ let check_dir dir =
   | true -> Some(dir)
   | false -> None
 
-let is_same_paths a b =
-  if a = b
-  then true
-  else (Bsb_real_path.real_path a) = (Bsb_real_path.real_path b)
-
 let  resolve_bs_package_aux  ~cwd (pkg : t) =
   (* First try to resolve recursively from the current working directory  *)
   let sub_path = make_sub_path pkg   in
@@ -8518,7 +8520,7 @@ let resolve_bs_package ~cwd (package : t) =
     | Some x
       ->
       let result = resolve_bs_package_aux ~cwd package in
-      if not (is_same_paths result x) then
+      if not (Bsb_real_path.is_same_paths_via_io result x) then
         begin
           Bsb_log.warn
             "@{<warning>Duplicated package:@} %a %s (chosen) vs %s in %s @." 

lib/4.06.1/bsb.ml.d

@@ -1 +1 @@
-../lib/4.06.1/bsb.ml: ./bsb/bsb_build_schemas.ml ./bsb/bsb_build_util.ml ./bsb/bsb_build_util.mli ./bsb/bsb_clean.ml ./bsb/bsb_clean.mli ./bsb/bsb_config.ml ./bsb/bsb_config.mli ./bsb/bsb_config_parse.ml ./bsb/bsb_config_parse.mli ./bsb/bsb_config_types.ml ./bsb/bsb_db_encode.ml ./bsb/bsb_db_encode.mli ./bsb/bsb_db_util.ml ./bsb/bsb_db_util.mli ./bsb/bsb_exception.ml ./bsb/bsb_exception.mli ./bsb/bsb_file.ml ./bsb/bsb_file.mli ./bsb/bsb_file_groups.ml ./bsb/bsb_file_groups.mli ./bsb/bsb_global_paths.ml ./bsb/bsb_global_paths.mli ./bsb/bsb_log.ml ./bsb/bsb_log.mli ./bsb/bsb_merlin_gen.ml ./bsb/bsb_merlin_gen.mli ./bsb/bsb_namespace_map_gen.ml ./bsb/bsb_namespace_map_gen.mli ./bsb/bsb_ninja_check.ml ./bsb/bsb_ninja_check.mli ./bsb/bsb_ninja_file_groups.ml ./bsb/bsb_ninja_file_groups.mli ./bsb/bsb_ninja_gen.ml ./bsb/bsb_ninja_gen.mli ./bsb/bsb_ninja_global_vars.ml ./bsb/bsb_ninja_regen.ml ./bsb/bsb_ninja_regen.mli ./bsb/bsb_ninja_rule.ml ./bsb/bsb_ninja_rule.mli ./bsb/bsb_ninja_targets.ml ./bsb/bsb_ninja_targets.mli ./bsb/bsb_package_specs.ml ./bsb/bsb_package_specs.mli ./bsb/bsb_parse_sources.ml ./bsb/bsb_parse_sources.mli ./bsb/bsb_pkg.ml ./bsb/bsb_pkg.mli ./bsb/bsb_pkg_types.ml ./bsb/bsb_pkg_types.mli ./bsb/bsb_regex.ml ./bsb/bsb_regex.mli ./bsb/bsb_templates.ml ./bsb/bsb_templates.mli ./bsb/bsb_theme_init.ml ./bsb/bsb_theme_init.mli ./bsb/bsb_unix.ml ./bsb/bsb_unix.mli ./bsb/bsb_warning.ml ./bsb/bsb_warning.mli ./bsb/bsb_watcher_gen.ml ./bsb/bsb_watcher_gen.mli ./bsb/bsb_world.ml ./bsb/bsb_world.mli ./bsb/oCamlRes.ml ./common/bs_version.ml ./common/bs_version.mli ./ext/bsb_db.ml ./ext/bsb_db.mli ./ext/bsb_dir_index.ml ./ext/bsb_dir_index.mli ./ext/ext_array.ml ./ext/ext_array.mli ./ext/ext_buffer.ml ./ext/ext_buffer.mli ./ext/ext_bytes.ml ./ext/ext_bytes.mli ./ext/ext_color.ml ./ext/ext_color.mli ./ext/ext_digest.ml ./ext/ext_digest.mli ./ext/ext_filename.ml ./ext/ext_filename.mli ./ext/ext_fmt.ml ./ext/ext_io.ml ./ext/ext_io.mli ./ext/ext_json.ml ./ext/ext_json.mli ./ext/ext_json_noloc.ml ./ext/ext_json_noloc.mli ./ext/ext_json_parse.ml ./ext/ext_json_parse.mli ./ext/ext_json_types.ml ./ext/ext_list.ml ./ext/ext_list.mli ./ext/ext_namespace.ml ./ext/ext_namespace.mli ./ext/ext_option.ml ./ext/ext_option.mli ./ext/ext_path.ml ./ext/ext_path.mli ./ext/ext_pervasives.ml ./ext/ext_pervasives.mli ./ext/ext_position.ml ./ext/ext_position.mli ./ext/ext_string.ml ./ext/ext_string.mli ./ext/ext_sys.ml ./ext/ext_sys.mli ./ext/ext_util.ml ./ext/ext_util.mli ./ext/hash.ml ./ext/hash.mli ./ext/hash_gen.ml ./ext/hash_set_gen.ml ./ext/hash_set_string.ml ./ext/hash_set_string.mli ./ext/hash_string.ml ./ext/hash_string.mli ./ext/literals.ml ./ext/literals.mli ./ext/map_gen.ml ./ext/map_string.ml ./ext/map_string.mli ./ext/set_gen.ml ./ext/set_string.ml ./ext/set_string.mli ./main/bsb_main.ml ./main/bsb_main.mli ./stubs/bs_hash_stubs.ml 
+../lib/4.06.1/bsb.ml: ./bsb/bsb_build_schemas.ml ./bsb/bsb_build_util.ml ./bsb/bsb_build_util.mli ./bsb/bsb_clean.ml ./bsb/bsb_clean.mli ./bsb/bsb_config.ml ./bsb/bsb_config.mli ./bsb/bsb_config_parse.ml ./bsb/bsb_config_parse.mli ./bsb/bsb_config_types.ml ./bsb/bsb_db_encode.ml ./bsb/bsb_db_encode.mli ./bsb/bsb_db_util.ml ./bsb/bsb_db_util.mli ./bsb/bsb_exception.ml ./bsb/bsb_exception.mli ./bsb/bsb_file.ml ./bsb/bsb_file.mli ./bsb/bsb_file_groups.ml ./bsb/bsb_file_groups.mli ./bsb/bsb_global_paths.ml ./bsb/bsb_global_paths.mli ./bsb/bsb_log.ml ./bsb/bsb_log.mli ./bsb/bsb_merlin_gen.ml ./bsb/bsb_merlin_gen.mli ./bsb/bsb_namespace_map_gen.ml ./bsb/bsb_namespace_map_gen.mli ./bsb/bsb_ninja_check.ml ./bsb/bsb_ninja_check.mli ./bsb/bsb_ninja_file_groups.ml ./bsb/bsb_ninja_file_groups.mli ./bsb/bsb_ninja_gen.ml ./bsb/bsb_ninja_gen.mli ./bsb/bsb_ninja_global_vars.ml ./bsb/bsb_ninja_regen.ml ./bsb/bsb_ninja_regen.mli ./bsb/bsb_ninja_rule.ml ./bsb/bsb_ninja_rule.mli ./bsb/bsb_ninja_targets.ml ./bsb/bsb_ninja_targets.mli ./bsb/bsb_package_specs.ml ./bsb/bsb_package_specs.mli ./bsb/bsb_parse_sources.ml ./bsb/bsb_parse_sources.mli ./bsb/bsb_pkg.ml ./bsb/bsb_pkg.mli ./bsb/bsb_pkg_types.ml ./bsb/bsb_pkg_types.mli ./bsb/bsb_real_path.ml ./bsb/bsb_real_path.mli ./bsb/bsb_regex.ml ./bsb/bsb_regex.mli ./bsb/bsb_templates.ml ./bsb/bsb_templates.mli ./bsb/bsb_theme_init.ml ./bsb/bsb_theme_init.mli ./bsb/bsb_unix.ml ./bsb/bsb_unix.mli ./bsb/bsb_warning.ml ./bsb/bsb_warning.mli ./bsb/bsb_watcher_gen.ml ./bsb/bsb_watcher_gen.mli ./bsb/bsb_world.ml ./bsb/bsb_world.mli ./bsb/oCamlRes.ml ./common/bs_version.ml ./common/bs_version.mli ./ext/bsb_db.ml ./ext/bsb_db.mli ./ext/bsb_dir_index.ml ./ext/bsb_dir_index.mli ./ext/ext_array.ml ./ext/ext_array.mli ./ext/ext_buffer.ml ./ext/ext_buffer.mli ./ext/ext_bytes.ml ./ext/ext_bytes.mli ./ext/ext_color.ml ./ext/ext_color.mli ./ext/ext_digest.ml ./ext/ext_digest.mli ./ext/ext_filename.ml ./ext/ext_filename.mli ./ext/ext_fmt.ml ./ext/ext_io.ml ./ext/ext_io.mli ./ext/ext_json.ml ./ext/ext_json.mli ./ext/ext_json_noloc.ml ./ext/ext_json_noloc.mli ./ext/ext_json_parse.ml ./ext/ext_json_parse.mli ./ext/ext_json_types.ml ./ext/ext_list.ml ./ext/ext_list.mli ./ext/ext_namespace.ml ./ext/ext_namespace.mli ./ext/ext_option.ml ./ext/ext_option.mli ./ext/ext_path.ml ./ext/ext_path.mli ./ext/ext_pervasives.ml ./ext/ext_pervasives.mli ./ext/ext_position.ml ./ext/ext_position.mli ./ext/ext_string.ml ./ext/ext_string.mli ./ext/ext_sys.ml ./ext/ext_sys.mli ./ext/ext_util.ml ./ext/ext_util.mli ./ext/hash.ml ./ext/hash.mli ./ext/hash_gen.ml ./ext/hash_set_gen.ml ./ext/hash_set_string.ml ./ext/hash_set_string.mli ./ext/hash_string.ml ./ext/hash_string.mli ./ext/literals.ml ./ext/literals.mli ./ext/map_gen.ml ./ext/map_string.ml ./ext/map_string.mli ./ext/set_gen.ml ./ext/set_string.ml ./ext/set_string.mli ./main/bsb_main.ml ./main/bsb_main.mli ./stubs/bs_hash_stubs.ml 

lib/4.06.1/unstable/bsb_native.ml

@@ -7889,6 +7889,8 @@ module Bsb_real_path : sig
 #1 "bsb_real_path.mli"
 val real_path : string -> string 
 
+val is_same_paths_via_io : string -> string -> bool 
+
 end = struct
 #1 "bsb_real_path.ml"
 let (//) = Filename.concat
@@ -7922,6 +7924,11 @@ let real_path p =
     | base -> dir // base
 
 
+let is_same_paths_via_io a b =
+  if a = b
+  then true
+  else (real_path a) = (real_path b)
+
 end
 module Hash_gen
 = struct
@@ -8408,11 +8415,6 @@ let check_dir dir =
   | true -> Some(dir)
   | false -> None
 
-let is_same_paths a b =
-  if a = b
-  then true
-  else (Bsb_real_path.real_path a) = (Bsb_real_path.real_path b)
-
 let  resolve_bs_package_aux  ~cwd (pkg : t) =
   (* First try to resolve recursively from the current working directory  *)
   let sub_path = make_sub_path pkg   in
@@ -8518,7 +8520,7 @@ let resolve_bs_package ~cwd (package : t) =
     | Some x
       ->
       let result = resolve_bs_package_aux ~cwd package in
-      if not (is_same_paths result x) then
+      if not (Bsb_real_path.is_same_paths_via_io result x) then
         begin
           Bsb_log.warn
             "@{<warning>Duplicated package:@} %a %s (chosen) vs %s in %s @." 

lib/4.06.1/unstable/bsb_native.ml.d

@@ -1 +1 @@
-../lib/4.06.1/unstable/bsb_native.ml: ./bsb/bsb_build_schemas.ml ./bsb/bsb_build_util.ml ./bsb/bsb_build_util.mli ./bsb/bsb_clean.ml ./bsb/bsb_clean.mli ./bsb/bsb_config.ml ./bsb/bsb_config.mli ./bsb/bsb_config_parse.ml ./bsb/bsb_config_parse.mli ./bsb/bsb_config_types.ml ./bsb/bsb_db_encode.ml ./bsb/bsb_db_encode.mli ./bsb/bsb_db_util.ml ./bsb/bsb_db_util.mli ./bsb/bsb_default.ml ./bsb/bsb_default.mli ./bsb/bsb_exception.ml ./bsb/bsb_exception.mli ./bsb/bsb_file.ml ./bsb/bsb_file.mli ./bsb/bsb_file_groups.ml ./bsb/bsb_file_groups.mli ./bsb/bsb_global_paths.ml ./bsb/bsb_global_paths.mli ./bsb/bsb_log.ml ./bsb/bsb_log.mli ./bsb/bsb_merlin_gen.ml ./bsb/bsb_merlin_gen.mli ./bsb/bsb_namespace_map_gen.ml ./bsb/bsb_namespace_map_gen.mli ./bsb/bsb_ninja_check.ml ./bsb/bsb_ninja_check.mli ./bsb/bsb_ninja_file_groups.ml ./bsb/bsb_ninja_file_groups.mli ./bsb/bsb_ninja_gen.ml ./bsb/bsb_ninja_gen.mli ./bsb/bsb_ninja_global_vars.ml ./bsb/bsb_ninja_regen.ml ./bsb/bsb_ninja_regen.mli ./bsb/bsb_ninja_rule.ml ./bsb/bsb_ninja_rule.mli ./bsb/bsb_ninja_targets.ml ./bsb/bsb_ninja_targets.mli ./bsb/bsb_package_specs.ml ./bsb/bsb_package_specs.mli ./bsb/bsb_parse_sources.ml ./bsb/bsb_parse_sources.mli ./bsb/bsb_pkg.ml ./bsb/bsb_pkg.mli ./bsb/bsb_pkg_types.ml ./bsb/bsb_pkg_types.mli ./bsb/bsb_regex.ml ./bsb/bsb_regex.mli ./bsb/bsb_templates.ml ./bsb/bsb_templates.mli ./bsb/bsb_theme_init.ml ./bsb/bsb_theme_init.mli ./bsb/bsb_unix.ml ./bsb/bsb_unix.mli ./bsb/bsb_warning.ml ./bsb/bsb_warning.mli ./bsb/bsb_watcher_gen.ml ./bsb/bsb_watcher_gen.mli ./bsb/bsb_world.ml ./bsb/bsb_world.mli ./bsb/oCamlRes.ml ./common/bs_version.ml ./common/bs_version.mli ./ext/bsb_db.ml ./ext/bsb_db.mli ./ext/bsb_dir_index.ml ./ext/bsb_dir_index.mli ./ext/ext_array.ml ./ext/ext_array.mli ./ext/ext_buffer.ml ./ext/ext_buffer.mli ./ext/ext_bytes.ml ./ext/ext_bytes.mli ./ext/ext_color.ml ./ext/ext_color.mli ./ext/ext_digest.ml ./ext/ext_digest.mli ./ext/ext_filename.ml ./ext/ext_filename.mli ./ext/ext_fmt.ml ./ext/ext_io.ml ./ext/ext_io.mli ./ext/ext_json.ml ./ext/ext_json.mli ./ext/ext_json_noloc.ml ./ext/ext_json_noloc.mli ./ext/ext_json_parse.ml ./ext/ext_json_parse.mli ./ext/ext_json_types.ml ./ext/ext_list.ml ./ext/ext_list.mli ./ext/ext_namespace.ml ./ext/ext_namespace.mli ./ext/ext_option.ml ./ext/ext_option.mli ./ext/ext_path.ml ./ext/ext_path.mli ./ext/ext_pervasives.ml ./ext/ext_pervasives.mli ./ext/ext_position.ml ./ext/ext_position.mli ./ext/ext_string.ml ./ext/ext_string.mli ./ext/ext_sys.ml ./ext/ext_sys.mli ./ext/ext_util.ml ./ext/ext_util.mli ./ext/hash.ml ./ext/hash.mli ./ext/hash_gen.ml ./ext/hash_set_gen.ml ./ext/hash_set_string.ml ./ext/hash_set_string.mli ./ext/hash_string.ml ./ext/hash_string.mli ./ext/literals.ml ./ext/literals.mli ./ext/map_gen.ml ./ext/map_string.ml ./ext/map_string.mli ./ext/set_gen.ml ./ext/set_string.ml ./ext/set_string.mli ./main/bsb_main.ml ./main/bsb_main.mli ./stubs/bs_hash_stubs.ml 
+../lib/4.06.1/unstable/bsb_native.ml: ./bsb/bsb_build_schemas.ml ./bsb/bsb_build_util.ml ./bsb/bsb_build_util.mli ./bsb/bsb_clean.ml ./bsb/bsb_clean.mli ./bsb/bsb_config.ml ./bsb/bsb_config.mli ./bsb/bsb_config_parse.ml ./bsb/bsb_config_parse.mli ./bsb/bsb_config_types.ml ./bsb/bsb_db_encode.ml ./bsb/bsb_db_encode.mli ./bsb/bsb_db_util.ml ./bsb/bsb_db_util.mli ./bsb/bsb_default.ml ./bsb/bsb_default.mli ./bsb/bsb_exception.ml ./bsb/bsb_exception.mli ./bsb/bsb_file.ml ./bsb/bsb_file.mli ./bsb/bsb_file_groups.ml ./bsb/bsb_file_groups.mli ./bsb/bsb_global_paths.ml ./bsb/bsb_global_paths.mli ./bsb/bsb_log.ml ./bsb/bsb_log.mli ./bsb/bsb_merlin_gen.ml ./bsb/bsb_merlin_gen.mli ./bsb/bsb_namespace_map_gen.ml ./bsb/bsb_namespace_map_gen.mli ./bsb/bsb_ninja_check.ml ./bsb/bsb_ninja_check.mli ./bsb/bsb_ninja_file_groups.ml ./bsb/bsb_ninja_file_groups.mli ./bsb/bsb_ninja_gen.ml ./bsb/bsb_ninja_gen.mli ./bsb/bsb_ninja_global_vars.ml ./bsb/bsb_ninja_regen.ml ./bsb/bsb_ninja_regen.mli ./bsb/bsb_ninja_rule.ml ./bsb/bsb_ninja_rule.mli ./bsb/bsb_ninja_targets.ml ./bsb/bsb_ninja_targets.mli ./bsb/bsb_package_specs.ml ./bsb/bsb_package_specs.mli ./bsb/bsb_parse_sources.ml ./bsb/bsb_parse_sources.mli ./bsb/bsb_pkg.ml ./bsb/bsb_pkg.mli ./bsb/bsb_pkg_types.ml ./bsb/bsb_pkg_types.mli ./bsb/bsb_real_path.ml ./bsb/bsb_real_path.mli ./bsb/bsb_regex.ml ./bsb/bsb_regex.mli ./bsb/bsb_templates.ml ./bsb/bsb_templates.mli ./bsb/bsb_theme_init.ml ./bsb/bsb_theme_init.mli ./bsb/bsb_unix.ml ./bsb/bsb_unix.mli ./bsb/bsb_warning.ml ./bsb/bsb_warning.mli ./bsb/bsb_watcher_gen.ml ./bsb/bsb_watcher_gen.mli ./bsb/bsb_world.ml ./bsb/bsb_world.mli ./bsb/oCamlRes.ml ./common/bs_version.ml ./common/bs_version.mli ./ext/bsb_db.ml ./ext/bsb_db.mli ./ext/bsb_dir_index.ml ./ext/bsb_dir_index.mli ./ext/ext_array.ml ./ext/ext_array.mli ./ext/ext_buffer.ml ./ext/ext_buffer.mli ./ext/ext_bytes.ml ./ext/ext_bytes.mli ./ext/ext_color.ml ./ext/ext_color.mli ./ext/ext_digest.ml ./ext/ext_digest.mli ./ext/ext_filename.ml ./ext/ext_filename.mli ./ext/ext_fmt.ml ./ext/ext_io.ml ./ext/ext_io.mli ./ext/ext_json.ml ./ext/ext_json.mli ./ext/ext_json_noloc.ml ./ext/ext_json_noloc.mli ./ext/ext_json_parse.ml ./ext/ext_json_parse.mli ./ext/ext_json_types.ml ./ext/ext_list.ml ./ext/ext_list.mli ./ext/ext_namespace.ml ./ext/ext_namespace.mli ./ext/ext_option.ml ./ext/ext_option.mli ./ext/ext_path.ml ./ext/ext_path.mli ./ext/ext_pervasives.ml ./ext/ext_pervasives.mli ./ext/ext_position.ml ./ext/ext_position.mli ./ext/ext_string.ml ./ext/ext_string.mli ./ext/ext_sys.ml ./ext/ext_sys.mli ./ext/ext_util.ml ./ext/ext_util.mli ./ext/hash.ml ./ext/hash.mli ./ext/hash_gen.ml ./ext/hash_set_gen.ml ./ext/hash_set_string.ml ./ext/hash_set_string.mli ./ext/hash_string.ml ./ext/hash_string.mli ./ext/literals.ml ./ext/literals.mli ./ext/map_gen.ml ./ext/map_string.ml ./ext/map_string.mli ./ext/set_gen.ml ./ext/set_string.ml ./ext/set_string.mli ./main/bsb_main.ml ./main/bsb_main.mli ./stubs/bs_hash_stubs.ml