diff --git a/Common_scripts/versionnumbering/generate.groovy b/Common_scripts/versionnumbering/generate.groovy index 5e974e2..40413d7 100644 --- a/Common_scripts/versionnumbering/generate.groovy +++ b/Common_scripts/versionnumbering/generate.groovy @@ -11,7 +11,7 @@ int incrementrevision(int current, int increment) { return newrevision } -def getGitRevision(String gitrootpath, int basebuildnumber) { +def getGitRevision(String gitrootpath, int basebuildnumber = 0) { def int adjustedchangecount def String gitrevision def String remoteinfo @@ -143,16 +143,23 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum def String gitrevision def String remoteinfo def String remoteurl - (gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(sourcepath, basebuildnumber) + def int scriptgitrevisioncount + def String scriptgitrevision + def String scriptremoteinfo + def String scriptremoteurl + (scriptgitrevisioncount, scriptgitrevision, scriptremoteinfo, scriptremoteurl) = getGitRevision(autobuilder.getautobuildpath()) + + def int totalrevisioncount = incrementrevision(gitrevisioncount, scriptgitrevisioncount) + def versionprefix = getVersionPrefix(sourcerevision) - def buildstamp = versionprefix + gitrevisioncount.toString() + def buildstamp = versionprefix + totalrevisioncount.toString() echo "Build stamp is: ${buildstamp}" meta.gitinfo.set(sourcepath, sourcerevision, gitrevision, remoteurl, remoteinfo) - meta.buildstampinfo.set(versionprefix, gitrevisioncount, buildstamp) + meta.buildstampinfo.set(versionprefix, totalrevisioncount, buildstamp) return buildstamp }