Quote refmt in build.ninja

Reason changed the `refmt` command's defaults to output Reason syntax. To output binary, it's now `refmt --print binary`.

Author: chenglou

jscomp/bin/bsb.ml

@@ -26,7 +26,7 @@ let resources = "resources"
 let public = "public"
 let js_post_build = "js-post-build"
 let cmd = "cmd"
-let ninja = "ninja" 
+let ninja = "ninja"
 let package_specs = "package-specs"
 
 let generate_merlin = "generate-merlin"
@@ -39,6 +39,7 @@ let export_none = "none"
 
 let bsb_dir_group = "bsb_dir_group"
 let bsc_lib_includes = "bsc_lib_includes"
+
 end
 module Ext_pervasives : sig 
 #1 "ext_pervasives.mli"
@@ -7756,21 +7757,21 @@ end = struct
 
 let (//) = Ext_filename.combine
 
-(* we need copy package.json into [_build] since it does affect build output 
+(* we need copy package.json into [_build] since it does affect build output
    it is a bad idea to copy package.json which requires to copy js files
 *)
 
-let merge_module_info_map acc sources = 
+let merge_module_info_map acc sources =
   String_map.merge (fun modname k1 k2 ->
       match k1 , k2 with
       | None , None ->
         assert false
       | Some a, Some b  ->
-        failwith ("conflict files found: " ^ modname ^ "in ("   
+        failwith ("conflict files found: " ^ modname ^ "in ("
                   ^  Binary_cache.dir_of_module_info a ^ " " ^ Binary_cache.dir_of_module_info b ^  " )")
       | Some v, None  -> Some v
       | None, Some v ->  Some v
-    ) acc  sources 
+    ) acc  sources
 
 
 let output_ninja
@@ -7799,7 +7800,7 @@ let output_ninja
       output_string oc "bs_package_flags = ";
       begin match package_name with
         | None -> ()
-        | Some x -> 
+        | Some x ->
           output_string oc ("-bs-package-name "  ^ x  )
       end;
       output_string oc "\n";
@@ -7812,51 +7813,51 @@ let output_ninja
           "bsc_flags", bsc_flags ;
           "ppx_flags", ppx_flags;
           "bs_package_includes", (Bsb_build_util.flag_concat "-bs-package-include" bs_dependencies);
-          "refmt", refmt;
+          "refmt", "\"" ^ refmt ^ "\"";
           Bsb_build_schemas.bsb_dir_group, "0"  (*TODO: avoid name conflict in the future *)
         |] oc ;
     in
-    let  static_resources = 
-      let number_of_dev_groups = Bsb_build_ui.get_current_number_of_dev_groups () in 
-      if number_of_dev_groups = 0 then 
+    let  static_resources =
+      let number_of_dev_groups = Bsb_build_ui.get_current_number_of_dev_groups () in
+      if number_of_dev_groups = 0 then
         let bs_groups, source_dirs,static_resources  =
           List.fold_left (fun (acc, dirs,acc_resources) ({Bsb_build_ui.sources ; dir; resources }) ->
               merge_module_info_map  acc  sources ,  dir::dirs , (List.map (fun x -> dir // x ) resources) @ acc_resources
             ) (String_map.empty,[],[]) bs_file_groups in
-        Binary_cache.write_build_cache (builddir // Binary_cache.bsbuild_cache) [|bs_groups|] ; 
+        Binary_cache.write_build_cache (builddir // Binary_cache.bsbuild_cache) [|bs_groups|] ;
         Bsb_ninja.output_kv
           Bsb_build_schemas.bsc_lib_includes (Bsb_build_util.flag_concat "-I" @@ (bs_external_includes @ source_dirs  ))  oc ;
         static_resources
-      else 
-        let bs_groups = Array.init  (number_of_dev_groups + 1 ) (fun i -> String_map.empty) in 
-        let source_dirs = Array.init (number_of_dev_groups + 1 ) (fun i -> []) in 
-        let static_resources = 
-          List.fold_left (fun acc_resources  ({Bsb_build_ui.sources; dir; resources; dir_index})  -> 
+      else
+        let bs_groups = Array.init  (number_of_dev_groups + 1 ) (fun i -> String_map.empty) in
+        let source_dirs = Array.init (number_of_dev_groups + 1 ) (fun i -> []) in
+        let static_resources =
+          List.fold_left (fun acc_resources  ({Bsb_build_ui.sources; dir; resources; dir_index})  ->
               bs_groups.(dir_index) <- merge_module_info_map bs_groups.(dir_index) sources ;
               source_dirs.(dir_index) <- dir :: source_dirs.(dir_index);
-              (List.map (fun x -> dir//x) resources) @ resources     
-            ) [] bs_file_groups in 
+              (List.map (fun x -> dir//x) resources) @ resources
+            ) [] bs_file_groups in
         (* Make sure [sources] does not have files in [lib] we have to check later *)
-        let lib = bs_groups.(0) in 
-        Bsb_ninja.output_kv 
+        let lib = bs_groups.(0) in
+        Bsb_ninja.output_kv
           Bsb_build_schemas.bsc_lib_includes (Bsb_build_util.flag_concat "-I" @@ (bs_external_includes @ source_dirs.(0))) oc ;
-        for i = 1 to number_of_dev_groups  do 
-          let c = bs_groups.(i) in             
+        for i = 1 to number_of_dev_groups  do
+          let c = bs_groups.(i) in
           String_map.iter (fun k _ -> if String_map.mem k lib then failwith ("conflict files found:" ^ k)) c ;
-          Bsb_ninja.output_kv (Bsb_build_util.string_of_bsb_dev_include i)            
-            (Bsb_build_util.flag_concat "-I" @@ source_dirs.(i)) oc 
+          Bsb_ninja.output_kv (Bsb_build_util.string_of_bsb_dev_include i)
+            (Bsb_build_util.flag_concat "-I" @@ source_dirs.(i)) oc
         done  ;
-        Binary_cache.write_build_cache (builddir // Binary_cache.bsbuild_cache) bs_groups ; 
+        Binary_cache.write_build_cache (builddir // Binary_cache.bsbuild_cache) bs_groups ;
         static_resources;
-    in     
+    in
     let all_info =
-      Bsb_ninja.handle_file_groups oc       
+      Bsb_ninja.handle_file_groups oc
         ~js_post_build_cmd  ~package_specs bs_file_groups Bsb_ninja.zero  in
-    let () = 
+    let () =
       List.iter (fun x -> Bsb_ninja.output_build oc
                     ~output:x
                     ~input:(Bsb_config.proj_rel x)
-                    ~rule:Bsb_ninja.Rules.copy_resources) static_resources in         
+                    ~rule:Bsb_ninja.Rules.copy_resources) static_resources in
     Bsb_ninja.phony oc ~order_only_deps:(static_resources @ all_info.all_config_deps)
       ~inputs:[]
       ~output:Literals.build_ninja ;

jscomp/bsb/bsb_gen.ml

@@ -24,21 +24,21 @@
 
 let (//) = Ext_filename.combine
 
-(* we need copy package.json into [_build] since it does affect build output 
+(* we need copy package.json into [_build] since it does affect build output
    it is a bad idea to copy package.json which requires to copy js files
 *)
 
-let merge_module_info_map acc sources = 
+let merge_module_info_map acc sources =
   String_map.merge (fun modname k1 k2 ->
       match k1 , k2 with
       | None , None ->
         assert false
       | Some a, Some b  ->
-        failwith ("conflict files found: " ^ modname ^ "in ("   
+        failwith ("conflict files found: " ^ modname ^ "in ("
                   ^  Binary_cache.dir_of_module_info a ^ " " ^ Binary_cache.dir_of_module_info b ^  " )")
       | Some v, None  -> Some v
       | None, Some v ->  Some v
-    ) acc  sources 
+    ) acc  sources
 
 
 let output_ninja
@@ -67,7 +67,7 @@ let output_ninja
       output_string oc "bs_package_flags = ";
       begin match package_name with
         | None -> ()
-        | Some x -> 
+        | Some x ->
           output_string oc ("-bs-package-name "  ^ x  )
       end;
       output_string oc "\n";
@@ -80,51 +80,51 @@ let output_ninja
           "bsc_flags", bsc_flags ;
           "ppx_flags", ppx_flags;
           "bs_package_includes", (Bsb_build_util.flag_concat "-bs-package-include" bs_dependencies);
-          "refmt", refmt;
+          "refmt", "\"" ^ refmt ^ "\"";
           Bsb_build_schemas.bsb_dir_group, "0"  (*TODO: avoid name conflict in the future *)
         |] oc ;
     in
-    let  static_resources = 
-      let number_of_dev_groups = Bsb_build_ui.get_current_number_of_dev_groups () in 
-      if number_of_dev_groups = 0 then 
+    let  static_resources =
+      let number_of_dev_groups = Bsb_build_ui.get_current_number_of_dev_groups () in
+      if number_of_dev_groups = 0 then
         let bs_groups, source_dirs,static_resources  =
           List.fold_left (fun (acc, dirs,acc_resources) ({Bsb_build_ui.sources ; dir; resources }) ->
               merge_module_info_map  acc  sources ,  dir::dirs , (List.map (fun x -> dir // x ) resources) @ acc_resources
             ) (String_map.empty,[],[]) bs_file_groups in
-        Binary_cache.write_build_cache (builddir // Binary_cache.bsbuild_cache) [|bs_groups|] ; 
+        Binary_cache.write_build_cache (builddir // Binary_cache.bsbuild_cache) [|bs_groups|] ;
         Bsb_ninja.output_kv
           Bsb_build_schemas.bsc_lib_includes (Bsb_build_util.flag_concat "-I" @@ (bs_external_includes @ source_dirs  ))  oc ;
         static_resources
-      else 
-        let bs_groups = Array.init  (number_of_dev_groups + 1 ) (fun i -> String_map.empty) in 
-        let source_dirs = Array.init (number_of_dev_groups + 1 ) (fun i -> []) in 
-        let static_resources = 
-          List.fold_left (fun acc_resources  ({Bsb_build_ui.sources; dir; resources; dir_index})  -> 
+      else
+        let bs_groups = Array.init  (number_of_dev_groups + 1 ) (fun i -> String_map.empty) in
+        let source_dirs = Array.init (number_of_dev_groups + 1 ) (fun i -> []) in
+        let static_resources =
+          List.fold_left (fun acc_resources  ({Bsb_build_ui.sources; dir; resources; dir_index})  ->
               bs_groups.(dir_index) <- merge_module_info_map bs_groups.(dir_index) sources ;
               source_dirs.(dir_index) <- dir :: source_dirs.(dir_index);
-              (List.map (fun x -> dir//x) resources) @ resources     
-            ) [] bs_file_groups in 
+              (List.map (fun x -> dir//x) resources) @ resources
+            ) [] bs_file_groups in
         (* Make sure [sources] does not have files in [lib] we have to check later *)
-        let lib = bs_groups.(0) in 
-        Bsb_ninja.output_kv 
+        let lib = bs_groups.(0) in
+        Bsb_ninja.output_kv
           Bsb_build_schemas.bsc_lib_includes (Bsb_build_util.flag_concat "-I" @@ (bs_external_includes @ source_dirs.(0))) oc ;
-        for i = 1 to number_of_dev_groups  do 
-          let c = bs_groups.(i) in             
+        for i = 1 to number_of_dev_groups  do
+          let c = bs_groups.(i) in
           String_map.iter (fun k _ -> if String_map.mem k lib then failwith ("conflict files found:" ^ k)) c ;
-          Bsb_ninja.output_kv (Bsb_build_util.string_of_bsb_dev_include i)            
-            (Bsb_build_util.flag_concat "-I" @@ source_dirs.(i)) oc 
+          Bsb_ninja.output_kv (Bsb_build_util.string_of_bsb_dev_include i)
+            (Bsb_build_util.flag_concat "-I" @@ source_dirs.(i)) oc
         done  ;
-        Binary_cache.write_build_cache (builddir // Binary_cache.bsbuild_cache) bs_groups ; 
+        Binary_cache.write_build_cache (builddir // Binary_cache.bsbuild_cache) bs_groups ;
         static_resources;
-    in     
+    in
     let all_info =
-      Bsb_ninja.handle_file_groups oc       
+      Bsb_ninja.handle_file_groups oc
         ~js_post_build_cmd  ~package_specs bs_file_groups Bsb_ninja.zero  in
-    let () = 
+    let () =
       List.iter (fun x -> Bsb_ninja.output_build oc
                     ~output:x
                     ~input:(Bsb_config.proj_rel x)
-                    ~rule:Bsb_ninja.Rules.copy_resources) static_resources in         
+                    ~rule:Bsb_ninja.Rules.copy_resources) static_resources in
     Bsb_ninja.phony oc ~order_only_deps:(static_resources @ all_info.all_config_deps)
       ~inputs:[]
       ~output:Literals.build_ninja ;