Skip to content

Commit b9ecc3d

Browse files
committed
work around windows path escaping rules
Note this was not exposed because we used to have: ``` src_root = C:\Users\xx\yy|x.t .... $src_root\heelo.txt ``` In this case `:` is read via ReadVar, it is not escaped, if we follow the pattern of build statement, we should have it escaped properly for `:`
1 parent 2a2cb27 commit b9ecc3d

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

darwin/ninja.exe

0 Bytes
Binary file not shown.

jscomp/bsb/bsb_ninja_gen.ml

+8-6
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,14 @@ let output_ninja_and_namespace_map
243243
let finger_file =
244244
fun (x : Bsb_config_types.dependency) -> x.package_install_path //".ninja_log"
245245
in
246-
Bsb_ninja_targets.output_finger
247-
Bsb_ninja_global_vars.g_finger
248-
(String.concat " "
249-
(Ext_list.map_append bs_dependencies
250-
(Ext_list.map bs_dev_dependencies finger_file) finger_file))
251-
oc ;
246+
Ext_list.iter bs_dependencies (fun x ->
247+
Bsb_ninja_targets.output_finger Bsb_ninja_global_vars.g_finger
248+
(finger_file x) oc
249+
);
250+
Ext_list.iter bs_dev_dependencies (fun x ->
251+
Bsb_ninja_targets.output_finger Bsb_ninja_global_vars.g_finger
252+
(finger_file x) oc
253+
);
252254
(match gentype_config with
253255
| None -> ()
254256
| Some x -> output_string oc ("cleaner = " ^ x.path ^ "\n"));

lib/4.06.1/bsb.ml

+8-6
Original file line numberDiff line numberDiff line change
@@ -13746,12 +13746,14 @@ let output_ninja_and_namespace_map
1374613746
let finger_file =
1374713747
fun (x : Bsb_config_types.dependency) -> x.package_install_path //".ninja_log"
1374813748
in
13749-
Bsb_ninja_targets.output_finger
13750-
Bsb_ninja_global_vars.g_finger
13751-
(String.concat " "
13752-
(Ext_list.map_append bs_dependencies
13753-
(Ext_list.map bs_dev_dependencies finger_file) finger_file))
13754-
oc ;
13749+
Ext_list.iter bs_dependencies (fun x ->
13750+
Bsb_ninja_targets.output_finger Bsb_ninja_global_vars.g_finger
13751+
(finger_file x) oc
13752+
);
13753+
Ext_list.iter bs_dev_dependencies (fun x ->
13754+
Bsb_ninja_targets.output_finger Bsb_ninja_global_vars.g_finger
13755+
(finger_file x) oc
13756+
);
1375513757
(match gentype_config with
1375613758
| None -> ()
1375713759
| Some x -> output_string oc ("cleaner = " ^ x.path ^ "\n"));

ninja

0 commit comments

Comments
 (0)