From 2cd169996ea56015b06b739bbcc7ff0b67d17435 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Sat, 13 Aug 2016 14:38:28 +0200
Subject: [PATCH 1/2] AppData release tags need a date to be valid
Or a timestamp, but that's deprecated. Create it from the last commit,
store it in/retrieve it from revision.cc and substitute it in the
template.
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-releases
---
gtk2_ardour/ardour.appdata.xml.in.in | 2 +-
gtk2_ardour/wscript | 1 +
wscript | 44 ++++++++++++++++++++++++------------
3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/gtk2_ardour/ardour.appdata.xml.in.in b/gtk2_ardour/ardour.appdata.xml.in.in
index 1b2b940..9b8421a 100644
--- a/gtk2_ardour/ardour.appdata.xml.in.in
+++ b/gtk2_ardour/ardour.appdata.xml.in.in
@@ -5,7 +5,7 @@
<project_license>GPL-2.0+</project_license>
<name>Ardour</name>
<releases>
- <release version="@VERSION@" />
+ <release version="@VERSION@" date="@DATE@" />
</releases>
<summary>Digital Audio Workstation</summary>
<description>
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index fdbe726..3a14b7f 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -775,6 +775,7 @@ def build(bld):
'ARDOUR_EXEC' : str (bld.env['lwrcase_dirname']),
'ARDOUR_ICON' : str (bld.env['lwrcase_dirname']),
'VERSION': str (bld.env['VERSION']),
+ 'DATE': str (bld.env['DATE']),
}
if bld.env['FREEDESKTOP']:
diff --git a/wscript b/wscript
index cccb389..29a3b89 100644
--- a/wscript
+++ b/wscript
@@ -147,25 +147,35 @@ clang_darwin_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded
clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math']
compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict;
-def fetch_git_revision ():
- cmd = "git describe HEAD | sed 's/^[A-Za-z0-9]*+//'"
- output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
- rev = output[0].decode ('utf-8')
- return rev
+def fetch_git_revision_date ():
+ cmd = ["git", "describe", "HEAD"]
+ output = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+ rev = re.sub(r"^[A-Za-z0-9]*\+", "", output[0].decode('utf-8'))
+
+ cmd = ["git", "log", "-1", "--pretty=format:%ci", "HEAD"]
+ output = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+ date = output[0].decode('utf-8').split(None, 2)[0]
+
+ return rev, date
-def fetch_tarball_revision ():
+def fetch_tarball_revision_date():
if not os.path.exists ('libs/ardour/revision.cc'):
print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc')
sys.exit (1)
with open('libs/ardour/revision.cc') as f:
content = f.readlines()
remove_punctuation_map = dict((ord(char), None) for char in '";')
- return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
+ raw_line_tokens = content[1].decode('utf-8').strip().split(' ')
+
+ rev = raw_line_tokens[7].translate(remove_punctuation_map)
+ date = raw_line_tokens[12].translate(remove_punctuation_map)
+
+ return rev, date
if os.path.isdir (os.path.join(os.getcwd(), '.git')):
- rev = fetch_git_revision ()
+ rev, rev_date = fetch_git_revision_date()
else:
- rev = fetch_tarball_revision ()
+ rev, rev_date = fetch_tarball_revision_date()
#
# rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
@@ -260,7 +270,7 @@ def fetch_gcc_version (CC):
def create_stored_revision():
rev = ""
if os.path.exists('.git'):
- rev = fetch_git_revision();
+ rev, rev_date = fetch_git_revision_date();
print("Git version: " + rev + "\n")
elif os.path.exists('libs/ardour/revision.cc'):
print("Using packaged revision")
@@ -271,12 +281,16 @@ def create_stored_revision():
try:
#
- # if you change the format of this, be sure to fix fetch_tarball_revision() above
- # so that it still works.
+ # if you change the format of this, be sure to fix fetch_tarball_revision_date()
+ # above so that it still works.
#
text = '#include "ardour/revision.h"\n'
- text += 'namespace ARDOUR { const char* revision = \"%s\"; }\n' % rev
- print('Writing revision info to libs/ardour/revision.cc using ' + rev)
+ text += (
+ 'namespace ARDOUR { '
+ 'const char* revision = \"%s\"; '
+ 'const char* date = \"%s\"; }\n'
+ ) % (rev, rev_date)
+ print('Writing revision info to libs/ardour/revision.cc using ' + rev + ', ' + rev_date)
o = open('libs/ardour/revision.cc', 'w')
o.write(text)
o.close()
@@ -1252,6 +1266,8 @@ const char* const ardour_config_info = "\\n\\
def build(bld):
create_stored_revision()
+ bld.env['DATE'] = rev_date
+
# add directories that contain only headers, to workaround an issue with waf
if not bld.is_defined('USE_EXTERNAL_LIBS'):
--
2.7.4
From c4874807ca2d9e09b8c990b5aab5537f13cf0208 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 6 Oct 2016 09:49:00 +0200
Subject: [PATCH 2/2] Appdata: adapt define_versions.sh to changes
Generate and parse revision.cc with one item per line for this.
---
tools/define_versions.sh | 12 ++++++------
wscript | 16 +++++++++-------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/tools/define_versions.sh b/tools/define_versions.sh
index 37eca61..7e25dd8 100644
--- a/tools/define_versions.sh
+++ b/tools/define_versions.sh
@@ -10,13 +10,13 @@ fi
GIT_REV_REGEXP='([0-9][0-9]*)\.([0-9][0-9]*)\-?([pr][rc]e?[0-9]*)?-?([0-9][0-9]*)?(-g([a-f0-9]+))?'
-major_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\1/"`
-minor_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\2/"`
+major_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e '1,2d;4,$d' -e "s/$GIT_REV_REGEXP/\1/"`
+minor_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e '1,2d;4,$d' -e "s/$GIT_REV_REGEXP/\2/"`
# Tracks tags with "MAJOR.MINOR.MICRO"
# Ardour doesn't use this
-micro_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\3/"`
+micro_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e '1,2d;4,$d' -e "s/$GIT_REV_REGEXP/\3/"`
#
# RC e.g. 8.1-rc3 (optional)
@@ -25,17 +25,17 @@ micro_version=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE
#
# Tracks does not use -rcN based tagging
#
-rc=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\3/"`
+rc=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e '1,2d;4,$d' -e "s/$GIT_REV_REGEXP/\3/"`
#
# revision count since tag
#
-r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\4/"`
+r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e '1,2d;4,$d' -e "s/$GIT_REV_REGEXP/\4/"`
#
# git short sha1 commit ID
#
-commit=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e 1d -e "s/$GIT_REV_REGEXP/\6/"`
+commit=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed $EXTENDED_RE -e '1,2d;4,$d' -e "s/$GIT_REV_REGEXP/\6/"`
if [ "x$rc" != "x" ] ; then
revcount=$rc${r:+.$r}
diff --git a/wscript b/wscript
index 29a3b89..cc3c8c8 100644
--- a/wscript
+++ b/wscript
@@ -165,10 +165,12 @@ def fetch_tarball_revision_date():
with open('libs/ardour/revision.cc') as f:
content = f.readlines()
remove_punctuation_map = dict((ord(char), None) for char in '";')
- raw_line_tokens = content[1].decode('utf-8').strip().split(' ')
- rev = raw_line_tokens[7].translate(remove_punctuation_map)
- date = raw_line_tokens[12].translate(remove_punctuation_map)
+ raw_line_tokens = content[2].decode('utf-8').strip().split(' ')
+ rev = raw_line_tokens[4].translate(remove_punctuation_map)
+
+ raw_line_tokens = content[3].decode('utf-8').strip().split(' ')
+ date = raw_line_tokens[4].translate(remove_punctuation_map)
return rev, date
@@ -286,10 +288,10 @@ def create_stored_revision():
#
text = '#include "ardour/revision.h"\n'
text += (
- 'namespace ARDOUR { '
- 'const char* revision = \"%s\"; '
- 'const char* date = \"%s\"; }\n'
- ) % (rev, rev_date)
+ 'namespace ARDOUR {\n'
+ ' const char* revision = \"%s\";\n'
+ ' const char* date = \"%s\";\n'
+ '}\n') % (rev, rev_date)
print('Writing revision info to libs/ardour/revision.cc using ' + rev + ', ' + rev_date)
o = open('libs/ardour/revision.cc', 'w')
o.write(text)
--
2.7.4