Merge pull request #4844 from rescript-lang/install_fix_for_windows

bobzhang · web-flow · commit 2a2cb272d55c · 2020-11-28T12:52:22.000+08:00
fix installation copy rule for windows
diff --git a/jscomp/bsb/bsb_ninja_gen.ml b/jscomp/bsb/bsb_ninja_gen.ml
@@ -107,7 +107,11 @@ let output_installation_file cwd_lib_bs namespace files_to_install =
     o suffix; o "\n" in 
   let bs = ".."//"bs" in  
   let sb = ".."//".." in 
-  o "rule cp\n  command = cp $i $out\n";
+  o (if Ext_sys.is_windows_or_cygwin then 
+      "rule cp\n  command = cmd.exe /C copy /Y $i $out > null\n"
+    else
+      "rule cp\n  command = cp $i $out\n"
+    );
   files_to_install 
   |> Queue.iter (fun ({name_sans_extension;syntax_kind; info} : Bsb_db.module_info) -> 
       let base = Filename.basename name_sans_extension in 
diff --git a/lib/4.06.1/bsb.ml b/lib/4.06.1/bsb.ml
@@ -13610,7 +13610,11 @@ let output_installation_file cwd_lib_bs namespace files_to_install =
     o suffix; o "\n" in 
   let bs = ".."//"bs" in  
   let sb = ".."//".." in 
-  o "rule cp\n  command = cp $i $out\n";
+  o (if Ext_sys.is_windows_or_cygwin then 
+      "rule cp\n  command = cmd.exe /C copy /Y $i $out > null\n"
+    else
+      "rule cp\n  command = cp $i $out\n"
+    );
   files_to_install 
   |> Queue.iter (fun ({name_sans_extension;syntax_kind; info} : Bsb_db.module_info) -> 
       let base = Filename.basename name_sans_extension in 
diff --git a/ninja b/ninja
@@ -1 +1 @@
-Subproject commit a25eaf48154a71619911888f545c7be1538b2d2d
+Subproject commit 2017637aa3bb1044175dd0713050ddd7aef061bc
diff --git a/win32/ninja.exe b/win32/ninja.exe
