Fix version-setting script

3 files changed, 16 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1466e1b5914d..c3000c0c5a59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jpexs-decompiler-git
 	pkgdesc = Opensource flash SWF decompiler and editor
 	pkgver = 11.2.0.r29.g5df2728a9
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = https://github.com/jindrapetrik/jpexs-decompiler
 	arch = any
@@ -15,7 +15,7 @@ pkgbase = jpexs-decompiler-git
 	source = git+https://github.com/jindrapetrik/jpexs-decompiler#branch=dev
 	source = put_version_into_build_xml.py
 	b2sums = SKIP
-	b2sums = 3932fd50ec25304a351af8c60c462c097556e7529f7e063560700c340fbb4a98e9f0af76328b73cb754e8184198c15d79c7d4d8e7f417730b11dbb05a632041e
+	b2sums = 2325e42b27731c9bbc64e6edc1f7632f8138838b1b6fcee9c1b68ad837f3f607610206cdbaf18585187746ef630cbef348b67b9cf165c247b77e8be29fa7ebb0
 
 pkgname = jpexs-decompiler-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 65daeeba5b92..5831becfd77d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=jpexs-decompiler
 pkgname=$_pkgname-git
 pkgver=11.2.0.r29.g5df2728a9
 epoch=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Opensource flash SWF decompiler and editor"
 arch=("any")
 url="https://github.com/jindrapetrik/jpexs-decompiler"
@@ -16,7 +16,7 @@ source=(
     'put_version_into_build_xml.py'
 )
 b2sums=('SKIP'
-        '3932fd50ec25304a351af8c60c462c097556e7529f7e063560700c340fbb4a98e9f0af76328b73cb754e8184198c15d79c7d4d8e7f417730b11dbb05a632041e')
+        '2325e42b27731c9bbc64e6edc1f7632f8138838b1b6fcee9c1b68ad837f3f607610206cdbaf18585187746ef630cbef348b67b9cf165c247b77e8be29fa7ebb0')
 
 java_8_home() {
     cd /usr/lib/jvm
diff --git a/put_version_into_build_xml.py b/put_version_into_build_xml.py
index 2408c86c8dc2..f5e0eabd55e4 100644
--- a/put_version_into_build_xml.py
+++ b/put_version_into_build_xml.py
@@ -17,7 +17,7 @@ def main():
 
     try:
         git_version = subprocess.check_output(
-            ['git', 'describe', '--long', '--tags'])
+            ['git', 'describe', '--long', '--tags', '--match', 'version*'])
     except subprocess.CalledProcessError:
         print('Call to git failed. Skipping...', file=sys.stderr)
         return
@@ -25,10 +25,9 @@ def main():
     mobj = re.match(
         r'''(?x)
             version
-            (?P<major>\d)\.
-            (?P<minor>\d)\.
-            (?P<release>\d)-
-            (?P<build>\d+)-.*''',
+            (?P<version>[^-]+)-
+            (?P<revcount>\d+)-
+            g(?P<hash>[0-9a-f]+)''',
         git_version.decode('utf-8'))
 
     if not mobj:
@@ -36,19 +35,18 @@ def main():
         return
 
     versions = {
-        'major': mobj.group('major'),
-        'minor': mobj.group('minor'),
-        'release': mobj.group('release'),
-        'build': mobj.group('build'),
+        'version': mobj.group('version'),
+        'revcount': mobj.group('revcount'),
+        'hash': mobj.group('hash'),
     }
 
-    print('Set version to %s.%s.%s' % (
-        versions['major'], versions['minor'], versions['release']))
+    print('Set version to %s.r%s (commit %s)' % (
+        versions['version'], versions['revcount'], versions['hash']))
 
-    for version_type in versions.keys():
-        path = './target/property[@name="version.%s"]' % version_type
+    for version_key, value in zip(['major', 'minor', 'release', 'build'], versions['version'].split('.')):
+        path = './target/property[@name="version.%s"]' % version_key
         for element in tree.findall(path):
-            element.set('value', str(versions[version_type]))
+            element.set('value', value)
 
     tree.write(build_xml_filename, encoding='UTF-8', xml_declaration=True)