diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.gsh index 61f8a3b..1dc19ca 100644 --- a/versionnumbering/metaversion.gsh +++ b/versionnumbering/metaversion.gsh @@ -35,7 +35,7 @@ def mergemeta(versionFolder, outputFolder) { } def appendcomponentinfo(versionFolder, outputFolder) { - echo "Appemding component version data from folder: ${versionFolder} to ${outputFolder}" + echo "Appending component version data from folder: ${versionFolder} to ${outputFolder}" differencesFile = "${versionFolder}/differences.txt" if (fileExists("${differencesFile}")) { @@ -48,13 +48,16 @@ def appendcomponentinfo(versionFolder, outputFolder) { buildStampFileContents = readFile("${buildStampFile}").trim() remoteurlFile = "${versionFolder}/remoteurl.txt" - remoteurlFileContents = currentContents(remoteurlFile. "", 'Unknown') + remoteurlFileContents = currentContents(remoteurlFile, "", 'Unknown').trim() gitRevisionFile = "${versionFolder}/gitrevision.txt" gitRevisionFileContents = readFile("${gitRevisionFile}").trim() + releaseJobNameFile = "${versionFolder}/releasejobname.txt" + releaseJobNameContents = currentContents("${releaseJobNameFile}", "", "-").trim() + metabuildStampFile = "${outputFolder}/buildstamps.txt" - writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${versionFolder}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${versionFolder}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents revision = readFile("${versionFolder}/revision.txt").trim() intrevision = revision.toInteger() echo "Revision read in: ${intrevision}" @@ -88,7 +91,7 @@ def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder = else { writeFile file: "${outputFolder}/metaversion.txt", text: versionLabelPrefix + "." + totalrevision } - writeFile("${outputFolder}/revision.txt", text: totalrevision) + writeFile(file: "${outputFolder}/revision.txt", text: totalrevision) } return this; \ No newline at end of file diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py index 607ce96..370d9fc 100644 --- a/versionnumbering/versioninfo.py +++ b/versionnumbering/versioninfo.py @@ -138,7 +138,7 @@ def getVersionPrefix(sourcebranch): print("Determined version prefix to be: {0}".format(versionprefix)) return versionprefix -def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp): +def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp, releasejobname): with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f: f.write(buildjobname) @@ -173,6 +173,9 @@ def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncou with open(os.path.join(versionfolder, "builddate.txt"), 'w') as f: f.write(str(datetime.datetime.now())) + with open(os.path.join(versionfolder, "releasejobname.txt"), 'w') as f: + f.write(releasejobname) + def main(argv=None): # IGNORE:C0111 '''Command line options.''' @@ -206,6 +209,7 @@ USAGE parser.add_argument("-b", "--baseversionnumber", dest="baseversionnumber", action="store", default=int(1000), help="base git version number [default: %(default)s]") parser.add_argument("-j", "--buildjobname", dest="buildjobname", action="store", default="-", help="build job name [default: %(default)s]") parser.add_argument("-n", "--buildnumber", dest="buildnumber", action="store", default="1", help="build number [default: %(default)s]") + parser.add_argument("-r", "--releasejobname", dest="releasejobname", action="store", default="-", help="release-to-git build job name [default: %(default)s]") # Process arguments args = parser.parse_args() @@ -217,9 +221,10 @@ USAGE baseversionnumber = args.baseversionnumber buildjobname = args.buildjobname buildnumber = args.buildnumber + releasejobname = args.releasejobname print("Source branch:", sourcebranch, "version folder:", versionfolder, "Git root:", gitrootfolder) - print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber) + print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber, "Release job name:", releasejobname) resetFolder(versionfolder) @@ -230,7 +235,7 @@ USAGE buildstamp = versionprefix + str(gitrevisioncount) print("Build stamp is: {0}".format(buildstamp)) - writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp) + writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, remoteurl, buildnumber, buildstamp, releasejobname) return 0 except Exception as e: