diff options
author | István Váradi <ivaradi@varadiistvan.hu> | 2020-11-19 22:30:04 +0300 |
---|---|---|
committer | István Váradi <ivaradi@varadiistvan.hu> | 2020-11-30 17:33:34 +0300 |
commit | 3d9d5f2fe74f7b9e6e192bcb99f8a2336723269b (patch) | |
tree | 6ed2d043d7b5cc4ca8c0b27452dc085c42a5fe74 /admin | |
parent | 57e1f2ac07f8a5a064090285738ce47d885e5ce0 (diff) |
Handle the case when the release version differs from that in VERSION.cmake
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
Diffstat (limited to 'admin')
-rwxr-xr-x | admin/linux/debian/drone-build.sh | 2 | ||||
-rwxr-xr-x | admin/linux/debian/scripts/git2changelog.py | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/admin/linux/debian/drone-build.sh b/admin/linux/debian/drone-build.sh index 7b3dcde4b..d34f3f013 100755 --- a/admin/linux/debian/drone-build.sh +++ b/admin/linux/debian/drone-build.sh @@ -76,7 +76,7 @@ for distribution in ${UBUNTU_DISTRIBUTIONS} ${DEBIAN_DISTRIBUTIONS}; do git merge ${DRONE_COMMIT} - admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution} ${revdate} + admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution} ${revdate} ${basever} cat /tmp/tmpchangelog debian/changelog > debian/changelog.new mv debian/changelog.new debian/changelog diff --git a/admin/linux/debian/scripts/git2changelog.py b/admin/linux/debian/scripts/git2changelog.py index c2b9114dc..4516d0f67 100755 --- a/admin/linux/debian/scripts/git2changelog.py +++ b/admin/linux/debian/scripts/git2changelog.py @@ -31,7 +31,7 @@ def getCommitVersion(commit): try: for line in subprocess.check_output(["git", "show", commit + ":VERSION.cmake"]).splitlines(): - m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9])+ *\)", line) + m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9]+) *\)", line) if m is not None: kind=m.group(1) version=m.group(2) @@ -48,7 +48,7 @@ def getCommitVersion(commit): except: return None -def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config): +def collectEntries(baseCommit, baseVersion, kind, finalBaseVersion, finalRevDate, config): newVersionCommit = None newVersionTag = None @@ -89,7 +89,6 @@ def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config): newVersionOrigTag = lastVersionTag (baseVersion, _kind) = result - version=getCommitVersion(commit) if version and version!=lastCMAKEVersion: tag = "v" + version @@ -119,6 +118,8 @@ def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config): revdate = datetime.datetime.now().strftime("%Y%m%d.%H%M%S")+ "." + commit else: revdate = finalRevDate + if finalBaseVersion is not None: + baseVersion = finalBaseVersion entries[-1] = (commit, name, email, date, revdate, subject, baseVersion, kind) entries.reverse() @@ -167,8 +168,10 @@ if __name__ == "__main__": distribution = sys.argv[2] finalRevDate = sys.argv[3] if len(sys.argv)>3 else None + finalBaseVersion = sys.argv[4] if len(sys.argv)>4 else None - entries = collectEntries(baseCommit, baseVersion, "alpha", finalRevDate, config) + entries = collectEntries(baseCommit, baseVersion, "alpha", + finalBaseVersion, finalRevDate, config) with open(sys.argv[1], "wt") as f: (baseVersion, revdate, kind) = genChangeLogEntries(f, entries, distribution) |