From f7ab9583b1de7b5fd7741c5fc2e0a676c19e94f1 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 13 Feb 2017 14:17:37 +0100 Subject: Qt Creator: Add separate build of CDB extension That allows to include the 64bit extension in the 32bit installer and vice versa, without using the special, static binaryartifacts repository. Change-Id: Ica2932224fa1af8f41701c0f9fa53716fcd71602 Reviewed-by: David Schulz Reviewed-by: Iikka Eklund --- packaging-tools/bld_qtcreator.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'packaging-tools/bld_qtcreator.py') diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py index f958d4ff8..15b2be710 100755 --- a/packaging-tools/bld_qtcreator.py +++ b/packaging-tools/bld_qtcreator.py @@ -171,6 +171,12 @@ if __name__ == "__main__": '..', 'qt-creator_install')) qtCreatorTempDevDirectory = os.path.abspath(os.path.join(qtCreatorSourceDirectory, '..', 'qt-creator_dev')) + if bldinstallercommon.is_win_platform(): + cdbextSourceDirectory = os.path.join(qtCreatorSourceDirectory, 'src', 'libs', 'qtcreatorcdbext') + cdbextBuildDirectory = os.path.abspath(os.path.join(qtCreatorSourceDirectory, + '..', 'cdbextension_build')) + cdbextInstallDirectory = os.path.abspath(os.path.join(qtCreatorSourceDirectory, + '..', 'cdbextension_install')) tempPath = os.path.abspath(os.path.join(qtCreatorSourceDirectory, '..', 'qt-creator_temp')) @@ -188,6 +194,9 @@ if __name__ == "__main__": bldinstallercommon.remove_tree(callerArguments.qt5path) bldinstallercommon.remove_tree(qtCreatorBuildDirectory) bldinstallercommon.remove_tree(qtCreatorInstallDirectory) + if bldinstallercommon.is_win_platform(): + bldinstallercommon.remove_tree(cdbextBuildDirectory) + bldinstallercommon.remove_tree(cdbextInstallDirectory) bldinstallercommon.remove_tree(tempPath) if not os.path.lexists(callerArguments.qt5path) and not callerArguments.qt_modules: @@ -276,6 +285,20 @@ if __name__ == "__main__": runInstallCommand('dmg', qtCreatorBuildDirectory, callerArguments = callerArguments, init_environment = environment) + # cdbextension + if bldinstallercommon.is_win_platform(): + runCommand([qmakeBinary, 'QTC_PREFIX=' + cdbextInstallDirectory, 'CONFIG+=' + buildType, cdbextSourceDirectory], + cdbextBuildDirectory, callerArguments = callerArguments, init_environment = environment) + runBuildCommand(currentWorkingDirectory = cdbextBuildDirectory, + callerArguments = callerArguments, init_environment = environment) + runInstallCommand('install', currentWorkingDirectory = cdbextBuildDirectory, + callerArguments = callerArguments, init_environment = environment) + runCommand(['7z.exe', 'a', '-mx9', os.path.join(qtCreatorBuildDirectory, 'qtcreatorcdbext.7z'), + os.path.join(cdbextInstallDirectory, '*')], + currentWorkingDirectory = qtCreatorBuildDirectory, callerArguments = callerArguments, + init_environment = environment) + + # dev package bldinstallercommon.remove_tree(qtCreatorTempDevDirectory) runCommand(['python', '-u', os.path.join(qtCreatorSourceDirectory, 'scripts', 'createDevPackage.py'), '--source', qtCreatorSourceDirectory, '--build', qtCreatorBuildDirectory, -- cgit v1.2.3