aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgor Nemtsev <enemtsev@luxoft.com>2020-04-01 17:34:03 +0300
committerGrigorii Zimin <gzimin@luxoft.com>2020-04-06 07:50:03 +0000
commit7d1d76e64577ac9a6f242d15d38a2acefd069279 (patch)
treee56e9594a6d3a5813e2963710e3b5371ed4ca8a0
parent441445bcf70b6f53c334bf732198923bb05179dd (diff)
[sheets] fix folder copy on Windows
- when building from source, dev/apps folder with sheets app is copied to dev/apps folder and not visible to AppMan. This patch adds special case for dev/apps copy on windows Fixes: AUTOSUITE-1281 Change-Id: Ief27c03e86d3b46ea9f9e7653efe72348358ada8 Reviewed-by: Grigorii Zimin <gzimin@luxoft.com>
-rw-r--r--copydata.pro6
1 files changed, 5 insertions, 1 deletions
diff --git a/copydata.pro b/copydata.pro
index 043bffe5..c6e8454a 100644
--- a/copydata.pro
+++ b/copydata.pro
@@ -3,9 +3,13 @@ TEMPLATE = aux
# On a debug_and_release configuration, do the copying in the meta Makefile, not in the respective debug and release Makefiles
if(!debug_and_release | !build_pass) {
# Copy all QML files during the build time
- DIRECTORIES = apps dev/apps imports_shared imports_system sysui styles tests
+ DIRECTORIES = apps imports_shared imports_system sysui styles tests
FILES = am-config-neptune.yaml am-config-lucee.yaml Main.qml
+ # Special case for dev/apps folder as windows will put dev/apps into dev/apps in target folder
+ win32: do_copydata.commands += $(COPY_DIR) $$shell_path($$PWD/dev/apps) $$shell_path($$OUT_PWD/apps) $$escape_expand(\n\t)
+ else: do_copydata.commands += $(COPY_DIR) $$shell_path($$PWD/dev/apps) $$shell_path($$OUT_PWD) $$escape_expand(\n\t)
+
for (d , DIRECTORIES) {
win32: do_copydata.commands += $(COPY_DIR) $$shell_path($$PWD/$${d}) $$shell_path($$OUT_PWD/$${d}) $$escape_expand(\n\t)
else: do_copydata.commands += $(COPY_DIR) $$shell_path($$PWD/$${d}) $$shell_path($$OUT_PWD) $$escape_expand(\n\t)