Hi, Nils in your pull request to fix Ardour appdata https://github.com/Ardour/ardour/pull/261 there's a comment by x42 that says it would break bundle-scripts, 'revision' is expected in the 2nd line. So I modified your first commit to let revision stay in the 2nd line, as Paul suggested in the PR. This patch should be applied after your commit 0f1915a7162a0f64d01 AppData release tags need a date to be valid I'm attaching my patch, maybe this could help accept the PR Bye Guido Aulisi
From bc6e617d1df5587d54bce40a7ac1e2f9e72896fe Mon Sep 17 00:00:00 2001
From: Guido Aulisi <guido.aulisi@xxxxxxxxx>
Date: Sun, 21 May 2017 12:31:12 +0200
Subject: [PATCH] AppData: 'revision' in revision.cc is expected in the 2nd
line
---
wscript | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/wscript b/wscript
index ed10c32..434ab2a 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(' ')
+ 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(' ')
+ date = raw_line_tokens[4].translate(remove_punctuation_map)
return rev, date
@@ -287,8 +289,7 @@ def create_stored_revision():
#
text = '#include "ardour/revision.h"\n'
text += (
- 'namespace ARDOUR { '
- 'const char* revision = \"%s\"; '
+ 'namespace ARDOUR { const char* revision = \"%s\";\n'
'const char* date = \"%s\"; }\n'
) % (rev, rev_date)
print('Writing revision info to libs/ardour/revision.cc using ' + rev + ', ' + rev_date)
--
2.9.4
Attachment:
signature.asc
Description: This is a digitally signed message part
_______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
