Qt Creator: Build cdbextension with python

Change-Id: Ifa4914998a23d5aa9cc6c852ffe8ae4a19552921
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

1 files changed, 9 insertions, 1 deletions

diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py
index 0870585c7..5e0274568 100755
--- a/packaging-tools/bld_qtcreator.py
+++ b/packaging-tools/bld_qtcreator.py
@@ -153,6 +153,8 @@ if __name__ == "__main__":
     if bldinstallercommon.is_mac_platform():
         parser.add_argument('--keychain_unlock_script', help="script for unlocking the keychain used for signing")
         parser.epilog += " --keychain_unlock_script $HOME/unlock-keychain.sh"
+    if bldinstallercommon.is_win_platform():
+        parser.add_argument('--pythonpath', help="path to python libraries for use by cdbextension")
 
     parser.epilog += " --qt5path qtcreator_qt5"
     callerArguments = parser.parse_args()
@@ -294,12 +296,18 @@ if __name__ == "__main__":
 
     if bldinstallercommon.is_win_platform():
         # cdbextension
-        runCommand([qmakeBinary, 'QTC_PREFIX=' + cdbextInstallDirectory, 'CONFIG+=' + buildType, cdbextSourceDirectory],
+        cdbextQmakeArgs = [qmakeBinary, 'QTC_PREFIX=' + cdbextInstallDirectory, 'CONFIG+=' + buildType]
+        if callerArguments.pythonpath:
+            qmakeCommandArguments.append('PYTHON_INSTALL_DIR=' + callerArguments.pythonpath)
+        runCommand(cdbextQmakeArgs + [cdbextSourceDirectory],
                    cdbextBuildDirectory, callerArguments = callerArguments, init_environment = environment)
         runBuildCommand(currentWorkingDirectory = cdbextBuildDirectory,
                         callerArguments = callerArguments, init_environment = environment)
         runInstallCommand('install', currentWorkingDirectory = cdbextBuildDirectory,
                           callerArguments = callerArguments, init_environment = environment)
+        if callerArguments.pythonpath:
+            runInstallCommand('deploy_python', 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,