summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2017-11-07 09:24:24 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2017-11-08 11:23:40 +0000
commit117d066458357d34342637b5d71246373a77c818 (patch)
tree29214a1ec7c54e97ef84c44b97cab19d3c0ef277 /mkspecs
parenta632be8a1ccab4e395d10ba90288adb2df4ec43b (diff)
downloadqtivi-117d066458357d34342637b5d71246373a77c818.tar.gz
Use the same sleep 1 trick on all platforms
This is needed to give make a chance to detect that the timestamp of a target has changed. Change-Id: Ibe07f50168adabd1917f21d0718a7705c8670b77 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/ivigenerator.prf7
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf
index b65b34f..92dab86 100644
--- a/mkspecs/features/ivigenerator.prf
+++ b/mkspecs/features/ivigenerator.prf
@@ -65,9 +65,12 @@ PRI = $$QFACE_OUTPUT_DIR/$$lower($${QFACE_BASE_NAME}).pri
IVI_GENERATOR_OPTIONS = --format=$$QFACE_FORMAT
!isEmpty(QFACE_MODULE_NAME): IVI_GENERATOR_OPTIONS += --module=$$QFACE_MODULE
+# Windows doesn't offer any other way to sleep for a time inside non-interactive scripts
+equals(QMAKE_HOST.os, Windows): SLEEP = ping -n 2 127.0.0.1 >nul
+else: SLEEP = sleep 1
+
qface_sources.target = $$relative_path($$PRI, $$OUT_PWD)
-macos: qface_sources.commands = sleep 1 && $$ENV $$shell_path($$IVI_GENERATOR) $$IVI_GENERATOR_OPTIONS $$shell_path($$QFACE_ABS_PWD/$${QFACE_FILE}) $$shell_path($$QFACE_OUTPUT_DIR)
-else: qface_sources.commands = $$ENV $$shell_path($$IVI_GENERATOR) $$IVI_GENERATOR_OPTIONS $$shell_path($$QFACE_ABS_PWD/$${QFACE_FILE}) $$shell_path($$QFACE_OUTPUT_DIR)
+qface_sources.commands = $$SLEEP && $$ENV $$shell_path($$IVI_GENERATOR) $$IVI_GENERATOR_OPTIONS $$shell_path($$QFACE_ABS_PWD/$${QFACE_FILE}) $$shell_path($$QFACE_OUTPUT_DIR)
qface_sources.depends = $$IVI_GENERATOR_PATH/generate.py
# Add all templates of the generator format as dependency