Handle more version number strings

This commit is contained in:
Dan Hawkins 2018-11-23 21:05:06 +00:00
commit 31918ae700

View file

@ -28,6 +28,8 @@ def getGitRevision(String gitrootpath, int basebuildnumber) {
// origin/master
// origin/2.0.x
def getVersionPrefix(String sourcebranch) {
def int MAXVERSIONNUMBER = 65535
echo "Determining version number prefix from source branch name: ${sourcebranch}"
sourcebranch = sourcebranch.toLowerCase()
@ -51,43 +53,45 @@ def getVersionPrefix(String sourcebranch) {
echo "Source branch name has no dots in it (eg. 1.9.2). Defaulting to: ${thirdpartyversionprefix}"
return thirdpartyversionprefix
}
splits = []
for (split in splits2) {
if (split.isInteger()) {
splits.add(split)
}
else if (split == "x") {
if (split == "x") {
echo "Source branch name has '.x' or 'x.' in it. Defaulting to: ${mastertypeversionprefix}"
return mastertypeversionprefix
}
}
def integerstrings = sourcebranch.findAll(/\d+/)
def integers = []
for (integerstring in integerstrings) {
int integer = integerstring.toInteger()
integer = integer % (MAXVERSIONNUMBER + 1)
integers.add(integer)
}
def versionprefix = ""
if (splits.size() < 1) {
if (integers.size() < 1) {
echo "This source branch name has no numbers in its name so defaulting to: ${defaultversionprefix}"
versionprefix = defaultversionprefix
}
else {
def int splitnumbercount = 0
for (split in splits) {
if (split.isInteger()) {
versionprefix += split + "."
splitnumbercount += 1
}
else if (splitnumbercount > 2) {
def int integernumbercount = 0
for (integer in integers) {
versionprefix += integer + "."
integernumbercount += 1
if (integernumbercount > 2) {
break
}
}
if (splitnumbercount == 0) {
if (integernumbercount == 0) {
echo "No leading numbers were found in source branch name so defaulting to: ${defaultversionprefix}"
versionprefix = defaultversionprefix
}
else {
if (splitnumbercount == 1) {
versionprefix += "0.0."
}
else if (splitnumbercount == 2) {
versionprefix += "0."
}
else if (integernumbercount == 1) {
versionprefix += "0.0."
}
else if (integernumbercount == 2) {
versionprefix += "0."
}
}
echo "Determined version prefix to be: ${versionprefix}"