steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build: fix semver_into so that it doesnt misparse versions like "2.3.4"

db4
Björn Lindqvist 2015-12-03 00:46:21 +01:00
parent bb43e27b86
commit f730f81c0e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build-support/factor.sh
View File

@ -113,22 +113,22 @@ set_md5sum() {
} }
semver_into() { semver_into() {
CLANG_RE_OLD="^([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3-5 RE_SEMVER="^([0-9]*)\.([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3.3-5
RE_SEMVER="^([0-9]*)\.([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3.3-5 CLANG_RE_OLD="^([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3-5
if [[ $1 =~ $CLANG_RE_OLD ]] ; then if [[ $1 =~ $RE_SEMVER ]] ; then
export "$2=${BASH_REMATCH[1]}" export "$2=${BASH_REMATCH[1]}"
export "$3=${BASH_REMATCH[2]}" export "$3=${BASH_REMATCH[2]}"
export "$4=0" export "$4=${BASH_REMATCH[3]}"
export "$5=${BASH_REMATCH[3]}" export "$5=${BASH_REMATCH[4]}"
elif [[ $1 =~ $RE_SEMVER ]] ; then elif [[ $1 =~ $CLANG_RE_OLD ]] ; then
export "$2=${BASH_REMATCH[1]}" export "$2=${BASH_REMATCH[1]}"
export "$3=${BASH_REMATCH[2]}" export "$3=${BASH_REMATCH[2]}"
export "$4=${BASH_REMATCH[3]}" export "$4=0"
export "$5=${BASH_REMATCH[4]}" export "$5=${BASH_REMATCH[3]}"
else else
echo "unsupported version number, please report a bug: $1" echo "unsupported version number, please report a bug: $1"
exit 123 exit 123
fi fi
} }
# issue 1440 # issue 1440