diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-09-26 12:01:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-27 19:11:45 +0200 |
| commit | 14a2ff598aec6af17299580468e75a95055c8894 (patch) | |
| tree | 7a552c9dcf1938a8b48289da86eef4a5ea1d9c54 /qtcreator.pro | |
| parent | cef7f0869f0c26d7187dada506ce8d6cdb5ffe89 (diff) | |
| download | qt-creator-14a2ff598aec6af17299580468e75a95055c8894.tar.gz | |
Consolidate the bindist make target setup
Change-Id: Ic6928f2eab43930dc1920bd774798e899a76cabd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index e7363548ce..4720d20b0e 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -17,32 +17,39 @@ unix:!macx:!isEmpty(copydata):SUBDIRS += bin OTHER_FILES += dist/copyright_template.txt \ $$files(dist/changes-*) +macx: PLATFORM = "mac" +else:win32: PLATFORM = "windows" +else:linux-*: PLATFORM = "linux-$${QT_ARCH}" +else: PLATFORM = "unknown" + +PATTERN = $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX) + macx { APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app" + BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app" deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" codesign.commands = codesign -s \"$(SIGNING_IDENTITY)\" \"$${APPBUNDLE}\" - bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).7z \"$$OUT_PWD/bin/Qt Creator.app/\" - dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).dmg + dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-$${PATTERN}.dmg dmg.depends = deployqt QMAKE_EXTRA_TARGETS += codesign dmg } else { + BINDIST_SOURCE = "$(INSTALL_ROOT)$$QTC_PREFIX" deployqt.commands = $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\" deployqt.depends = install win32 { - bindist.commands ~= s,/,\\\\,g - deployqt.commands ~= s,/,\\\\,g deployartifacts.depends = install - PLATFORM="windows" deployartifacts.commands = git clone "git://gitorious.org/qt-creator/binary-artifacts.git"&& xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\"&& rmdir /s /q binary-artifacts QMAKE_EXTRA_TARGETS += deployartifacts } - else:linux-*: PLATFORM = "linux-$${QT_ARCH}" - else:PLATFORM = "unknown" - PATTERN = $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX) - bindist.commands = 7z a -mx9 qt-creator-$${PATTERN}.7z \"$(INSTALL_ROOT)$$QTC_PREFIX\" - win32 { - bindist.commands ~= s,/,\\\\,g - } +} + +bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}.7z \"$$BINDIST_SOURCE\" +win32 { + deployqt.commands ~= s,/,\\\\,g + bindist.commands ~= s,/,\\\\,g } + +bindist.depends = deployqt + QMAKE_EXTRA_TARGETS += deployqt bindist |