diff options
| -rwxr-xr-x | tools/x-win/package.sh | 4 | ||||
| -rw-r--r-- | wscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 610830f934..221a07bba4 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -76,9 +76,9 @@ test -f ${SRCDIR}/$1 || curl -k -L -o ${SRCDIR}/$1 $2 ################################################################################ set -e -ARDOURVERSION=$(git describe | sed 's/-g.*$//') +ARDOURVERSION=$(git describe | sed 's/^[A-Za-z]*+//;s/-g.*$//') ARDOURDATE=$(date -R) -BINVERSION=$(git describe | sed 's/-g.*$//;s/\-rc\([^-]*\)-/-rc\1./;s/-/./;s/-.*$//') +BINVERSION=$(git describe | sed 's/^[A-Za-z]*+//;s/-g.*$//;s/\-rc\([^-]*\)-/-rc\1./;s/-/./;s/-.*$//') if ! test -f build/gtk2_ardour/ardour-${BINVERSION}.exe; then echo "*** Please compile ardour ${ARDOURVERSION} first." exit 1 @@ -128,7 +128,7 @@ clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math', '-fstrength-red compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict; def fetch_git_revision (): - cmd = "git describe HEAD" + cmd = "git describe HEAD | sed 's/^[A-Za-z]*+//'" output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() rev = output[0].decode ('utf-8') return rev |