diff --git a/versionnumbering/generate.groovy b/versionnumbering/generate.groovy index 5e974e2..c3c4266 100644 --- a/versionnumbering/generate.groovy +++ b/versionnumbering/generate.groovy @@ -146,13 +146,17 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum (gitrevisioncount, gitrevision, remoteinfo, remoteurl) = getGitRevision(sourcepath, basebuildnumber) + (scriptgitrevisioncount, scriptgitrevision, scriptremoteinfo, scriptremoteurl) = getGitRevision(autobuilder, 0) + + 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 }