From cfb75a2f79b1d4c20bf63514c492bd5d2a8a78ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Mon, 9 Apr 2018 20:50:54 -0300 Subject: [PATCH] linuxdeployqt: Check if EXCLUDELIST is empty or specified MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #273 Signed-off-by: Patrick José Pereira --- tools/linuxdeployqt/linuxdeployqt.pro | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/linuxdeployqt/linuxdeployqt.pro b/tools/linuxdeployqt/linuxdeployqt.pro index 999a5f2..bf3fe72 100644 --- a/tools/linuxdeployqt/linuxdeployqt.pro +++ b/tools/linuxdeployqt/linuxdeployqt.pro @@ -35,4 +35,13 @@ isEmpty(_BUILD_NUMBER) { } DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell cd $$PWD && git describe --tags $(shell cd $$PWD && git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'" -DEFINES += EXCLUDELIST=\""$$system($$_PRO_FILE_PWD_/../excludelist.sh)"\" +contains(DEFINES, EXCLUDELIST.*) { + message("EXCLUDELIST specified, to use the most recent exclude list, please run qmake without EXCLUDELIST definition and with internet.") +} else { + message("Creating exclude list.") + EXCLUDELIST = $$system($$_PRO_FILE_PWD_/../excludelist.sh) + isEmpty(EXCLUDELIST) { + error("You must have internet to update EXCLUDELIST or define it in qmake.") + } + DEFINES += EXCLUDELIST=\""$$EXCLUDELIST"\" +}