From ae52642f78eef860ed545f280f5a281d117e695e Mon Sep 17 00:00:00 2001 From: Damian Smith Date: Fri, 30 Nov 2018 17:55:55 +0000 Subject: [PATCH] ELGIP-20 edits to allow use on windows --- .../versionnumbering/generate.groovy | 56 +++++++++---------- autobuild/synthesis/synthesis.gsh | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/autobuild/Common_scripts/versionnumbering/generate.groovy b/autobuild/Common_scripts/versionnumbering/generate.groovy index 803a543..925ed65 100644 --- a/autobuild/Common_scripts/versionnumbering/generate.groovy +++ b/autobuild/Common_scripts/versionnumbering/generate.groovy @@ -10,43 +10,43 @@ def getGitRevision(String gitrootpath, int basebuildnumber) { def String remoteinfo def String remoteurl dir( gitrootpath) { - - if (isUnix()) { - def int changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim() + def int changecount + if (isUnix()) { + changecount = sh(returnStdout: true, script: "git rev-list HEAD --count").trim() } - else { - def stdout = bat(returnStdout:true , script: "git rev-list HEAD --count").trim() - def int changecount = stdout.readLines()[1] as int - } + else { + def stdout = bat(returnStdout:true , script: "git rev-list HEAD --count").trim() + changecount = stdout.readLines()[1] as int + } echo "Change count: ${changecount}" adjustedchangecount = (changecount + basebuildnumber) % (maxversionnumber() + 1) echo "Adjusted change count: ${adjustedchangecount}" - - if (isUnix()) { + + if (isUnix()) { gitrevision = sh(returnStdout: true, script: "git rev-parse HEAD").trim() - } - else { - def stdout = bat(returnStdout:true , script: "git rev-parse HEAD").trim() - gitrevision = stdout.readLines()[1] as int - } + } + else { + def stdout = bat(returnStdout:true , script: "git rev-parse HEAD").trim() + gitrevision = stdout.readLines()[1] + } echo "Revision: ${gitrevision}" - - if (isUnix()) { + + if (isUnix()) { remoteinfo = sh(returnStdout: true, script: "git remote show origin").trim() - } - else { - def stdout = bat(returnStdout:true , script: "git remote show origin").trim() - remoteinfo = stdout.readLines()[1] as int - } + } + else { + def stdout = bat(returnStdout:true , script: "git remote show origin").trim() + remoteinfo = stdout.readLines()[1..-1] + } echo "Remote info: ${remoteinfo}" - - if (isUnix()) { + + if (isUnix()) { remoteurl = sh(returnStdout: true, script: "git config --get remote.origin.url").trim() - } - else { - def stdout = bat(returnStdout:true , script: "git config --get remote.origin.ur").trim() - remoteurl = stdout.readLines()[1] as int - } + } + else { + def stdout = bat(returnStdout:true , script: "git config --get remote.origin.url").trim() + remoteurl = stdout.readLines()[1] + } echo "Remote URL: ${remoteurl}" } return [adjustedchangecount, gitrevision, remoteinfo, remoteurl] diff --git a/autobuild/synthesis/synthesis.gsh b/autobuild/synthesis/synthesis.gsh index 2b10157..bcc5f85 100644 --- a/autobuild/synthesis/synthesis.gsh +++ b/autobuild/synthesis/synthesis.gsh @@ -124,7 +124,7 @@ pipeline { } else { env.VERSION_DIR = "${WORKSPACE}\\version" - bat 'mkdir "${WORKSPACE}\\version"' + bat 'mkdir "%WORKSPACE%\\version"' } //env.BUILD_STAMP = readFile("${WORKSPACE}/version/buildstamp.txt").trim() //env.BUILD_STAMP_COMMA_SEP = readFile("${WORKSPACE}/version/buildstampcommasep.txt").trim()