Merge pull request #168 from rth/fix-version-tags

Fix versioning for tags starting with a "v"
This commit is contained in:
Michael Droettboom 2018-09-17 10:15:56 -04:00 committed by GitHub
commit 2e23079aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -162,7 +162,7 @@ root/.built: \
cp src/pyodide.py root/lib/python$(PYMINOR)/site-packages cp src/pyodide.py root/lib/python$(PYMINOR)/site-packages
if command -v git > /dev/null 2>&1 \ if command -v git > /dev/null 2>&1 \
&& git describe --tags > /dev/null 2>&1; then \ && git describe --tags > /dev/null 2>&1; then \
sed -i "s/__version__ =.*/__version__ = '$(shell git describe --tags)'/g" \ sed -i "s/__version__ =.*/__version__ = '$(shell git describe --tags | sed -r 's/^v//')'/g" \
root/lib/python$(PYMINOR)/site-packages/pyodide.py; \ root/lib/python$(PYMINOR)/site-packages/pyodide.py; \
fi fi
( \ ( \