Squashed 'Common_scripts/' changes from 791c94c..98bc43b
98bc43bUse the autobuild script revision count to alter the version659d0a0Use the autobuild script revision count to alter the version727be2dUse the autobuild script revision count to alter the version554e551Use the autobuild script revision count to alter the versiona517c02Use the autobuild script revision count to alter the version git-subtree-dir: Common_scripts git-subtree-split:98bc43bd9e
This commit is contained in:
parent
268b7de902
commit
9489dbd595
1 changed files with 11 additions and 4 deletions
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue