aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-01-18 10:20:54 +0100
committerEike Ziller <eike.ziller@qt.io>2018-01-23 12:42:14 +0000
commitd719c4568e2c26e449ca47906ca44ca5f4c36a3a (patch)
tree03c5f387d63dbe9286f05106400b1b1da6ba8158 /packaging-tools
parent475c59111188ff3c69e20e2cfd2616bc5999e3e6 (diff)
Qt Creator: Build, package and upload debug information
Task-number: QTCREATORBUG-13002 Change-Id: I92bbb2c3f05342fb6333216ab5cee0b6a1dd3ff3 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools')
-rwxr-xr-xpackaging-tools/bld_qtcreator.py7
-rw-r--r--packaging-tools/build_wrapper.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py
index 0e256ec9d..5f6d2bf5f 100755
--- a/packaging-tools/bld_qtcreator.py
+++ b/packaging-tools/bld_qtcreator.py
@@ -256,7 +256,9 @@ if __name__ == "__main__":
qmakeCommand = [qmakeBinary, qtCreatorProFile,
'QTC_PREFIX=' + qtCreatorInstallDirectory,
'DEFINES+=IDE_REVISION=' + buildGitSHA,
- 'CONFIG+=' + buildType]
+ 'CONFIG+=' + buildType,
+ 'CONFIG+=force_debug_info',
+ 'CONFIG+=separate_debug_info']
if bldinstallercommon.is_mac_platform():
qmakeCommand.append('QMAKE_MAC_SDK=macosx') # work around QTBUG-41238
@@ -303,6 +305,9 @@ if __name__ == "__main__":
runInstallCommand('bindist_installer', qtCreatorBuildDirectory, callerArguments = callerArguments,
init_environment = environment)
+ runInstallCommand('bindist_debug', qtCreatorBuildDirectory, callerArguments = callerArguments,
+ init_environment = environment)
+
if bldinstallercommon.is_mac_platform():
runInstallCommand('dmg', qtCreatorBuildDirectory,
callerArguments = callerArguments, init_environment = environment)
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py
index 34f02a2ec..da67428a1 100644
--- a/packaging-tools/build_wrapper.py
+++ b/packaging-tools/build_wrapper.py
@@ -911,8 +911,10 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins):
# installer 7z sources
file_upload_list.append(('qt-creator_build/qtcreator.7z', target_env_dir + '/qtcreator.7z'))
file_upload_list.append(('qt-creator_build/qtcreator_dev.7z', target_env_dir + '/qtcreator_dev.7z'))
+ file_upload_list.append(('qt-creator_build/qtcreator-debug.7z', target_env_dir + '/qtcreator-debug.7z'))
snapshot_upload_list.append((target_env_dir + '/qtcreator.7z', 'installer_source/' + target_env_dir + '/qtcreator.7z'))
snapshot_upload_list.append((target_env_dir + '/qtcreator_dev.7z', 'installer_source/' + target_env_dir + '/qtcreator_dev.7z'))
+ snapshot_upload_list.append((target_env_dir + '/qtcreator-debug.7z', 'installer_source/' + target_env_dir + '/qtcreator-debug.7z'))
for plugin in additional_plugins:
plugin_name = plugin.name + '.7z'
plugin_dev_name = plugin.name + '_dev.7z'