Remove comma separated buildstamp store

This commit is contained in:
Dan Hawkins 2018-11-29 08:36:20 +00:00
commit 78ad47a964
2 changed files with 9 additions and 10 deletions

View file

@ -139,30 +139,31 @@ class BuildStampInfo extends GISJsonSerialised {
private String buildstampprefix
int revision
String buildstamp
String buildstampcommasep
BuildStampInfo(script, buildstampprefix = "", revision = 0, buildstamp = "", buildstampcommasep = "") {
BuildStampInfo(script, buildstampprefix = "", revision = 0, buildstamp = "") {
super(script)
this.buildstampprefix = buildstampprefix
this.revision = revision
this.buildstamp = buildstamp
this.buildstampcommasep = buildstampcommasep
}
void set(String buildstampprefix, int revision, String buildstamp, String buildstampcommasep) {
void set(String buildstampprefix, int revision, String buildstamp) {
this.buildstampprefix = buildstampprefix
this.revision = revision
this.buildstamp = buildstamp
this.buildstampcommasep = buildstampcommasep
}
String buildstampcommasep() {
buildstampcommasep = buildstamp.replace(".", ",")
return buildstampcommasep
}
void changerevision(int newrevision) {
script.echo("Build stamp currently ${buildstamp}")
revision = newrevision
def List buildstampsplit = buildstamp.split('\\.')
buildstampsplit[3] = newrevision.toString()
buildstampsplit[-1] = newrevision.toString()
buildstamp = buildstampsplit.join('.')
buildstampcommasep = buildstampsplit.join(',')
script.echo("Build stamp now ${buildstamp}")
}
@ -170,7 +171,6 @@ class BuildStampInfo extends GISJsonSerialised {
buildstampprefix = rawmeta['buildstampprefix']
revision = rawmeta['revision']
buildstamp = rawmeta['buildstamp']
buildstampcommasep = rawmeta['buildstampcommasep']
}
LinkedHashMap serialisationdata() {
@ -178,7 +178,6 @@ class BuildStampInfo extends GISJsonSerialised {
'buildstampprefix' : buildstampprefix,
'revision' : revision,
'buildstamp' : buildstamp,
'buildstampcommasep' : buildstampcommasep,
]
return data
}

View file

@ -113,7 +113,7 @@ String generate(meta, String sourcerevision, String sourcepath, int basebuildnum
echo "Build stamp is: ${buildstamp}"
meta.gitinfo.set(sourcepath, sourcerevision, gitrevision, remoteurl, remoteinfo)
meta.buildstampinfo.set(versionprefix, gitrevisioncount, buildstamp, buildstamp.replace(".", ","))
meta.buildstampinfo.set(versionprefix, gitrevisioncount, buildstamp)
return buildstamp
}