Commit dbddecac authored by Andrew Bauer's avatar Andrew Bauer Committed by Kitware Robot
Browse files

Merge topic 'catalyze_with_release_version'

6cec6508

 Allowing catalyzing from a release version of PV
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !2091
parents ce410094 6cec6508
Pipeline #84909 failed with stage
in 0 seconds
......@@ -257,7 +257,12 @@ $cmake \\
try:
version = subprocess.check_output(['git', 'describe'], cwd=config.repo)
except subprocess.CalledProcessError as err:
error(err)
try:
version_txt = open(config.repo+'/version.txt', 'r')
version = 'v'+version_txt.read()
except IOError:
err = config.repo+' is not a git repo and does not contain a versions.txt file'
error(err)
cmake_script+=' -DPARAVIEW_GIT_DESCRIBE="%s" \\\n' % version.strip()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment