From b92a8261897b30807c06198982d92a5db1cfd805 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 12 Nov 2018 10:50:37 +0000 Subject: [PATCH 1/6] Rename .gsh files to .groovy --- artifacts/{metaexport.gsh => metaexport.groovy} | 0 commandline/{commandline.gsh => commandline.groovy} | 0 .../{disableparallelbuilds.gsh => disableparallelbuilds.groovy} | 0 .../eclipsebuild/{eclipseds5build.gsh => eclipseds5build.groovy} | 0 configuration/{configuration.gsh => configuration.groovy} | 0 differences/{json.gsh => json.groovy} | 0 install/{installhelper.gsh => installhelper.groovy} | 0 versioncontrol/{git.gsh => git.groovy} | 0 versionnumbering/{metaversion.gsh => metaversion.groovy} | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename artifacts/{metaexport.gsh => metaexport.groovy} (100%) rename commandline/{commandline.gsh => commandline.groovy} (100%) rename compile/eclipsebuild/{disableparallelbuilds.gsh => disableparallelbuilds.groovy} (100%) rename compile/eclipsebuild/{eclipseds5build.gsh => eclipseds5build.groovy} (100%) rename configuration/{configuration.gsh => configuration.groovy} (100%) rename differences/{json.gsh => json.groovy} (100%) rename install/{installhelper.gsh => installhelper.groovy} (100%) rename versioncontrol/{git.gsh => git.groovy} (100%) rename versionnumbering/{metaversion.gsh => metaversion.groovy} (100%) diff --git a/artifacts/metaexport.gsh b/artifacts/metaexport.groovy similarity index 100% rename from artifacts/metaexport.gsh rename to artifacts/metaexport.groovy diff --git a/commandline/commandline.gsh b/commandline/commandline.groovy similarity index 100% rename from commandline/commandline.gsh rename to commandline/commandline.groovy diff --git a/compile/eclipsebuild/disableparallelbuilds.gsh b/compile/eclipsebuild/disableparallelbuilds.groovy similarity index 100% rename from compile/eclipsebuild/disableparallelbuilds.gsh rename to compile/eclipsebuild/disableparallelbuilds.groovy diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.groovy similarity index 100% rename from compile/eclipsebuild/eclipseds5build.gsh rename to compile/eclipsebuild/eclipseds5build.groovy diff --git a/configuration/configuration.gsh b/configuration/configuration.groovy similarity index 100% rename from configuration/configuration.gsh rename to configuration/configuration.groovy diff --git a/differences/json.gsh b/differences/json.groovy similarity index 100% rename from differences/json.gsh rename to differences/json.groovy diff --git a/install/installhelper.gsh b/install/installhelper.groovy similarity index 100% rename from install/installhelper.gsh rename to install/installhelper.groovy diff --git a/versioncontrol/git.gsh b/versioncontrol/git.groovy similarity index 100% rename from versioncontrol/git.gsh rename to versioncontrol/git.groovy diff --git a/versionnumbering/metaversion.gsh b/versionnumbering/metaversion.groovy similarity index 100% rename from versionnumbering/metaversion.gsh rename to versionnumbering/metaversion.groovy From 4f62592e7f7bf0c91cb372f12d10c83fa208d4c8 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 13 Nov 2018 09:39:25 +0000 Subject: [PATCH 2/6] buildstamp.txt -> buildstamps.txt --- versionnumbering/metaversion.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index 9a50e2e..e566aa1 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -44,7 +44,7 @@ def appendcomponentinfo(versionFolder, outputFolder) { writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + "${differencesFile}:\n" + newContents } - buildStampFile = "${versionFolder}/buildstamp.txt" + buildStampFile = "${versionFolder}/buildstamps.txt" buildStampFileContents = readFile("${buildStampFile}").trim() remoteurlFile = "${versionFolder}/remoteurl.txt" From bf1cba0f8baccaa4c5ea3bbe8ee60f870784a4ba Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Thu, 15 Nov 2018 23:53:08 +0000 Subject: [PATCH 3/6] Prefix each line of a metaversion file with path to relevant artifact --- versionnumbering/metaversion.groovy | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index e566aa1..00256cc 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -9,7 +9,16 @@ def currentContents(file, newline = "\n", defaultContents = "") { return contents } -def mergemeta(versionFolder, outputFolder) { +def prefixline(rootpath, filepath) { + fileContents = readFile("${filepath}").trim() + newFileContents = "" + fileContents.eachline { + newFileContents += "${rootpath}" + "/" + it + } + return newFileContents +} + +def mergemeta(rootpath, versionFolder, outputFolder) { echo "Merging meta data from folder: ${versionFolder} to ${outputFolder}" differencesFile = "${versionFolder}/differences.txt" @@ -18,7 +27,7 @@ def mergemeta(versionFolder, outputFolder) { writeFile file: "${metadifferencesFile}", text: currentContents(metadifferencesFile) + newContents buildStampFile = "${versionFolder}/buildstamps.txt" - buildStampFileContents = readFile("${buildStampFile}").trim() + buildStampFileContents = prefixline(rootpath, "${buildStampFile}") metabuildStampFile = "${outputFolder}/buildstamps.txt" writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + buildStampFileContents @@ -34,7 +43,7 @@ def mergemeta(versionFolder, outputFolder) { return intrevision } -def appendcomponentinfo(versionFolder, outputFolder) { +def appendcomponentinfo(rootpath, versionFolder, outputFolder) { echo "Appending component version data from folder: ${versionFolder} to ${outputFolder}" differencesFile = "${versionFolder}/differences.txt" @@ -57,7 +66,7 @@ def appendcomponentinfo(versionFolder, outputFolder) { releaseJobNameContents = currentContents("${releaseJobNameFile}", "", "-").trim() metabuildStampFile = "${outputFolder}/buildstamps.txt" - writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${versionFolder}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents + writeFile file: "${metabuildStampFile}", text: currentContents(metabuildStampFile) + "${rootpath}" + ":" + buildStampFileContents + "," + remoteurlFileContents + "," + gitRevisionFileContents + "," + releaseJobNameContents revision = readFile("${versionFolder}/revision.txt").trim() intrevision = revision.toInteger() echo "Revision read in: ${intrevision}" @@ -67,20 +76,21 @@ def appendcomponentinfo(versionFolder, outputFolder) { // 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") { +def combineSubjobVersions(versionLabelPrefix, artifactList, outputFolder = "${WORKSPACE}/metaversion") { totalrevision = 0 dir("${outputFolder}") { deleteDir() } - for (versionFolder in versionFolderList) { + for (artifactItem in artifactList) { + (rootpath, versionFolder) = artifactItem echo "Inspecting folder: ${versionFolder}" metaversionsignaturefile = "${versionFolder}/metaversion.txt" // If the sub project is a meta job if (fileExists("${metaversionsignaturefile}")) { - intrevision = mergemeta("${versionFolder}", outputFolder) + intrevision = mergemeta(rootpath, versionFolder, outputFolder) } else { - intrevision = appendcomponentinfo("${versionFolder}", outputFolder) + intrevision = appendcomponentinfo(rootpath, versionFolder, outputFolder) } totalrevision += intrevision } From fdff4d689313b5cf358ca33db588cb2fcbe316c6 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 16 Nov 2018 23:29:39 +0000 Subject: [PATCH 4/6] Correct file line handling --- versionnumbering/metaversion.groovy | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index 00256cc..3b8d7c1 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -10,10 +10,13 @@ def currentContents(file, newline = "\n", defaultContents = "") { } def prefixline(rootpath, filepath) { - fileContents = readFile("${filepath}").trim() - newFileContents = "" - fileContents.eachline { - newFileContents += "${rootpath}" + "/" + it + def fileContents = readFile("${filepath}").trim() + def fileContentsNormalized = fileContents.normalize() + + def newFileContents = "" + def lines = fileContentsNormalized.readLines() + for (aline in lines) { + newFileContents += "${rootpath}" + "/" + aline } return newFileContents } From 5ee5219418ae4de60c76db138ac8b912365af0b9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 11:36:47 +0000 Subject: [PATCH 5/6] Add platform specific line endings definition --- autobuilder.groovy | 4 +++- platform/lineendings.groovy | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 platform/lineendings.groovy diff --git a/autobuilder.groovy b/autobuilder.groovy index 54cfb12..ef4f938 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -28,6 +28,8 @@ def start(autobuildpath = "${WORKSPACE}/autobuild", commonscriptspath = "${autob configurationhelper = load("${commonscriptsroot}/configuration/configuration.groovy") configurationhelper.registerPipelineScriptConfiguration() + + lineendings = load("${commonscriptsroot}/platform/lineendings.groovy") } def commonscripts() { @@ -42,4 +44,4 @@ def configurationhelper() { return load("${commonscripts()}/configuration/configuration.groovy") } -return this; \ No newline at end of file +return this; diff --git a/platform/lineendings.groovy b/platform/lineendings.groovy new file mode 100644 index 0000000..9657b0d --- /dev/null +++ b/platform/lineendings.groovy @@ -0,0 +1,5 @@ + +// Put ${nl} into strings when wanting a newline +nl = System.properties['line.separator'] + +return this; From ce133e9ba9ca4812c0afa08a6c5fb60aef42f3ea Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 17 Nov 2018 11:55:39 +0000 Subject: [PATCH 6/6] Put line endings on metaversion file --- versionnumbering/metaversion.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/versionnumbering/metaversion.groovy b/versionnumbering/metaversion.groovy index 3b8d7c1..1f6cff6 100644 --- a/versionnumbering/metaversion.groovy +++ b/versionnumbering/metaversion.groovy @@ -1,4 +1,6 @@ +def lineendings = load("${autobuilder.commonscripts()}/platform/lineendings.groovy") + def currentContents(file, newline = "\n", defaultContents = "") { if (fileExists("${file}")) { contents = readFile(file: "${file}").trim() + newline @@ -16,7 +18,7 @@ def prefixline(rootpath, filepath) { def newFileContents = "" def lines = fileContentsNormalized.readLines() for (aline in lines) { - newFileContents += "${rootpath}" + "/" + aline + newFileContents += "${rootpath}" + "/" + aline + "${nl}" } return newFileContents }