ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

allow to prefix tags with “<text>+”

Browse Source 
eg. mixbus+3.0 or mb+3.1-rc1
This commit is contained in:
Robin Gareus 2015-04-02 23:42:16 +02:00
parent eba21335b9
commit a842a69c16
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/x-win/package.sh
View File

@ -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

2
wscript
View File

@ -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