diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-17 15:47:35 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-19 07:44:17 +0000 |
| commit | 6217cea7ec291093cc54a211bc1700ecf5b43c5f (patch) | |
| tree | 28e40a26b870352aaa48cb675e754d6eb130b5d9 /packaging-tools/bld_qtcreator.py | |
| parent | ebc05c68b93c24faa732f89c3fae24782a13579d (diff) | |
Qt Creator: Use lists to run commands
Instead of strings that are split at whitespace. Much less error prone.
Change-Id: I4588d6aaf3d20eee63d93a39f6dac535db1eefc0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'packaging-tools/bld_qtcreator.py')
| -rwxr-xr-x | packaging-tools/bld_qtcreator.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py index d2102d53a..ec7cb7bdc 100755 --- a/packaging-tools/bld_qtcreator.py +++ b/packaging-tools/bld_qtcreator.py @@ -249,19 +249,21 @@ if __name__ == "__main__": buildGitSHA = gitSHA(qtCreatorSourceDirectory, callerArguments) qtCreatorProFile = os.path.join(qtCreatorSourceDirectory, 'qtcreator.pro') - qmakeCommandArguments = "{0} QTC_PREFIX={1} DEFINES+=IDE_REVISION={2} CONFIG+={3}".format( - qtCreatorProFile, qtCreatorInstallDirectory, buildGitSHA, buildType) + qmakeCommand = [qmakeBinary, qtCreatorProFile, + 'QTC_PREFIX=' + qtCreatorInstallDirectory, + 'DEFINES+=IDE_REVISION=' + buildGitSHA, + 'CONFIG+=' + buildType] if bldinstallercommon.is_mac_platform(): - qmakeCommandArguments += " QMAKE_MAC_SDK=macosx" # work around QTBUG-41238 + qmakeCommand.append('QMAKE_MAC_SDK=macosx') # work around QTBUG-41238 if bldinstallercommon.is_win_platform(): # allow app to run on Windows XP - qmakeCommandArguments += " QMAKE_LFLAGS_WINDOWS=/SUBSYSTEM:WINDOWS,5.01" + qmakeCommand.append('QMAKE_LFLAGS_WINDOWS=/SUBSYSTEM:WINDOWS,5.01') # skip compilation of cdbextension and wininterrupt, they are built separately below - qmakeCommandArguments += " QTC_SKIP_CDBEXT=1" - qmakeCommandArguments += " QTC_SKIP_WININTERRUPT=1" + qmakeCommand.append('QTC_SKIP_CDBEXT=1') + qmakeCommand.append('QTC_SKIP_WININTERRUPT=1') - runCommand("{0} {1}".format(qmakeBinary, qmakeCommandArguments), qtCreatorBuildDirectory, + runCommand(qmakeCommand, qtCreatorBuildDirectory, callerArguments = callerArguments, init_environment = environment) runBuildCommand(currentWorkingDirectory = qtCreatorBuildDirectory, callerArguments = callerArguments, @@ -273,7 +275,7 @@ if __name__ == "__main__": init_environment = environment) if not bldinstallercommon.is_mac_platform(): - runInstallCommand('install install_docs', currentWorkingDirectory = qtCreatorBuildDirectory, + runInstallCommand(['install', 'install_docs'], currentWorkingDirectory = qtCreatorBuildDirectory, callerArguments = callerArguments, init_environment = environment) runInstallCommand('deployqt', currentWorkingDirectory = qtCreatorBuildDirectory, callerArguments = callerArguments, |