quote include paths

Author: bobzhang

jscomp/bsb/bsb_build_util.ml

@@ -44,10 +44,16 @@ let ppx_flags (xs : Bsb_config_types.ppx list) =
 let pp_flag (xs : string) = 
    "-pp " ^ Ext_filename.maybe_quote xs
 
-let include_dirs = flag_concat "-I"
+let include_dirs dirs = 
+  String.concat Ext_string.single_space
+    (Ext_list.flat_map dirs (fun x -> ["-I"; Ext_filename.maybe_quote x]))
+
+
+let include_dirs_by dirs fn = 
+  String.concat Ext_string.single_space
+    (Ext_list.flat_map dirs (fun x -> ["-I"; Ext_filename.maybe_quote (fn x)]))
+
 
-let include_dirs_by xs fn = 
-  include_dirs (Ext_list.map xs fn)
 (* we use lazy $src_root_dir *)
 
 

lib/4.02.3/bsb.ml

@@ -9666,10 +9666,16 @@ let ppx_flags (xs : Bsb_config_types.ppx list) =
 let pp_flag (xs : string) = 
    "-pp " ^ Ext_filename.maybe_quote xs
 
-let include_dirs = flag_concat "-I"
+let include_dirs dirs = 
+  String.concat Ext_string.single_space
+    (Ext_list.flat_map dirs (fun x -> ["-I"; Ext_filename.maybe_quote x]))
+
+
+let include_dirs_by dirs fn = 
+  String.concat Ext_string.single_space
+    (Ext_list.flat_map dirs (fun x -> ["-I"; Ext_filename.maybe_quote (fn x)]))
+
 
-let include_dirs_by xs fn = 
-  include_dirs (Ext_list.map xs fn)
 (* we use lazy $src_root_dir *)
 
 

lib/4.02.3/unstable/bsb_native.ml

@@ -9666,10 +9666,16 @@ let ppx_flags (xs : Bsb_config_types.ppx list) =
 let pp_flag (xs : string) = 
    "-pp " ^ Ext_filename.maybe_quote xs
 
-let include_dirs = flag_concat "-I"
+let include_dirs dirs = 
+  String.concat Ext_string.single_space
+    (Ext_list.flat_map dirs (fun x -> ["-I"; Ext_filename.maybe_quote x]))
+
+
+let include_dirs_by dirs fn = 
+  String.concat Ext_string.single_space
+    (Ext_list.flat_map dirs (fun x -> ["-I"; Ext_filename.maybe_quote (fn x)]))
+
 
-let include_dirs_by xs fn = 
-  include_dirs (Ext_list.map xs fn)
 (* we use lazy $src_root_dir *)
 
 

scripts/install.js

@@ -99,7 +99,9 @@ function provideNinja() {
       "ninja binary is already cached and installed: ",
       ninja_bin_output
     );
-  } else if (fs.existsSync(ninja_os_path)) {
+    return;
+  }
+  if (fs.existsSync(ninja_os_path)) {
     if (fs.copyFileSync) {
       // ninja binary size is small
       fs.copyFileSync(ninja_os_path, ninja_bin_output);
@@ -108,12 +110,10 @@ function provideNinja() {
     }
     if (test_ninja_compatible(ninja_bin_output)) {
       console.log("ninja binary is copied from pre-distribution");
-    } else {
-      build_ninja();
+      return;
     }
-  } else {
-    build_ninja();
   }
+  build_ninja();
 }
 /**
  *
@@ -358,7 +358,7 @@ function provideCompiler() {
       ocamlopt: "ocamlopt.opt",
       ext: ".exe",
       INCL: ocamlVersion,
-      isWin : is_windows
+      isWin: is_windows
     });
 
     var filePath = path.join(lib_dir, "release.ninja");