Create a meta folder seperate from other artifacts

This commit is contained in:
Dan Hawkins 2018-11-18 14:25:55 +00:00
commit c318b8448c
2 changed files with 8 additions and 6 deletions

View file

@ -37,8 +37,6 @@ def start(autobuildpath = autobuildroot, commonscriptspath = commonscriptsroot)
def metafolder = load("${commonscripts()}/meta/folder.groovy")
metafolder.metareset()
def lineendings = load("${commonscripts()}/platform/lineendings.groovy")
def ch = load("${commonscripts()}/configuration/configuration.groovy")
ch.registerPipelineScriptConfiguration()
}

View file

@ -1,9 +1,11 @@
env.VERSIONARTIFACTS = "version/**"
VERSIONFOLDER = "${WORKSPACE}/version"
metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy")
env.VERSIONARTIFACTS = "${metafolder.METAFOLDERNAME}/version/**"
VERSIONFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/version"
def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobname = "", versionfolder = "${VERSIONFOLDER}", jobname = "${JOB_NAME}", buildid = "${BUILD_ID}") {
cs = autobuilder.commonscripts()
def cs = autobuilder.commonscripts()
if (isUnix()) {
sh """
"${PYTHON}" -u "${cs}/versionnumbering/versioninfo.py" -s "${sourcerevision}" -v "${versionfolder}" -g "${sourcepath}" -b "${basebuildnumber}" -j "${jobname}" -n "${buildid}" -r "${releasejobname}"
@ -17,7 +19,9 @@ def generate(sourcerevision, sourcepath, basebuildnumber = "1000", releasejobnam
env.BUILD_STAMP = readFile("${VERSIONFOLDER}/buildstamp.txt").trim()
env.BUILD_STAMP_COMMA_SEP = readFile("${VERSIONFOLDER}/buildstampcommasep.txt").trim()
env.SRC_REVISION = readFile("${VERSIONFOLDER}/revision.txt").trim()
configurationhelper.saveConfigurationInVersionInfo();
def ch = load("${commonscripts()}/configuration/configuration.groovy")
ch.saveConfigurationInVersionInfo();
}
return this;