Skip to content

Commit bbfae12

Browse files
bobzhangbobzhang
committed
Not passing arguments for some paths which is not going to change during the lifetime of bsb
1 parent a4b64b5 commit bbfae12

File tree

7 files changed

+72
-39
lines changed

7 files changed

+72
-39
lines changed

‎jscomp/bsb/bsb_global_paths.ml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,20 @@ let bsc_dir =
5050
(Ext_path.normalize_absolute_path
5151
(Ext_path.combine cwd Sys.executable_name))
5252

53+
let vendor_bsc =
54+
Filename.concat bsc_dir "bsc.exe"
55+
56+
5357
let vendor_ninja =
5458
Filename.concat bsc_dir "ninja.exe"
5559

56-
60+
let vendor_bsdep =
61+
Filename.concat bsc_dir "bsb_helper.exe"
62+
63+
64+
let vendor_bsppx =
65+
Filename.concat bsc_dir "bsppx.exe"
66+
5767
;; assert (Sys.file_exists bsc_dir)
5868

5969

‎jscomp/bsb/bsb_global_paths.mli

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2424

2525

26-
val cwd : string
26+
val cwd : string
2727

28-
val bsc_dir : string
28+
val bsc_dir : string
2929

30-
val vendor_ninja : string
31-
30+
val vendor_bsc : string
31+
32+
val vendor_ninja : string
33+
34+
val vendor_bsdep : string
35+
36+
val vendor_bsppx : string

‎jscomp/bsb/bsb_ninja_gen.ml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ let (//) = Ext_path.combine
3131

3232

3333

34-
let bsc_exe = "bsc.exe"
35-
let bsb_helper_exe = "bsb_helper.exe"
3634
let dash_i = "-I"
3735

3836

@@ -158,9 +156,9 @@ let output_ninja_and_namespace_map
158156
Bsb_ninja_global_vars.g_pkg_flg, g_pkg_flg ;
159157
Bsb_ninja_global_vars.src_root_dir, cwd (* TODO: need check its integrity -- allow relocate or not? *);
160158
(* The path to [bsc.exe] independent of config *)
161-
Bsb_ninja_global_vars.bsc, (Ext_filename.maybe_quote (Bsb_global_paths.bsc_dir // bsc_exe));
159+
Bsb_ninja_global_vars.bsc, (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsc);
162160
(* The path to [bsb_heler.exe] *)
163-
Bsb_ninja_global_vars.bsdep, (Ext_filename.maybe_quote (Bsb_global_paths.bsc_dir // bsb_helper_exe)) ;
161+
Bsb_ninja_global_vars.bsdep, (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep) ;
164162
Bsb_ninja_global_vars.warnings, Bsb_warning.opt_warning_to_string ~toplevel warning ;
165163
Bsb_ninja_global_vars.bsc_flags, (get_bsc_flags ~toplevel bsc_flags) ;
166164
Bsb_ninja_global_vars.ppx_flags, ppx_flags;

‎jscomp/bsb/bsb_ninja_gen.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2424

2525
(**
26-
generate ninja file based on [cwd] and [bsc_dir]
26+
generate ninja file based on [cwd]
2727
*)
2828
val output_ninja_and_namespace_map :
2929
cwd:string ->

‎jscomp/bsb/bsb_ninja_regen.ml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
let bsdeps = ".bsdeps"
2626

27-
let bsppx_exe = "bsppx.exe"
28-
2927
let (//) = Ext_path.combine
3028

3129
(** Regenerate ninja file by need based on [.bsdeps]
@@ -74,7 +72,7 @@ let regenerate_ninja
7472
config.file_groups
7573
;
7674
Bsb_merlin_gen.merlin_file_gen ~cwd
77-
(Bsb_global_paths.bsc_dir // bsppx_exe) config;
75+
(Bsb_global_paths.vendor_bsppx) config;
7876
Bsb_ninja_gen.output_ninja_and_namespace_map
7977
~cwd ~toplevel config ;
8078

‎lib/4.02.3/bsb.ml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9870,12 +9870,17 @@ module Bsb_global_paths : sig
98709870
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
98719871

98729872

9873-
val cwd : string
9873+
val cwd : string
98749874

9875-
val bsc_dir : string
9875+
val bsc_dir : string
98769876

9877-
val vendor_ninja : string
9878-
9877+
val vendor_bsc : string
9878+
9879+
val vendor_ninja : string
9880+
9881+
val vendor_bsdep : string
9882+
9883+
val vendor_bsppx : string
98799884
end = struct
98809885
#1 "bsb_global_paths.ml"
98819886
(* Copyright (C) 2019 - Authors of BuckleScript
@@ -9930,10 +9935,20 @@ let bsc_dir =
99309935
(Ext_path.normalize_absolute_path
99319936
(Ext_path.combine cwd Sys.executable_name))
99329937

9938+
let vendor_bsc =
9939+
Filename.concat bsc_dir "bsc.exe"
9940+
9941+
99339942
let vendor_ninja =
99349943
Filename.concat bsc_dir "ninja.exe"
99359944

9936-
9945+
let vendor_bsdep =
9946+
Filename.concat bsc_dir "bsb_helper.exe"
9947+
9948+
9949+
let vendor_bsppx =
9950+
Filename.concat bsc_dir "bsppx.exe"
9951+
99379952
;; assert (Sys.file_exists bsc_dir)
99389953

99399954

@@ -13260,7 +13275,7 @@ module Bsb_ninja_gen : sig
1326013275
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
1326113276

1326213277
(**
13263-
generate ninja file based on [cwd] and [bsc_dir]
13278+
generate ninja file based on [cwd]
1326413279
*)
1326513280
val output_ninja_and_namespace_map :
1326613281
cwd:string ->
@@ -13302,8 +13317,6 @@ let (//) = Ext_path.combine
1330213317

1330313318

1330413319

13305-
let bsc_exe = "bsc.exe"
13306-
let bsb_helper_exe = "bsb_helper.exe"
1330713320
let dash_i = "-I"
1330813321

1330913322

@@ -13429,9 +13442,9 @@ let output_ninja_and_namespace_map
1342913442
Bsb_ninja_global_vars.g_pkg_flg, g_pkg_flg ;
1343013443
Bsb_ninja_global_vars.src_root_dir, cwd (* TODO: need check its integrity -- allow relocate or not? *);
1343113444
(* The path to [bsc.exe] independent of config *)
13432-
Bsb_ninja_global_vars.bsc, (Ext_filename.maybe_quote (Bsb_global_paths.bsc_dir // bsc_exe));
13445+
Bsb_ninja_global_vars.bsc, (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsc);
1343313446
(* The path to [bsb_heler.exe] *)
13434-
Bsb_ninja_global_vars.bsdep, (Ext_filename.maybe_quote (Bsb_global_paths.bsc_dir // bsb_helper_exe)) ;
13447+
Bsb_ninja_global_vars.bsdep, (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep) ;
1343513448
Bsb_ninja_global_vars.warnings, Bsb_warning.opt_warning_to_string ~toplevel warning ;
1343613449
Bsb_ninja_global_vars.bsc_flags, (get_bsc_flags ~toplevel bsc_flags) ;
1343713450
Bsb_ninja_global_vars.ppx_flags, ppx_flags;
@@ -13902,8 +13915,6 @@ end = struct
1390213915

1390313916
let bsdeps = ".bsdeps"
1390413917

13905-
let bsppx_exe = "bsppx.exe"
13906-
1390713918
let (//) = Ext_path.combine
1390813919

1390913920
(** Regenerate ninja file by need based on [.bsdeps]
@@ -13952,7 +13963,7 @@ let regenerate_ninja
1395213963
config.file_groups
1395313964
;
1395413965
Bsb_merlin_gen.merlin_file_gen ~cwd
13955-
(Bsb_global_paths.bsc_dir // bsppx_exe) config;
13966+
(Bsb_global_paths.vendor_bsppx) config;
1395613967
Bsb_ninja_gen.output_ninja_and_namespace_map
1395713968
~cwd ~toplevel config ;
1395813969

‎lib/4.02.3/unstable/bsb_native.ml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9870,12 +9870,17 @@ module Bsb_global_paths : sig
98709870
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
98719871

98729872

9873-
val cwd : string
9873+
val cwd : string
98749874

9875-
val bsc_dir : string
9875+
val bsc_dir : string
98769876

9877-
val vendor_ninja : string
9878-
9877+
val vendor_bsc : string
9878+
9879+
val vendor_ninja : string
9880+
9881+
val vendor_bsdep : string
9882+
9883+
val vendor_bsppx : string
98799884
end = struct
98809885
#1 "bsb_global_paths.ml"
98819886
(* Copyright (C) 2019 - Authors of BuckleScript
@@ -9930,10 +9935,20 @@ let bsc_dir =
99309935
(Ext_path.normalize_absolute_path
99319936
(Ext_path.combine cwd Sys.executable_name))
99329937

9938+
let vendor_bsc =
9939+
Filename.concat bsc_dir "bsc.exe"
9940+
9941+
99339942
let vendor_ninja =
99349943
Filename.concat bsc_dir "ninja.exe"
99359944

9936-
9945+
let vendor_bsdep =
9946+
Filename.concat bsc_dir "bsb_helper.exe"
9947+
9948+
9949+
let vendor_bsppx =
9950+
Filename.concat bsc_dir "bsppx.exe"
9951+
99379952
;; assert (Sys.file_exists bsc_dir)
99389953

99399954

@@ -13359,7 +13374,7 @@ module Bsb_ninja_gen : sig
1335913374
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
1336013375

1336113376
(**
13362-
generate ninja file based on [cwd] and [bsc_dir]
13377+
generate ninja file based on [cwd]
1336313378
*)
1336413379
val output_ninja_and_namespace_map :
1336513380
cwd:string ->
@@ -13401,8 +13416,6 @@ let (//) = Ext_path.combine
1340113416

1340213417

1340313418

13404-
let bsc_exe = "bsc.exe"
13405-
let bsb_helper_exe = "bsb_helper.exe"
1340613419
let dash_i = "-I"
1340713420

1340813421

@@ -13528,9 +13541,9 @@ let output_ninja_and_namespace_map
1352813541
Bsb_ninja_global_vars.g_pkg_flg, g_pkg_flg ;
1352913542
Bsb_ninja_global_vars.src_root_dir, cwd (* TODO: need check its integrity -- allow relocate or not? *);
1353013543
(* The path to [bsc.exe] independent of config *)
13531-
Bsb_ninja_global_vars.bsc, (Ext_filename.maybe_quote (Bsb_global_paths.bsc_dir // bsc_exe));
13544+
Bsb_ninja_global_vars.bsc, (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsc);
1353213545
(* The path to [bsb_heler.exe] *)
13533-
Bsb_ninja_global_vars.bsdep, (Ext_filename.maybe_quote (Bsb_global_paths.bsc_dir // bsb_helper_exe)) ;
13546+
Bsb_ninja_global_vars.bsdep, (Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep) ;
1353413547
Bsb_ninja_global_vars.warnings, Bsb_warning.opt_warning_to_string ~toplevel warning ;
1353513548
Bsb_ninja_global_vars.bsc_flags, (get_bsc_flags ~toplevel bsc_flags) ;
1353613549
Bsb_ninja_global_vars.ppx_flags, ppx_flags;
@@ -14001,8 +14014,6 @@ end = struct
1400114014

1400214015
let bsdeps = ".bsdeps"
1400314016

14004-
let bsppx_exe = "bsppx.exe"
14005-
1400614017
let (//) = Ext_path.combine
1400714018

1400814019
(** Regenerate ninja file by need based on [.bsdeps]
@@ -14051,7 +14062,7 @@ let regenerate_ninja
1405114062
config.file_groups
1405214063
;
1405314064
Bsb_merlin_gen.merlin_file_gen ~cwd
14054-
(Bsb_global_paths.bsc_dir // bsppx_exe) config;
14065+
(Bsb_global_paths.vendor_bsppx) config;
1405514066
Bsb_ninja_gen.output_ninja_and_namespace_map
1405614067
~cwd ~toplevel config ;
1405714068

0 commit comments

Comments
 (0)