Skip to content

fix installation copy rule for windows #4844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobzhang merged 2 commits into from
Nov 28, 2020
Merged

fix installation copy rule for windows #4844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bf9609
fix installation copy rule for windows
bobzhang Nov 28, 2020
5b39e82
update build engine
bobzhang Nov 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion jscomp/bsb/bsb_ninja_gen.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion lib/4.06.1/bsb.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ninja
Open in desktop
Submodule ninja updated 2 files
+2 −1 .gitignore
+1 −1 src/clean.cc
Binary file modified win32/ninja.exe
View file
Open in desktop
Binary file not shown.