From fb25a6b30b16515306aaa7032dcf94484d82e53c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 27 Jan 2019 12:21:29 +0000 Subject: [PATCH] When generating revision numbers, take into account negative basebuildnumbers --- versionnumbering/generate.groovy | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 4b11cf0..4761174 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -4,6 +4,12 @@ def int maxversionnumber() { return MAXVERSIONNUMBER } +int incrementrevision(int current, int increment) { + def int newrevision = (current + increment) % (maxversionnumber() + 1) + echo "Current revision: ${current} Increment: ${increment} New revision: ${newrevision}" + return newrevision +} + def getGitRevision(String gitrootpath, int basebuildnumber) { def int adjustedchangecount def String gitrevision @@ -18,7 +24,9 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { changecount = bat(returnStdout: true, script: "@git rev-list HEAD --count").trim().toInteger() } echo "Change count: ${changecount}" - adjustedchangecount = ((changecount + basebuildnumber).abs()) % (maxversionnumber() + 1) + def int mvnp1 = maxversionnumber() + 1 + basebuildnumber = (basebuildnumber < 0) ? mvnp1 - (basebuildnumber.abs() % mvnp1) : basebuildnumber + adjustedchangecount = incrementrevision(changecount, basebuildnumber) echo "Adjusted change count: ${adjustedchangecount}" if (isUnix()) { gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() @@ -141,10 +149,4 @@ String generate(meta, String sourcerevision, String sourcepath, String basebuild return generate(meta, sourcerevision, sourcepath, bbn) } -int incrementrevision(int current, int increment) { - def int newrevision = (current + increment) % (maxversionnumber() + 1) - echo "Current revision: ${current} Increment: ${increment} New revision: ${newrevision}" - return newrevision -} - return this; \ No newline at end of file