diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-12-14 15:29:03 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-15 14:18:01 +0000 |
| commit | fd54a377fed0e925678c6572b786ae371cd64aef (patch) | |
| tree | 9f7444fa9423933e5506f7d32b4d8bfe9db1b0b4 /qtcreator.pro | |
| parent | c0aaba0868b1eda7cddf3f4defcfe3855b62d151 (diff) | |
Add make target for creating packages with debug info
Add a script that creates either a release binary package,
or a package with debug info, from a Qt Creator build with
CONFIG+=force_debug_info CONFIG+=separate_debug_info
Run "make bindist_installer" for the release package
and "make bindist_debug" for the package with only debug info.
First step for QTCREATORBUG-13002
Change-Id: I9d45db7f41f4af956221f6feb7c4e8ca7154892e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index b5f48709cd..3fa3ac2ed7 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -110,7 +110,6 @@ linux { 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}\" \"$$[QT_INSTALL_BINS]\" \"$$[QT_INSTALL_TRANSLATIONS]\" \"$$[QT_INSTALL_PLUGINS]\" \"$$[QT_INSTALL_IMPORTS]\" \"$$[QT_INSTALL_QML]\" codesign.commands = codesign --deep -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${APPBUNDLE}\" dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin $${BASENAME}.dmg @@ -118,7 +117,7 @@ macx { QMAKE_EXTRA_TARGETS += codesign dmg } else { BINDIST_SOURCE = "$(INSTALL_ROOT)$$QTC_PREFIX" - BINDIST_INSTALLER_SOURCE = "$$BINDIST_SOURCE/*" + BINDIST_EXCLUDE_ARG = "--exclude-toplevel" deployqt.commands = python -u $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\" \"$(QMAKE)\" deployqt.depends = install win32 { @@ -138,10 +137,12 @@ isEmpty(INSTALLER_ARCHIVE_FROM_ENV) { INSTALLER_ARCHIVE = $$OUT_PWD/$$(INSTALLER_ARCHIVE) } -#bindist.depends = deployqt -bindist.commands = 7z a -mx9 $$OUT_PWD/$${BASENAME}.7z \"$$BINDIST_SOURCE\" -#bindist_installer.depends = deployqt -bindist_installer.commands = 7z a -mx9 $${INSTALLER_ARCHIVE} \"$$BINDIST_INSTALLER_SOURCE\" +INSTALLER_ARCHIVE_DEBUG = $$INSTALLER_ARCHIVE +INSTALLER_ARCHIVE_DEBUG ~= s/(.*)[.]7z/\1-debug.7z + +bindist.commands = $$PWD/scripts/createDistPackage.py $$OUT_PWD/$${BASENAME}.7z \"$$BINDIST_SOURCE\" +bindist_installer.commands = $$PWD/scripts/createDistPackage.py $$BINDIST_EXCLUDE_ARG $${INSTALLER_ARCHIVE} \"$$BINDIST_SOURCE\" +bindist_debug.commands = $$PWD/scripts/createDistPackage.py --debug $$BINDIST_EXCLUDE_ARG $${INSTALLER_ARCHIVE_DEBUG} \"$$BINDIST_SOURCE\" win32 { deployqt.commands ~= s,/,\\\\,g @@ -149,4 +150,4 @@ win32 { bindist_installer.commands ~= s,/,\\\\,g } -QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer +QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer bindist_debug |