diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-05 09:37:07 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-05 10:45:23 +0100 |
| commit | 8bea8816ba7472b972698d98b8230e8d2d6a8f8c (patch) | |
| tree | 21e59eeaa7909047f1e5c247d105f00e443f3b02 /qtcreator.pro | |
| parent | 210e54bfde6a2828e3b7e173db1c0d589127a150 (diff) | |
| download | qt-creator-8bea8816ba7472b972698d98b8230e8d2d6a8f8c.tar.gz | |
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 <eike.ziller@digia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index a35f884d10..0ade76ddb8 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 |