Commit 6cec6508 authored by Andrew Bauer's avatar Andrew Bauer
Browse files

Allowing catalyzing from a release version of PV

catalyze.py required doing a 'git describe' to successfully
get the PV version. Adding in getting the version from version.txt
if it's not a PV git repo which handles the case for release
versions from a tarball.
parent 1e4ef7b5
......@@ -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