Commit bb06a56a authored by Michael Bruning's avatar Michael Bruning Committed by Michael Brüning
Browse files

Fix ninja for shadow builds on windows.


xcopy seems to behave differently for than cp when copying
directories recursively.

Change-Id: I5130a0642511fb796d9b32e0d4cd2cd2b9153dc0
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
Showing with 6 additions and 2 deletions
...@@ -167,8 +167,12 @@ defineReplace(findOrBuildNinja) { ...@@ -167,8 +167,12 @@ defineReplace(findOrBuildNinja) {
log("Build directory is different from source directory - copying ninja sources to the build tree...") log("Build directory is different from source directory - copying ninja sources to the build tree...")
shadow_3rd_party_path = $$system_path($$shadowed($$src_3rd_party_dir)) shadow_3rd_party_path = $$system_path($$shadowed($$src_3rd_party_dir))
!exists($$dirname(out)): mkpath($$shadow_3rd_party_path) !exists($$dirname(out)): mkpath($$dirname(out))
system("$$QMAKE_COPY_DIR $$system_quote($$system_path($$absolute_path("ninja", "$$src_3rd_party_dir"))) $$system_quote($$shadow_3rd_party_path)") copy_dir_files {
system("$$QMAKE_COPY_DIR $$system_quote($$system_path($$absolute_path("ninja", "$$src_3rd_party_dir"))) $$system_quote($$dirname(out))")
} else {
system("$$QMAKE_COPY_DIR $$system_quote($$system_path($$absolute_path("ninja", "$$src_3rd_party_dir"))) $$system_quote($$shadow_3rd_party_path)")
}
} }
system("cd $$system_quote($$dirname(out)) && python configure.py --bootstrap") system("cd $$system_quote($$dirname(out)) && python configure.py --bootstrap")
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment