Skip to content

Commit 1dda4bc

Browse files
committed
snapshot
1 parent 93f47f2 commit 1dda4bc

File tree

3 files changed

+11
-63
lines changed

3 files changed

+11
-63
lines changed

lib/4.06.1/bsb.ml

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,9 +3319,6 @@ val of_int : int -> t
33193319

33203320

33213321

3322-
val bsc_dev_includes : string
3323-
3324-
33253322
end = struct
33263323
#1 "bsb_dir_index.ml"
33273324
(* Copyright (C) 2017 Authors of BuckleScript
@@ -3366,16 +3363,7 @@ let get_dev_index ( ) = 1
33663363

33673364

33683365

3369-
(** bsb generate pre-defined variables [bsc_group_i_includes]
3370-
for each rule, there is variable [bsc_extra_excludes]
3371-
[g_dev_incls] are for app test etc
3372-
it will be like
3373-
{[
3374-
g_dev_incls = ${bsc_group_1_includes}
3375-
]}
3376-
where [bsc_group_1_includes] will be pre-calcuated
3377-
*)
3378-
let bsc_dev_includes = "bsc_group_1_includes"
3366+
33793367

33803368

33813369

@@ -13407,24 +13395,16 @@ let handle_generators oc
1340713395
let make_common_shadows
1340813396
package_specs
1340913397
dirname
13410-
dir_index
1341113398
: Bsb_ninja_targets.shadow list
1341213399
=
1341313400

13414-
{ key = Bsb_ninja_global_vars.g_pkg_flg;
13401+
[{ key = Bsb_ninja_global_vars.g_pkg_flg;
1341513402
op =
1341613403
Append
1341713404
(Bsb_package_specs.package_flag_of_package_specs
1341813405
package_specs dirname
1341913406
)
13420-
} ::
13421-
(if Bsb_dir_index.is_lib_dir dir_index then [] else
13422-
[
13423-
{ key = Bsb_ninja_global_vars.g_dev_incls;
13424-
op = OverwriteVar (Bsb_dir_index.bsc_dev_includes );
13425-
}
13426-
]
13427-
)
13407+
}]
1342813408

1342913409

1343013410

@@ -13463,7 +13443,7 @@ let emit_module_build
1346313443
let common_shadows =
1346413444
make_common_shadows package_specs
1346513445
(Filename.dirname output_cmi)
13466-
group_dir_index in
13446+
in
1346713447
let ast_rule =
1346813448
if is_re then
1346913449
rules.build_ast_from_re
@@ -13798,7 +13778,7 @@ let output_ninja_and_namespace_map
1379813778
Bsb_db_util.conflict_module_info k a (Map_string.find_exn lib k)
1379913779
) ;
1380013780
Bsb_ninja_targets.output_kv
13801-
Bsb_dir_index.bsc_dev_includes
13781+
Bsb_ninja_global_vars.g_dev_incls
1380213782
(Bsb_build_util.include_dirs source_dirs.(1)) oc
1380313783
;
1380413784
bs_groups,source_dirs.(0), static_resources

lib/4.06.1/bsb_helper.ml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ val of_int : int -> t
4040

4141

4242

43-
val bsc_dev_includes : string
44-
45-
4643
end = struct
4744
#1 "bsb_dir_index.ml"
4845
(* Copyright (C) 2017 Authors of BuckleScript
@@ -87,16 +84,7 @@ let get_dev_index ( ) = 1
8784

8885

8986

90-
(** bsb generate pre-defined variables [bsc_group_i_includes]
91-
for each rule, there is variable [bsc_extra_excludes]
92-
[g_dev_incls] are for app test etc
93-
it will be like
94-
{[
95-
g_dev_incls = ${bsc_group_1_includes}
96-
]}
97-
where [bsc_group_1_includes] will be pre-calcuated
98-
*)
99-
let bsc_dev_includes = "bsc_group_1_includes"
87+
10088

10189

10290

lib/4.06.1/unstable/bsb_native.ml

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,9 +3319,6 @@ val of_int : int -> t
33193319

33203320

33213321

3322-
val bsc_dev_includes : string
3323-
3324-
33253322
end = struct
33263323
#1 "bsb_dir_index.ml"
33273324
(* Copyright (C) 2017 Authors of BuckleScript
@@ -3366,16 +3363,7 @@ let get_dev_index ( ) = 1
33663363

33673364

33683365

3369-
(** bsb generate pre-defined variables [bsc_group_i_includes]
3370-
for each rule, there is variable [bsc_extra_excludes]
3371-
[g_dev_incls] are for app test etc
3372-
it will be like
3373-
{[
3374-
g_dev_incls = ${bsc_group_1_includes}
3375-
]}
3376-
where [bsc_group_1_includes] will be pre-calcuated
3377-
*)
3378-
let bsc_dev_includes = "bsc_group_1_includes"
3366+
33793367

33803368

33813369

@@ -13556,24 +13544,16 @@ let handle_generators oc
1355613544
let make_common_shadows
1355713545
package_specs
1355813546
dirname
13559-
dir_index
1356013547
: Bsb_ninja_targets.shadow list
1356113548
=
1356213549

13563-
{ key = Bsb_ninja_global_vars.g_pkg_flg;
13550+
[{ key = Bsb_ninja_global_vars.g_pkg_flg;
1356413551
op =
1356513552
Append
1356613553
(Bsb_package_specs.package_flag_of_package_specs
1356713554
package_specs dirname
1356813555
)
13569-
} ::
13570-
(if Bsb_dir_index.is_lib_dir dir_index then [] else
13571-
[
13572-
{ key = Bsb_ninja_global_vars.g_dev_incls;
13573-
op = OverwriteVar (Bsb_dir_index.bsc_dev_includes );
13574-
}
13575-
]
13576-
)
13556+
}]
1357713557

1357813558

1357913559

@@ -13612,7 +13592,7 @@ let emit_module_build
1361213592
let common_shadows =
1361313593
make_common_shadows package_specs
1361413594
(Filename.dirname output_cmi)
13615-
group_dir_index in
13595+
in
1361613596
let ast_rule =
1361713597
if is_re then
1361813598
rules.build_ast_from_re
@@ -13947,7 +13927,7 @@ let output_ninja_and_namespace_map
1394713927
Bsb_db_util.conflict_module_info k a (Map_string.find_exn lib k)
1394813928
) ;
1394913929
Bsb_ninja_targets.output_kv
13950-
Bsb_dir_index.bsc_dev_includes
13930+
Bsb_ninja_global_vars.g_dev_incls
1395113931
(Bsb_build_util.include_dirs source_dirs.(1)) oc
1395213932
;
1395313933
bs_groups,source_dirs.(0), static_resources

0 commit comments

Comments
 (0)