Squashed 'Common_scripts/' changes from 791c94c..98bc43b

98bc43b Use the autobuild script revision count to alter the version
659d0a0 Use the autobuild script revision count to alter the version
727be2d Use the autobuild script revision count to alter the version
554e551 Use the autobuild script revision count to alter the version
a517c02 Use the autobuild script revision count to alter the version

git-subtree-dir: Common_scripts
git-subtree-split: 98bc43bd9e
This commit is contained in:
Dan Hawkins 2022-03-23 20:40:54 +00:00
commit 9489dbd595

View file

@ -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
}