From f22e68463231e8338740433f2772e3e783517240 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 27 Apr 2018 15:34:29 +0200 Subject: Only call copydata once when using the debug_and_release config Task-number: AUTOSUITE-291 Change-Id: Ia1e8a58e645c2b7792f91b7309417cb35a45221a Reviewed-by: Bramastyo Harimukti Santoso --- copydata.pro | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/copydata.pro b/copydata.pro index 8a6b6d9c..237417c7 100644 --- a/copydata.pro +++ b/copydata.pro @@ -1,16 +1,19 @@ TEMPLATE = aux -# Copy all QML files during the build time -DIRECTORIES = apps dev/apps imports sysui styles -FILES = am-config.yaml Main.qml server.conf +# 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 sysui styles + FILES = am-config.yaml Main.qml server.conf -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) -} -for (f , FILES) { - do_copydata.commands += $(COPY) $$shell_path($$PWD/$${f}) $$shell_path($$OUT_PWD/$${f}) $$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) + } + for (f , FILES) { + do_copydata.commands += $(COPY) $$shell_path($$PWD/$${f}) $$shell_path($$OUT_PWD/$${f}) $$escape_expand(\n\t) + } -first.depends = do_copydata -!equals(PWD, $$OUT_PWD):QMAKE_EXTRA_TARGETS += first do_copydata + first.depends = do_copydata + !equals(PWD, $$OUT_PWD):QMAKE_EXTRA_TARGETS += first do_copydata +} -- cgit v1.2.3