diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-01-16 12:20:09 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-01-20 15:03:28 +0000 |
| commit | 3e811d6068ad7b992f5578eaec824ea41c0f7100 (patch) | |
| tree | 5c25bdb26153c776a1356cf22756a30fbd4b2561 /packaging-tools/bld_qtcreator.py | |
| parent | b17909bf698b944c323c658870335352a165c390 (diff) | |
Qt Creator: Fix retrieval of commit SHAsv5.14.1-packaging
With the sources from COIN we do not have a real git repository anymore,
but it writes the SHA into the .tag file.
Generalize a get_commit_SHA function that first tries git, then tries
.tag.
Change-Id: Ibd4637769d8e3e6024d8beec16fd22cda0d8b0ca
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'packaging-tools/bld_qtcreator.py')
| -rwxr-xr-x | packaging-tools/bld_qtcreator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py index 4a1326560..f82d9e385 100755 --- a/packaging-tools/bld_qtcreator.py +++ b/packaging-tools/bld_qtcreator.py @@ -52,7 +52,7 @@ import sys # own imports from threadedwork import ThreadedWork -from bld_utils import gitSHA, runBuildCommand, runCommand, runInstallCommand, stripVars +from bld_utils import get_commit_SHA, runBuildCommand, runCommand, runInstallCommand, stripVars import bldinstallercommon def add_commandline_arguments(parser): @@ -264,7 +264,7 @@ if __name__ == "__main__": buildType = 'debug' else: buildType = 'release' - buildGitSHA = gitSHA(qtCreatorSourceDirectory, callerArguments) + buildGitSHA = get_commit_SHA(qtCreatorSourceDirectory, callerArguments) qtCreatorProFile = os.path.join(qtCreatorSourceDirectory, 'qtcreator.pro') qmakeCommand = [qmakeBinary, qtCreatorProFile, |