From e7c44d4fd43da49cf3468a18a511757e61f3f650 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 25 Oct 2018 00:09:04 +0100 Subject: [PATCH 1/7] Add utility to make build stamp representing a set of components --- versionnumbering/complexversioninfo.py | 220 +++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 versionnumbering/complexversioninfo.py diff --git a/versionnumbering/complexversioninfo.py b/versionnumbering/complexversioninfo.py new file mode 100644 index 0000000..be6ada4 --- /dev/null +++ b/versionnumbering/complexversioninfo.py @@ -0,0 +1,220 @@ +# encoding: utf-8 +''' +complexversionnumbering -- shortdesc + +complexversionnumbering generates a version folder with a common set of version information files in it for a complex component (consisting of many subcomponents) + +@author: dan + +@copyright: 2018 Global Inkjet Systems Ltd. All rights reserved. +''' +import os +import sys +import shutil +import subprocess + +from argparse import ArgumentParser +from argparse import RawDescriptionHelpFormatter + +__all__ = [] +__version__ = 0.1 +__date__ = '2018-10-24' +__updated__ = '2018-10-24' + +gitExecutable = os.getenv("GIT_EXECUTABLE", default="git") +slaveMachine = os.getenv("NODE_NAME", default="-") + +def resetFolder(versionfolder): + print("Removing folders and contents of: {0}".format(versionfolder)) + try: + shutil.rmtree(versionfolder) + except FileNotFoundError: + pass + + print("Creating folder: {0}".format(versionfolder)) + os.makedirs(versionfolder) + +def getGitRevision(gitrootpath, basenumber): + cwd = os.getcwd() + + path = os.path.expanduser(gitrootpath) + print("Changing current working directory to: {0}".format(path)) + os.chdir(path) + + print("Determining revision info using git command: {0}".format(gitExecutable)) + completed = subprocess.run([gitExecutable, "rev-list", "HEAD", "--count"], stdout=subprocess.PIPE) + print("Command {0} returned: {1}".format(completed.args, completed.returncode)) + changecount = completed.stdout.decode("utf-8").strip() + print("Change count: {0}".format(changecount)) + adjustedchangecount = int(changecount) + int(basenumber) + print("Adjusted change count: {0}".format(adjustedchangecount)) + + print("Determining current revision info using git command: {0}".format(gitExecutable)) + completed = subprocess.run([gitExecutable, "rev-parse", "HEAD"], stdout=subprocess.PIPE) + print("Command {0} returned: {1}".format(completed.args, completed.returncode)) + revision = completed.stdout.decode("utf-8").strip() + print("Revision: {0}".format(revision)) + + print("Determining remote info using git command: {0}".format(gitExecutable)) + completed = subprocess.run([gitExecutable, "remote", "show", "origin"], stdout=subprocess.PIPE) + print("Command {0} returned: {1}".format(completed.args, completed.returncode)) + remoteinfo = completed.stdout.decode("utf-8") + print("Remote info: {0}".format(remoteinfo)) + + os.chdir(cwd) + print("Restored current working directory to: {0}".format(cwd)) + + return (adjustedchangecount, revision, remoteinfo) + +# Handle: +# origin/master +# origin/2.0.x +def getVersionPrefix(sourcebranch): + print("Determining version number prefix from source branch name: {0}".format(sourcebranch)) + + defaultversionprefix = "1.30000.0." + mastertypeversionprefix = "1.20000.0." + splits = sourcebranch.split('/') + if len(splits) < 1: + print("Source branch name is invalid. Defaulting to: {0}".format(defaultversionprefix)) + return defaultversionprefix + + sourcebranch = splits[-1] + + if sourcebranch.lower().endswith("master"): # Special case + return mastertypeversionprefix + + splits = sourcebranch.split('.') + versionprefix = "" + if len(splits) < 1: + print("This source branch name has no decimal points in its name so defaulting to: {0}".format(defaultversionprefix)) + versionprefix = defaultversionprefix + else: + splitnumbercount = 0 + isIntermediateReleaseBranch = False + for split in splits: + if split.isdigit(): + versionprefix += split + "." + splitnumbercount += 1 + else: + if split == "x": + isIntermediateReleaseBranch = True + break + if splitnumbercount > 2: + break + if splitnumbercount == 0: + print("No leading numbers were found in source branch name so defaulting to: {0}".format(defaultversionprefix)) + versionprefix = defaultversionprefix + else: + if isIntermediateReleaseBranch: + versionprefix = mastertypeversionprefix + elif splitnumbercount == 1: + versionprefix += "0.0." + elif splitnumbercount == 2: + versionprefix += "0." + + print("Determined version prefix to be: {0}".format(versionprefix)) + return versionprefix + +def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, buildnumber, buildstamp): + with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f: + f.write(buildjobname) + + with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f: + f.write(versionprefix) + + with open(os.path.join(versionfolder, "revision.txt"), 'w') as f: + f.write(str(gitrevisioncount)) + + with open(os.path.join(versionfolder, "gitrevision.txt"), 'w') as f: + f.write(gitrevision) + + with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f: + f.write(remoteinfo) + + with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f: + f.write(buildnumber) + + with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f: + f.write(buildstamp) + + buildstampcommasep = buildstamp.replace(".", ",") + with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f: + f.write(buildstampcommasep) + + with open(os.path.join(versionfolder, "buildmachine.txt"), 'w') as f: + f.write(slaveMachine) + +def main(argv=None): # IGNORE:C0111 + '''Command line options.''' + + if argv is None: + argv = sys.argv + else: + sys.argv.extend(argv) + + program_name = os.path.basename(sys.argv[0]) + program_version = "v%s" % __version__ + program_build_date = str(__updated__) + program_version_message = '%%(prog)s %s (%s)' % (program_version, program_build_date) + program_shortdesc = __import__('__main__').__doc__.split("\n")[1] + program_license = '''%s + + Created by dan on %s. + Copyright 2017 Global Inkjet Systems Ltd. All rights reserved. + + Distributed on an "AS IS" basis without warranties + or conditions of any kind, either express or implied. + +USAGE +''' % (program_shortdesc, str(__date__)) + + try: + # Setup argument parser + parser = ArgumentParser(description=program_license, formatter_class=RawDescriptionHelpFormatter) + parser.add_argument("-p", "--stampprefix", dest="stampprefix", action="store", default="1.30000.0", help="A prefix to help identify this build [default: %(default)s]") + parser.add_argument("-s", "--subbuildstamp", dest="subbuildstamp", nargs='+', action="store", help="A subcomponent build stamp - there must be 1 or more") + parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="version", help="version folder to be created [default: %(default)s]") + 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]") + + # Process arguments + args = parser.parse_args() + + try: + stampprefix = args.stampprefix + subbuildstamp = args.subbuildstamp + versionfolder = args.versionfolder + gitrootfolder = args.gitrootfolder + baseversionnumber = args.baseversionnumber + buildjobname = args.buildjobname + buildnumber = args.buildnumber + + print("Stamp prefix:", stampprefix, "sub build stamp:", subbuildstamp, "version folder:", versionfolder, "Git root:", gitrootfolder) + print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber) + + resetFolder(versionfolder) + + (gitrevisioncount, gitrevision, remoteinfo) = getGitRevision(gitrootfolder, baseversionnumber) + + versionprefix = getVersionPrefix(sourcebranch) + + buildstamp = versionprefix + str(gitrevisioncount) + print("Build stamp is: {0}".format(buildstamp)) + + writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, buildnumber, buildstamp) + + return 0 + except Exception as e: + print("Error while creating version info:", e.__repr__()) + return 1 + + except Exception as e: + indent = len(program_name) * " " + print(program_name + ": " + repr(e) + "\n") + print(indent + " for help use --help") + return 2 + +if __name__ == "__main__": + sys.exit(main()) From 1d959d0a85015f21525ec5ebaf656d5c118c8e11 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 25 Oct 2018 23:04:31 +0100 Subject: [PATCH 2/7] Detect branches with 'master' string better; Split numbers better in branch names --- versionnumbering/versioninfo.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py index a9d8738..7e6043f 100644 --- a/versionnumbering/versioninfo.py +++ b/versionnumbering/versioninfo.py @@ -12,6 +12,7 @@ import os import sys import shutil import subprocess +import re from argparse import ArgumentParser from argparse import RawDescriptionHelpFormatter @@ -81,13 +82,18 @@ def getVersionPrefix(sourcebranch): sourcebranch = splits[-1] - if sourcebranch.lower().endswith("master"): # Special case + if sourcebranch.lower().find("master") != -1: # Special case return mastertypeversionprefix - splits = sourcebranch.split('.') + splits2 = re.sourcebranch(r'(\d+)', v) + splits = [] + for split in splits2: + if split.isdigit(): + splits.append(split) + versionprefix = "" if len(splits) < 1: - print("This source branch name has no decimal points in its name so defaulting to: {0}".format(defaultversionprefix)) + print("This source branch name has no numbers in its name so defaulting to: {0}".format(defaultversionprefix)) versionprefix = defaultversionprefix else: splitnumbercount = 0 From 9a4601e41e9fe627df818126f6c241a91bf01b5e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 25 Oct 2018 23:12:00 +0100 Subject: [PATCH 3/7] Detect branches with 'master' string better; Split numbers better in branch names --- versionnumbering/versioninfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/versioninfo.py b/versionnumbering/versioninfo.py index 7e6043f..b0d8ba1 100644 --- a/versionnumbering/versioninfo.py +++ b/versionnumbering/versioninfo.py @@ -85,7 +85,7 @@ def getVersionPrefix(sourcebranch): if sourcebranch.lower().find("master") != -1: # Special case return mastertypeversionprefix - splits2 = re.sourcebranch(r'(\d+)', v) + splits2 = re.split(r'(\d+)', sourcebranch) splits = [] for split in splits2: if split.isdigit(): From 883ea65599072260c7d13e61c1cf792115e51d83 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 26 Oct 2018 00:19:26 +0100 Subject: [PATCH 4/7] Add metaversion generation --- versionnumbering/complexversioninfo.py | 220 ------------------------- versionnumbering/metaversion.gsh | 41 +++++ 2 files changed, 41 insertions(+), 220 deletions(-) delete mode 100644 versionnumbering/complexversioninfo.py create mode 100644 versionnumbering/metaversion.gsh diff --git a/versionnumbering/complexversioninfo.py b/versionnumbering/complexversioninfo.py deleted file mode 100644 index be6ada4..0000000 --- a/versionnumbering/complexversioninfo.py +++ /dev/null @@ -1,220 +0,0 @@ -# encoding: utf-8 -''' -complexversionnumbering -- shortdesc - -complexversionnumbering generates a version folder with a common set of version information files in it for a complex component (consisting of many subcomponents) - -@author: dan - -@copyright: 2018 Global Inkjet Systems Ltd. All rights reserved. -''' -import os -import sys -import shutil -import subprocess - -from argparse import ArgumentParser -from argparse import RawDescriptionHelpFormatter - -__all__ = [] -__version__ = 0.1 -__date__ = '2018-10-24' -__updated__ = '2018-10-24' - -gitExecutable = os.getenv("GIT_EXECUTABLE", default="git") -slaveMachine = os.getenv("NODE_NAME", default="-") - -def resetFolder(versionfolder): - print("Removing folders and contents of: {0}".format(versionfolder)) - try: - shutil.rmtree(versionfolder) - except FileNotFoundError: - pass - - print("Creating folder: {0}".format(versionfolder)) - os.makedirs(versionfolder) - -def getGitRevision(gitrootpath, basenumber): - cwd = os.getcwd() - - path = os.path.expanduser(gitrootpath) - print("Changing current working directory to: {0}".format(path)) - os.chdir(path) - - print("Determining revision info using git command: {0}".format(gitExecutable)) - completed = subprocess.run([gitExecutable, "rev-list", "HEAD", "--count"], stdout=subprocess.PIPE) - print("Command {0} returned: {1}".format(completed.args, completed.returncode)) - changecount = completed.stdout.decode("utf-8").strip() - print("Change count: {0}".format(changecount)) - adjustedchangecount = int(changecount) + int(basenumber) - print("Adjusted change count: {0}".format(adjustedchangecount)) - - print("Determining current revision info using git command: {0}".format(gitExecutable)) - completed = subprocess.run([gitExecutable, "rev-parse", "HEAD"], stdout=subprocess.PIPE) - print("Command {0} returned: {1}".format(completed.args, completed.returncode)) - revision = completed.stdout.decode("utf-8").strip() - print("Revision: {0}".format(revision)) - - print("Determining remote info using git command: {0}".format(gitExecutable)) - completed = subprocess.run([gitExecutable, "remote", "show", "origin"], stdout=subprocess.PIPE) - print("Command {0} returned: {1}".format(completed.args, completed.returncode)) - remoteinfo = completed.stdout.decode("utf-8") - print("Remote info: {0}".format(remoteinfo)) - - os.chdir(cwd) - print("Restored current working directory to: {0}".format(cwd)) - - return (adjustedchangecount, revision, remoteinfo) - -# Handle: -# origin/master -# origin/2.0.x -def getVersionPrefix(sourcebranch): - print("Determining version number prefix from source branch name: {0}".format(sourcebranch)) - - defaultversionprefix = "1.30000.0." - mastertypeversionprefix = "1.20000.0." - splits = sourcebranch.split('/') - if len(splits) < 1: - print("Source branch name is invalid. Defaulting to: {0}".format(defaultversionprefix)) - return defaultversionprefix - - sourcebranch = splits[-1] - - if sourcebranch.lower().endswith("master"): # Special case - return mastertypeversionprefix - - splits = sourcebranch.split('.') - versionprefix = "" - if len(splits) < 1: - print("This source branch name has no decimal points in its name so defaulting to: {0}".format(defaultversionprefix)) - versionprefix = defaultversionprefix - else: - splitnumbercount = 0 - isIntermediateReleaseBranch = False - for split in splits: - if split.isdigit(): - versionprefix += split + "." - splitnumbercount += 1 - else: - if split == "x": - isIntermediateReleaseBranch = True - break - if splitnumbercount > 2: - break - if splitnumbercount == 0: - print("No leading numbers were found in source branch name so defaulting to: {0}".format(defaultversionprefix)) - versionprefix = defaultversionprefix - else: - if isIntermediateReleaseBranch: - versionprefix = mastertypeversionprefix - elif splitnumbercount == 1: - versionprefix += "0.0." - elif splitnumbercount == 2: - versionprefix += "0." - - print("Determined version prefix to be: {0}".format(versionprefix)) - return versionprefix - -def writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, buildnumber, buildstamp): - with open(os.path.join(versionfolder, "buildjobname.txt"), 'w') as f: - f.write(buildjobname) - - with open(os.path.join(versionfolder, "prefix.txt"), 'w') as f: - f.write(versionprefix) - - with open(os.path.join(versionfolder, "revision.txt"), 'w') as f: - f.write(str(gitrevisioncount)) - - with open(os.path.join(versionfolder, "gitrevision.txt"), 'w') as f: - f.write(gitrevision) - - with open(os.path.join(versionfolder, "remoteinfo.txt"), 'w') as f: - f.write(remoteinfo) - - with open(os.path.join(versionfolder, "buildnumber.txt"), 'w') as f: - f.write(buildnumber) - - with open(os.path.join(versionfolder, "buildstamp.txt"), 'w') as f: - f.write(buildstamp) - - buildstampcommasep = buildstamp.replace(".", ",") - with open(os.path.join(versionfolder, "buildstampcommasep.txt"), 'w') as f: - f.write(buildstampcommasep) - - with open(os.path.join(versionfolder, "buildmachine.txt"), 'w') as f: - f.write(slaveMachine) - -def main(argv=None): # IGNORE:C0111 - '''Command line options.''' - - if argv is None: - argv = sys.argv - else: - sys.argv.extend(argv) - - program_name = os.path.basename(sys.argv[0]) - program_version = "v%s" % __version__ - program_build_date = str(__updated__) - program_version_message = '%%(prog)s %s (%s)' % (program_version, program_build_date) - program_shortdesc = __import__('__main__').__doc__.split("\n")[1] - program_license = '''%s - - Created by dan on %s. - Copyright 2017 Global Inkjet Systems Ltd. All rights reserved. - - Distributed on an "AS IS" basis without warranties - or conditions of any kind, either express or implied. - -USAGE -''' % (program_shortdesc, str(__date__)) - - try: - # Setup argument parser - parser = ArgumentParser(description=program_license, formatter_class=RawDescriptionHelpFormatter) - parser.add_argument("-p", "--stampprefix", dest="stampprefix", action="store", default="1.30000.0", help="A prefix to help identify this build [default: %(default)s]") - parser.add_argument("-s", "--subbuildstamp", dest="subbuildstamp", nargs='+', action="store", help="A subcomponent build stamp - there must be 1 or more") - parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="version", help="version folder to be created [default: %(default)s]") - 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]") - - # Process arguments - args = parser.parse_args() - - try: - stampprefix = args.stampprefix - subbuildstamp = args.subbuildstamp - versionfolder = args.versionfolder - gitrootfolder = args.gitrootfolder - baseversionnumber = args.baseversionnumber - buildjobname = args.buildjobname - buildnumber = args.buildnumber - - print("Stamp prefix:", stampprefix, "sub build stamp:", subbuildstamp, "version folder:", versionfolder, "Git root:", gitrootfolder) - print("Base version number:", baseversionnumber, "Build job name:", buildjobname, "Build number:", buildnumber) - - resetFolder(versionfolder) - - (gitrevisioncount, gitrevision, remoteinfo) = getGitRevision(gitrootfolder, baseversionnumber) - - versionprefix = getVersionPrefix(sourcebranch) - - buildstamp = versionprefix + str(gitrevisioncount) - print("Build stamp is: {0}".format(buildstamp)) - - writeversionfiles(versionfolder, buildjobname, versionprefix, gitrevisioncount, gitrevision, remoteinfo, buildnumber, buildstamp) - - return 0 - except Exception as e: - print("Error while creating version info:", e.__repr__()) - return 1 - - except Exception as e: - indent = len(program_name) * " " - print(program_name + ": " + repr(e) + "\n") - print(indent + " for help use --help") - return 2 - -if __name__ == "__main__": - sys.exit(main()) diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.gsh new file mode 100644 index 0000000..b4b1ad7 --- /dev/null +++ b/versionnumbering/metaversion.gsh @@ -0,0 +1,41 @@ + +// Each version folder should have been created using version creation scripts in this Common_scripts folder +// as their are well-known files in each folder +def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder = "${WORKSPACE}/metaversion") { + env.VLP = versionLabelPrefix + env.OF = outputFolder + totalrevision = 0 + if (isUnix()) { + sh """#!/bin/bash + + rm -rf "${OF}" + mkdir -p "${OF}" + if [ \$? -ne 0 ]; then exit 1; fi + + touch "${OF}/differences.txt" + if [ \$? -ne 0 ]; then exit 1; fi + """ + } + else { + error "combineSubjobVersions script is not supported in Windows yet" + } + for (versionFolder in versionFolderList) { + env.differemcesFile = "${versionFolder}/differences.txt" + sh """#!/bin/bash + + echo ${differencesFile} >> "${OF}/differences.txt" + if [ \$? -ne 0 ]; then exit 1; fi + + cat "${differencesFile}" >> "${OF}/differences.txt" + if [ \$? -ne 0 ]; then exit 1; fi + """ + revision = readFile("${versionFolder}/revision.txt").trim() + intrevision = revision.toInteger() + echo "Revision read in: ${intrevision}" + totalrevision += intrevision + echo "Accumulated revision is: ${totalrevision}" + } + writeFile file: "${OF}/metaversion.txt" text: versionLabelPrefix + "." + totalrevision +} + +return this; \ No newline at end of file From 55ef090a86d3f317b7a85189dc6cfca2808a7870 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 26 Oct 2018 08:37:10 +0100 Subject: [PATCH 5/7] Add metaversion generation --- versionnumbering/metaversion.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.gsh index b4b1ad7..c6eee74 100644 --- a/versionnumbering/metaversion.gsh +++ b/versionnumbering/metaversion.gsh @@ -35,7 +35,7 @@ def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder = totalrevision += intrevision echo "Accumulated revision is: ${totalrevision}" } - writeFile file: "${OF}/metaversion.txt" text: versionLabelPrefix + "." + totalrevision + writeFile file: "${OF}/metaversion.txt", text: versionLabelPrefix + "." + totalrevision } return this; \ No newline at end of file From bca6d804dd82173d1e1bacc54ff0dee8ed7f62ae Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 26 Oct 2018 09:13:34 +0100 Subject: [PATCH 6/7] Add metaversion generation --- versionnumbering/metaversion.gsh | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.gsh index c6eee74..e1cdaf6 100644 --- a/versionnumbering/metaversion.gsh +++ b/versionnumbering/metaversion.gsh @@ -14,28 +14,46 @@ def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder = touch "${OF}/differences.txt" if [ \$? -ne 0 ]; then exit 1; fi + + touch "${OF}/buildstamps.txt" + if [ \$? -ne 0 ]; then exit 1; fi + """ } else { error "combineSubjobVersions script is not supported in Windows yet" } for (versionFolder in versionFolderList) { - env.differemcesFile = "${versionFolder}/differences.txt" + env.differencesFile = "${versionFolder}/differences.txt" sh """#!/bin/bash - echo ${differencesFile} >> "${OF}/differences.txt" + echo ${differencesFile}: >> "${OF}/differences.txt" if [ \$? -ne 0 ]; then exit 1; fi cat "${differencesFile}" >> "${OF}/differences.txt" if [ \$? -ne 0 ]; then exit 1; fi """ + env.buildStampFile = "${versionFolder}/buildstamp.txt" + sh """#!/bin/bash + + echo ${versionFolder}: >> "${OF}/buildstamps.txt" + if [ \$? -ne 0 ]; then exit 1; fi + + cat "${buildStampFile}" >> "${OF}/buildstamps.txt" + if [ \$? -ne 0 ]; then exit 1; fi + """ revision = readFile("${versionFolder}/revision.txt").trim() intrevision = revision.toInteger() echo "Revision read in: ${intrevision}" totalrevision += intrevision echo "Accumulated revision is: ${totalrevision}" } - writeFile file: "${OF}/metaversion.txt", text: versionLabelPrefix + "." + totalrevision + if (versionLabelPrefix.endsWith(".")) { + writeFile file: "${OF}/metaversion.txt", text: versionLabelPrefix + totalrevision + } + else { + writeFile file: "${OF}/metaversion.txt", text: versionLabelPrefix + "." + totalrevision + } } return this; \ No newline at end of file From 614a4b1e6b47f71c967780af75faa9090fe0fa1a Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 26 Oct 2018 13:37:17 +0100 Subject: [PATCH 7/7] Add metaversion generation --- test.gsh | 7 ------- versionnumbering/metaversion.gsh | 13 +++++-------- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 test.gsh diff --git a/test.gsh b/test.gsh deleted file mode 100644 index 23fcfc0..0000000 --- a/test.gsh +++ /dev/null @@ -1,7 +0,0 @@ -// Methods in this file will end up as object methods on the object that load returns. -def lookAtThis(String whoAreYou) { - echo "Look at this, ${whoAreYou}! You loaded this from another file!" -} - -return this; - diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.gsh index e1cdaf6..aab7319 100644 --- a/versionnumbering/metaversion.gsh +++ b/versionnumbering/metaversion.gsh @@ -33,15 +33,12 @@ def combineSubjobVersions(versionLabelPrefix, versionFolderList, outputFolder = cat "${differencesFile}" >> "${OF}/differences.txt" if [ \$? -ne 0 ]; then exit 1; fi """ - env.buildStampFile = "${versionFolder}/buildstamp.txt" - sh """#!/bin/bash + buildStampFile = "${versionFolder}/buildstamp.txt" + buildStampFileContents = readFile "${buildStampFile}" + metabuildStampFile = "${OF}/buildstamps.txt" + metabuildStampFileContents = readFile "${metabuildStampFile}" + writeFile file: "${metabuildStampFile}", text: metabuildStampFileContents + "\r\n" + "${versionFolder}" + ": " + buildStampFileContents - echo ${versionFolder}: >> "${OF}/buildstamps.txt" - if [ \$? -ne 0 ]; then exit 1; fi - - cat "${buildStampFile}" >> "${OF}/buildstamps.txt" - if [ \$? -ne 0 ]; then exit 1; fi - """ revision = readFile("${versionFolder}/revision.txt").trim() intrevision = revision.toInteger() echo "Revision read in: ${intrevision}"