From 154f6c859ea9f0fb35f3a8e2ad9566fd9126d3ab Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 26 Sep 2012 12:04:46 +0200 Subject: Add installer target. Requires Qt Installer Framwork (IFW) Change-Id: Id78c05f86cc104d29d4ed3ba02baefa20d49fe4f Reviewed-by: Tim Jenssen --- qtcreator.pro | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'qtcreator.pro') diff --git a/qtcreator.pro b/qtcreator.pro index 4720d20b0e..587f17633e 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -27,6 +27,7 @@ PATTERN = $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX) macx { APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app" BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app" + BINDIST_INSTALLER_SOURCE = $$BINDIST_SOURCE deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" codesign.commands = codesign -s \"$(SIGNING_IDENTITY)\" \"$${APPBUNDLE}\" dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-$${PATTERN}.dmg @@ -34,6 +35,7 @@ macx { QMAKE_EXTRA_TARGETS += codesign dmg } else { BINDIST_SOURCE = "$(INSTALL_ROOT)$$QTC_PREFIX" + BINDIST_INSTALLER_SOURCE = "$$BINDIST_SOURCE/*" deployqt.commands = $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\" deployqt.depends = install win32 { @@ -43,13 +45,20 @@ macx { } } +INSTALLER_ARCHIVE = $$OUT_PWD/qt-creator-$${PATTERN}-installer-archive.7z + +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\" +installer.depends = bindist_installer +installer.commands = $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -s $${QTCREATOR_VERSION} -a \"$$INSTALLER_ARCHIVE\" "qt-creator-$${PATTERN}-installer" win32 { deployqt.commands ~= s,/,\\\\,g bindist.commands ~= s,/,\\\\,g + bindist_installer.commands ~= s,/,\\\\,g + installer.commands ~= s,/,\\\\,g } -bindist.depends = deployqt - -QMAKE_EXTRA_TARGETS += deployqt bindist +QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer installer -- cgit v1.2.1