summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2015-08-25 14:26:59 -0700
committerJohn Stebbins <[email protected]>2015-11-09 08:39:48 -0800
commit341c4dde353deb88dc5cb8244bd9d5418166d5f1 (patch)
treeade96ef6c7bb15b2fb63188cbbe107095e8358e1
parent2ae0de42922185fd1b23751c58d8a1ff671f52be (diff)
build: fix errors in last commit
Thanks BradleyS
-rw-r--r--make/configure.py2
-rwxr-xr-xscripts/repo-info.sh4
-rwxr-xr-xscripts/tag-release.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/make/configure.py b/make/configure.py
index c5bcf915f..4e342ec6e 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -797,7 +797,7 @@ class Project( Action ):
url_arch = ''
if repo.tag != '':
- m = re.match( '([0-9]+)\.([0-9]+)\.([0-9]+)', repo.tag )
+ m = re.match( '^([0-9]+)\.([0-9]+)\.([0-9]+)$', repo.tag )
if not m:
cfg.errln( 'Invalid repo tag format %s\n', repo.tag )
sys.exit( 1 )
diff --git a/scripts/repo-info.sh b/scripts/repo-info.sh
index 72d974d04..675a2cf62 100755
--- a/scripts/repo-info.sh
+++ b/scripts/repo-info.sh
@@ -43,7 +43,7 @@ if [[ ${TAG} ]]; then
else
TAG=$(${GIT_EXE} describe $(${GIT_EXE} rev-list --tags --max-count=1))
if [[ ${TAG} ]]; then
- REV=$(${GIT_EXE} rev-list $(${GIT_EXE} merge-base 0.10.2 HEAD).. --count)
+ REV=$(${GIT_EXE} rev-list $(${GIT_EXE} merge-base ${TAG} HEAD).. --count)
else
REV=$(${GIT_EXE} rev-list HEAD --count)
fi
@@ -57,7 +57,7 @@ fi
DATE=$(${GIT_EXE} log -1 --format="format:%ai")
# Output
-# Only write tag and rev if they exist. A fresh clone currently has no tags.
+# Only write tag and rev if they exist.
echo "URL=${URL}"
echo "HASH=${HASH}"
if [[ ${TAG} ]]; then echo "TAG=${TAG}"; fi
diff --git a/scripts/tag-release.sh b/scripts/tag-release.sh
index 64f98103e..66e33e308 100755
--- a/scripts/tag-release.sh
+++ b/scripts/tag-release.sh
@@ -38,7 +38,7 @@ if [ ${ERR} -ne 0 ]; then
exit ${ERR}
fi
-# creat tag
+# create tag
git tag -a "${TAG}" -m "Release ${TAG}" HEAD
ERR=$?
if [ ${ERR} -ne 0 ]; then