Qt Creator: Add separate build of CDB extensionv5.9.0-alpha1-packaging

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 <david.schulz@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

2 files changed, 26 insertions, 0 deletions

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,
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py
index 22d749da2..ba7aeafde 100644
--- a/packaging-tools/build_wrapper.py
+++ b/packaging-tools/build_wrapper.py
@@ -694,6 +694,9 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins):
             file_upload_list.append((plugin_name, target_env_dir + '/' + plugin_name))
         if os.path.isfile(os.path.join(WORK_DIR, plugin_dev_name)):
             file_upload_list.append((plugin_dev_name, target_env_dir + '/' + plugin_dev_name))
+    if bldinstallercommon.is_win_platform():
+        file_upload_list.append(('qt-creator_build/qtcreatorcdbext.7z', target_env_dir + '/qtcreatorcdbext.7z'))
+        snapshot_upload_list.append((target_env_dir + '/qtcreatorcdbext.7z', 'installer_source/' + target_env_dir + '/qtcreatorcdbext.7z'))
 
     # upload files
     for source, destination in file_upload_list: