From 5ffd2078da6eef5bbfc6ac2233973dd1cd99d44c Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Sun, 21 May 2017 12:31:12 +0200 Subject: AppData: 'revision' in revision.cc is expected in the 2nd line Signed-off-by: Nils Philippsen --- wscript | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/wscript b/wscript index bd82f3b3e9..c3465c076b 100644 --- a/wscript +++ b/wscript @@ -166,11 +166,9 @@ def fetch_tarball_revision_date(): content = f.readlines() remove_punctuation_map = dict((ord(char), None) for char in '";') - 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) + 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 @@ -310,10 +308,9 @@ def create_stored_revision(): # text = '#include "ardour/revision.h"\n' text += ( - 'namespace ARDOUR {\n' - ' const char* revision = \"%s\";\n' - ' const char* date = \"%s\";\n' - '}\n') % (rev, rev_date) + '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) -- cgit v1.2.3