Skip to content

Commit 19dc156

Browse files
bobzhangbobzhang
committed
snapshot
1 parent c91273b commit 19dc156

File tree

4 files changed

+20
-204
lines changed

4 files changed

+20
-204
lines changed

‎lib/4.06.1/bsb.ml

Lines changed: 9 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,97 +3276,6 @@ type ts = t array
32763276

32773277

32783278

3279-
end
3280-
module Bsb_dir_index : sig
3281-
#1 "bsb_dir_index.mli"
3282-
(* Copyright (C) 2017 Authors of BuckleScript
3283-
*
3284-
* This program is free software: you can redistribute it and/or modify
3285-
* it under the terms of the GNU Lesser General Public License as published by
3286-
* the Free Software Foundation, either version 3 of the License, or
3287-
* (at your option) any later version.
3288-
*
3289-
* In addition to the permissions granted to you by the LGPL, you may combine
3290-
* or link a "work that uses the Library" with a publicly distributed version
3291-
* of this file to produce a combined library or application, then distribute
3292-
* that combined work under the terms of your choosing, with no requirement
3293-
* to comply with the obligations normally placed on you by section 4 of the
3294-
* LGPL version 3 (or the corresponding section of a later version of the LGPL
3295-
* should you choose to use a later version).
3296-
*
3297-
* This program is distributed in the hope that it will be useful,
3298-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
3299-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3300-
* GNU Lesser General Public License for more details.
3301-
*
3302-
* You should have received a copy of the GNU Lesser General Public License
3303-
* along with this program; if not, write to the Free Software
3304-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
3305-
3306-
(** Used to index [.bsbuildcache] may not be needed if we flatten dev
3307-
into a single group
3308-
*)
3309-
type t = private int
3310-
3311-
val lib_dir_index : t
3312-
3313-
val is_lib_dir : t -> bool
3314-
3315-
val get_dev_index : unit -> t
3316-
3317-
3318-
3319-
3320-
3321-
3322-
end = struct
3323-
#1 "bsb_dir_index.ml"
3324-
(* Copyright (C) 2017 Authors of BuckleScript
3325-
*
3326-
* This program is free software: you can redistribute it and/or modify
3327-
* it under the terms of the GNU Lesser General Public License as published by
3328-
* the Free Software Foundation, either version 3 of the License, or
3329-
* (at your option) any later version.
3330-
*
3331-
* In addition to the permissions granted to you by the LGPL, you may combine
3332-
* or link a "work that uses the Library" with a publicly distributed version
3333-
* of this file to produce a combined library or application, then distribute
3334-
* that combined work under the terms of your choosing, with no requirement
3335-
* to comply with the obligations normally placed on you by section 4 of the
3336-
* LGPL version 3 (or the corresponding section of a later version of the LGPL
3337-
* should you choose to use a later version).
3338-
*
3339-
* This program is distributed in the hope that it will be useful,
3340-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
3341-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3342-
* GNU Lesser General Public License for more details.
3343-
*
3344-
* You should have received a copy of the GNU Lesser General Public License
3345-
* along with this program; if not, write to the Free Software
3346-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
3347-
3348-
type t = int
3349-
3350-
(**
3351-
0 : lib
3352-
1 : dev 1
3353-
2 : dev 2
3354-
*)
3355-
3356-
let lib_dir_index = 0
3357-
3358-
let is_lib_dir x = x = lib_dir_index
3359-
3360-
3361-
3362-
let get_dev_index ( ) = 1
3363-
3364-
3365-
3366-
3367-
3368-
3369-
33703279
end
33713280
module Set_gen
33723281
= struct
@@ -4045,7 +3954,7 @@ type file_group =
40453954
sources : Bsb_db.t;
40463955
resources : string list ;
40473956
public : public ;
4048-
dir_index : Bsb_dir_index.t ;
3957+
dir_index : bool ; (* false means not in dev mode *)
40493958
generators : build_generator list ;
40503959
(* output of [generators] should be added to [sources],
40513960
if it is [.ml,.mli,.re,.rei]
@@ -4122,7 +4031,7 @@ type file_group =
41224031
sources : Bsb_db.t;
41234032
resources : string list ;
41244033
public : public ;
4125-
dir_index : Bsb_dir_index.t ;
4034+
dir_index : bool ;
41264035
generators : build_generator list ;
41274036
(* output of [generators] should be added to [sources],
41284037
if it is [.ml,.mli,.re,.rei]
@@ -10565,7 +10474,7 @@ let errorf x fmt =
1056510474

1056610475
type cxt = {
1056710476
toplevel : bool ;
10568-
dir_index : Bsb_dir_index.t ;
10477+
dir_index : bool;
1056910478
cwd : string ;
1057010479
root : string;
1057110480
cut_generators : bool;
@@ -10870,7 +10779,7 @@ and parsing_single_source ({toplevel; dir_index ; cwd} as cxt ) (x : Ext_json_ty
1087010779
: t =
1087110780
match x with
1087210781
| Str { str = dir } ->
10873-
if not toplevel && not (Bsb_dir_index.is_lib_dir dir_index) then
10782+
if not toplevel && dir_index then
1087410783
Bsb_file_groups.empty
1087510784
else
1087610785
parsing_source_dir_map
@@ -10881,10 +10790,10 @@ and parsing_single_source ({toplevel; dir_index ; cwd} as cxt ) (x : Ext_json_ty
1088110790
let current_dir_index =
1088210791
match Map_string.find_opt map Bsb_build_schemas.type_ with
1088310792
| Some (Str {str="dev"}) ->
10884-
Bsb_dir_index.get_dev_index ()
10793+
true
1088510794
| Some _ -> Bsb_exception.config_error x {|type field expect "dev" literal |}
1088610795
| None -> dir_index in
10887-
if not toplevel && not (Bsb_dir_index.is_lib_dir current_dir_index) then
10796+
if not toplevel && current_dir_index then
1088810797
Bsb_file_groups.empty
1088910798
else
1089010799
let dir =
@@ -10925,7 +10834,7 @@ let scan
1092510834
parse_sources {
1092610835
ignored_dirs;
1092710836
toplevel;
10928-
dir_index = Bsb_dir_index.lib_dir_index;
10837+
dir_index = false;
1092910838
cwd = Filename.current_dir_name;
1093010839
root ;
1093110840
cut_generators;
@@ -13411,7 +13320,7 @@ let make_common_shadows
1341113320
let emit_module_build
1341213321
(rules : Bsb_ninja_rule.builtin)
1341313322
(package_specs : Bsb_package_specs.t)
13414-
(group_dir_index : Bsb_dir_index.t)
13323+
(is_dev : bool)
1341513324
oc
1341613325
~bs_suffix
1341713326
js_post_build_cmd
@@ -13421,7 +13330,6 @@ let emit_module_build
1342113330
let has_intf_file = module_info.info = Ml_mli in
1342213331
let is_re = module_info.is_re in
1342313332
let filename_sans_extension = module_info.name_sans_extension in
13424-
let is_dev = not (Bsb_dir_index.is_lib_dir group_dir_index) in
1342513333
let input_impl =
1342613334
Bsb_config.proj_rel
1342713335
(filename_sans_extension ^ if is_re then Literals.suffix_re else Literals.suffix_ml ) in
@@ -13762,7 +13670,7 @@ let output_ninja_and_namespace_map
1376213670
let static_resources =
1376313671
Ext_list.fold_left bs_file_groups [] (fun (acc_resources : string list) {sources; dir; resources; dir_index}
1376413672
->
13765-
let dir_index = (dir_index :> int) in
13673+
let dir_index = if dir_index then 1 else 0 in
1376613674
bs_groups.(dir_index) <- Bsb_db_util.merge bs_groups.(dir_index) sources ;
1376713675
source_dirs.(dir_index) <- dir :: source_dirs.(dir_index);
1376813676
Ext_list.map_append resources acc_resources (fun x -> dir//x)

‎lib/4.06.1/bsb.ml.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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_backend.ml ./bsb/bsb_global_backend.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/bsc_warnings.ml ./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_js_file_kind.ml ./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_namespace_encode.ml ./ext/ext_namespace_encode.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
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_backend.ml ./bsb/bsb_global_backend.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/bsc_warnings.ml ./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_js_file_kind.ml ./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_namespace_encode.ml ./ext/ext_namespace_encode.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

Lines changed: 9 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,97 +3276,6 @@ type ts = t array
32763276

32773277

32783278

3279-
end
3280-
module Bsb_dir_index : sig
3281-
#1 "bsb_dir_index.mli"
3282-
(* Copyright (C) 2017 Authors of BuckleScript
3283-
*
3284-
* This program is free software: you can redistribute it and/or modify
3285-
* it under the terms of the GNU Lesser General Public License as published by
3286-
* the Free Software Foundation, either version 3 of the License, or
3287-
* (at your option) any later version.
3288-
*
3289-
* In addition to the permissions granted to you by the LGPL, you may combine
3290-
* or link a "work that uses the Library" with a publicly distributed version
3291-
* of this file to produce a combined library or application, then distribute
3292-
* that combined work under the terms of your choosing, with no requirement
3293-
* to comply with the obligations normally placed on you by section 4 of the
3294-
* LGPL version 3 (or the corresponding section of a later version of the LGPL
3295-
* should you choose to use a later version).
3296-
*
3297-
* This program is distributed in the hope that it will be useful,
3298-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
3299-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3300-
* GNU Lesser General Public License for more details.
3301-
*
3302-
* You should have received a copy of the GNU Lesser General Public License
3303-
* along with this program; if not, write to the Free Software
3304-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
3305-
3306-
(** Used to index [.bsbuildcache] may not be needed if we flatten dev
3307-
into a single group
3308-
*)
3309-
type t = private int
3310-
3311-
val lib_dir_index : t
3312-
3313-
val is_lib_dir : t -> bool
3314-
3315-
val get_dev_index : unit -> t
3316-
3317-
3318-
3319-
3320-
3321-
3322-
end = struct
3323-
#1 "bsb_dir_index.ml"
3324-
(* Copyright (C) 2017 Authors of BuckleScript
3325-
*
3326-
* This program is free software: you can redistribute it and/or modify
3327-
* it under the terms of the GNU Lesser General Public License as published by
3328-
* the Free Software Foundation, either version 3 of the License, or
3329-
* (at your option) any later version.
3330-
*
3331-
* In addition to the permissions granted to you by the LGPL, you may combine
3332-
* or link a "work that uses the Library" with a publicly distributed version
3333-
* of this file to produce a combined library or application, then distribute
3334-
* that combined work under the terms of your choosing, with no requirement
3335-
* to comply with the obligations normally placed on you by section 4 of the
3336-
* LGPL version 3 (or the corresponding section of a later version of the LGPL
3337-
* should you choose to use a later version).
3338-
*
3339-
* This program is distributed in the hope that it will be useful,
3340-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
3341-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3342-
* GNU Lesser General Public License for more details.
3343-
*
3344-
* You should have received a copy of the GNU Lesser General Public License
3345-
* along with this program; if not, write to the Free Software
3346-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
3347-
3348-
type t = int
3349-
3350-
(**
3351-
0 : lib
3352-
1 : dev 1
3353-
2 : dev 2
3354-
*)
3355-
3356-
let lib_dir_index = 0
3357-
3358-
let is_lib_dir x = x = lib_dir_index
3359-
3360-
3361-
3362-
let get_dev_index ( ) = 1
3363-
3364-
3365-
3366-
3367-
3368-
3369-
33703279
end
33713280
module Set_gen
33723281
= struct
@@ -4045,7 +3954,7 @@ type file_group =
40453954
sources : Bsb_db.t;
40463955
resources : string list ;
40473956
public : public ;
4048-
dir_index : Bsb_dir_index.t ;
3957+
dir_index : bool ; (* false means not in dev mode *)
40493958
generators : build_generator list ;
40503959
(* output of [generators] should be added to [sources],
40513960
if it is [.ml,.mli,.re,.rei]
@@ -4122,7 +4031,7 @@ type file_group =
41224031
sources : Bsb_db.t;
41234032
resources : string list ;
41244033
public : public ;
4125-
dir_index : Bsb_dir_index.t ;
4034+
dir_index : bool ;
41264035
generators : build_generator list ;
41274036
(* output of [generators] should be added to [sources],
41284037
if it is [.ml,.mli,.re,.rei]
@@ -10597,7 +10506,7 @@ let errorf x fmt =
1059710506

1059810507
type cxt = {
1059910508
toplevel : bool ;
10600-
dir_index : Bsb_dir_index.t ;
10509+
dir_index : bool;
1060110510
cwd : string ;
1060210511
root : string;
1060310512
cut_generators : bool;
@@ -10902,7 +10811,7 @@ and parsing_single_source ({toplevel; dir_index ; cwd} as cxt ) (x : Ext_json_ty
1090210811
: t =
1090310812
match x with
1090410813
| Str { str = dir } ->
10905-
if not toplevel && not (Bsb_dir_index.is_lib_dir dir_index) then
10814+
if not toplevel && dir_index then
1090610815
Bsb_file_groups.empty
1090710816
else
1090810817
parsing_source_dir_map
@@ -10913,10 +10822,10 @@ and parsing_single_source ({toplevel; dir_index ; cwd} as cxt ) (x : Ext_json_ty
1091310822
let current_dir_index =
1091410823
match Map_string.find_opt map Bsb_build_schemas.type_ with
1091510824
| Some (Str {str="dev"}) ->
10916-
Bsb_dir_index.get_dev_index ()
10825+
true
1091710826
| Some _ -> Bsb_exception.config_error x {|type field expect "dev" literal |}
1091810827
| None -> dir_index in
10919-
if not toplevel && not (Bsb_dir_index.is_lib_dir current_dir_index) then
10828+
if not toplevel && current_dir_index then
1092010829
Bsb_file_groups.empty
1092110830
else
1092210831
let dir =
@@ -10957,7 +10866,7 @@ let scan
1095710866
parse_sources {
1095810867
ignored_dirs;
1095910868
toplevel;
10960-
dir_index = Bsb_dir_index.lib_dir_index;
10869+
dir_index = false;
1096110870
cwd = Filename.current_dir_name;
1096210871
root ;
1096310872
cut_generators;
@@ -13560,7 +13469,7 @@ let make_common_shadows
1356013469
let emit_module_build
1356113470
(rules : Bsb_ninja_rule.builtin)
1356213471
(package_specs : Bsb_package_specs.t)
13563-
(group_dir_index : Bsb_dir_index.t)
13472+
(is_dev : bool)
1356413473
oc
1356513474
~bs_suffix
1356613475
js_post_build_cmd
@@ -13570,7 +13479,6 @@ let emit_module_build
1357013479
let has_intf_file = module_info.info = Ml_mli in
1357113480
let is_re = module_info.is_re in
1357213481
let filename_sans_extension = module_info.name_sans_extension in
13573-
let is_dev = not (Bsb_dir_index.is_lib_dir group_dir_index) in
1357413482
let input_impl =
1357513483
Bsb_config.proj_rel
1357613484
(filename_sans_extension ^ if is_re then Literals.suffix_re else Literals.suffix_ml ) in
@@ -13911,7 +13819,7 @@ let output_ninja_and_namespace_map
1391113819
let static_resources =
1391213820
Ext_list.fold_left bs_file_groups [] (fun (acc_resources : string list) {sources; dir; resources; dir_index}
1391313821
->
13914-
let dir_index = (dir_index :> int) in
13822+
let dir_index = if dir_index then 1 else 0 in
1391513823
bs_groups.(dir_index) <- Bsb_db_util.merge bs_groups.(dir_index) sources ;
1391613824
source_dirs.(dir_index) <- dir :: source_dirs.(dir_index);
1391713825
Ext_list.map_append resources acc_resources (fun x -> dir//x)

0 commit comments

Comments
 (0)