From 8bea8816ba7472b972698d98b8230e8d2d6a8f8c Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 5 Mar 2013 09:37:07 +0100 Subject: read INSTALLER_ARCHIVE variable from environment With that we can overwrite the default value which is not needed in the build package for SDK case. Change-Id: Ife33317a92149f812aafebf806743f3e322ead1d Reviewed-by: Eike Ziller --- qtcreator.pro | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'qtcreator.pro') diff --git a/qtcreator.pro b/qtcreator.pro index a35f884d101..0ade76ddb84 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -50,14 +50,19 @@ macx { } } -INSTALLER_ARCHIVE = $$OUT_PWD/qt-creator-$${PATTERN}-installer-archive.7z +INSTALLER_ARCHIVE_FROM_ENV = $$(INSTALLER_ARCHIVE) +isEmpty(INSTALLER_ARCHIVE_FROM_ENV) { + INSTALLER_ARCHIVE = $$OUT_PWD/qt-creator-$${PATTERN}-installer-archive.7z +} else { + INSTALLER_ARCHIVE = $$OUT_PWD/$$(INSTALLER_ARCHIVE) +} bindist.depends = deployqt bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}.7z \"$$BINDIST_SOURCE\" bindist_installer.depends = deployqt -bindist_installer.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}-installer-archive.7z \"$$BINDIST_INSTALLER_SOURCE\" +bindist_installer.commands = 7z a -mx9 $${INSTALLER_ARCHIVE} \"$$BINDIST_INSTALLER_SOURCE\" installer.depends = bindist_installer -installer.commands = $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -v $${QTCREATOR_VERSION} -a \"$$INSTALLER_ARCHIVE\" "qt-creator-$${PATTERN}" +installer.commands = $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -v $${QTCREATOR_VERSION} -a \"$${INSTALLER_ARCHIVE}\" "qt-creator-$${PATTERN}" win32 { deployqt.commands ~= s,/,\\\\,g -- cgit v1.2.3