diff --git a/CMakeLists.txt b/CMakeLists.txt index 0226e381..f18d977f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ project(flacon) set(MAJOR_VERSION 11) -set(MINOR_VERSION 2) +set(MINOR_VERSION 3) set(PATCH_VERSION 0) #set(BETA_VERSION beta1) diff --git a/misc/com.github.Flacon.metainfo.xml.in b/misc/com.github.Flacon.metainfo.xml.in index 874f8797..6cc08625 100644 --- a/misc/com.github.Flacon.metainfo.xml.in +++ b/misc/com.github.Flacon.metainfo.xml.in @@ -1,4 +1,4 @@ - + com.github.Flacon Flacon @@ -56,10 +56,11 @@ - +

Latest version of Flacon on Flathub.

- + + @@ -68,7 +69,7 @@ - + @@ -81,4 +82,4 @@ -
+ \ No newline at end of file diff --git a/misc/pre-commit b/misc/update-metainfo.py similarity index 90% rename from misc/pre-commit rename to misc/update-metainfo.py index ff7e9361..1be92cb1 100755 --- a/misc/pre-commit +++ b/misc/update-metainfo.py @@ -12,24 +12,24 @@ import subprocess # Get current version of the program -def get_version(): +def get_version(): major_ver = None minor_ver = None patch_ver = None beta_ver = None - with open('CMakeLists.txt') as f: + with open('../CMakeLists.txt') as f: n=1 for line in f: result = re.match(MAJOR_RE, line) if result: major_ver = result.group(1).strip() - + result = re.match(MINOR_RE, line) if result: minor_ver = result.group(1).strip() - + result = re.match(PATCH_RE, line) if result: patch_ver = result.group(1).strip() @@ -39,7 +39,7 @@ def get_version(): patch_ver = result.group(1).strip() - if n > 50: + if n > 50: break n+=1 @@ -61,18 +61,18 @@ def update_metainfo(file): return ver = "%s.%s.%s" % (major_ver, minor_ver, patch_ver) - + doc = ET.parse(file) if doc.find("./releases/release[@version='%s']" % ver): return False - + vers = {} vers[datetime.date.today().strftime("%Y-%m-%d")] = ver for r in doc.findall("./releases/release"): vers[r.attrib["date"]] = r.attrib["version"] - + releases = doc.find("./releases") releases.clear() releases.text = "\n" + (' ' * 4) @@ -80,13 +80,13 @@ def update_metainfo(file): for date in sorted(vers.keys(), reverse=True): release = ET.SubElement(releases, 'release') - release.attrib["version"] = vers[date] release.attrib["date"] = date + release.attrib["version"] = vers[date] release.tail = "\n" + (' ' * 4) if vers[date] == ver: release.text = "\n" + (' ' * 6) - + desc = ET.SubElement(release, "description") desc.tail = "\n" + (' ' * 4) @@ -96,10 +96,9 @@ def update_metainfo(file): release.tail = "\n" + (' ' * 2) - doc.write(file) - subprocess.check_call(["git", "add", file]) + doc.write(file, encoding='utf-8', xml_declaration=True) if __name__ == "__main__": - update_metainfo("misc/com.github.Flacon.metainfo.xml.in") - + update_metainfo("com.github.Flacon.metainfo.xml.in") +