Merge commit '128f4b117a' into production

This commit is contained in:
Dan Hawkins 2018-09-08 22:34:56 +01:00
commit b4cd807927
3 changed files with 40 additions and 6 deletions

View file

@ -0,0 +1,12 @@
// Disable parallel make builds - which may be causing autobuild issues
def doDisableParallelMake(rootSearchFolder = "${WORKSPACE}") {
if (isUnix()) {
sh """
# Looks for "<builder*parallelBuildOn="true"* in all .cproject files and replaces the "true" with "false"
find "${rootSearchFolder}" -iname ".cproject" | xargs -iXX sed -i "s@\\(<builder.*parallelBuildOn=\\"\\)true\\(\\"\\)@\\1false\\2@g" XX
"""
}
}
return this;

View file

@ -1,12 +1,13 @@
def doExport(exportfolder, exportpathlist, build_variant = "") {
def doExport(exportfolder, exportpathlist, project = "", build_variant = "") {
def result = 0
for (exportpath in exportpathlist) {
echo "Export path at: ${exportpath}"
script {
echo "Build variant is ${build_variant}"
if (build_variant) {
echo "Build variant is ${build_variant}"
env.destFolder = "${exportfolder}/${build_variant}/${project}"
env.destFolder = "${exportfolder}/${build_variant}"
env.srcFile = "${WORKSPACE}/${exportpath}"
env.srcFileExpanded = srcFile.replace("-BUILDVARIANT-", "${build_variant}")
}
@ -19,13 +20,28 @@ def doExport(exportfolder, exportpathlist, build_variant = "") {
dir (env.destFolder) {
echo "Copy \"${srcFileExpanded}\" to \"${destFolder}\""
if (isUnix()) {
sh "cp -r -v \"${srcFileExpanded}\" \"${destFolder}\""
result = sh( script: """
cp -r -v "${srcFileExpanded}" "${destFolder}"
""",
returnStatus: true
)
if (result != 0) {
return result
}
}
else {
bat 'copy \"%srcFileExpanded%\" \"%destFolder%\"'
result = bat( script: '''
copy \"%srcFileExpanded%\" \"%destFolder%\"
''',
returnStatus: true
)
if (result != 0) {
return result
}
}
}
}
return result
}
// Build and export files
@ -52,14 +68,14 @@ def doBuild(apps, exportfolder = "${WORKSPACE}/bin") {
"%DS5SHELL%" "%BUILD_COMMAND%" ${buildtype} "${project}\\${build_variant}"
"""
}
doExport(exportfolder, exportpathlist, "", build_variant)
}
doExport(exportfolder, exportpathlist, build_variant)
}
}
else {
// Only export if the project has no variants - signifying that there are files to export which have been prebuilt
if (!variants) {
doExport(exportfolder, exportpathlist)
doExport(exportfolder, exportpathlist, project)
}
}
}

View file

@ -72,6 +72,12 @@ jiraprojectpattern = {
'IMB': ( re.compile("^.* +(?:[Ii][Mm][Bb][ _-]*|\#\s*)(\d+):*(.*)$"),
re.compile('^(\S*) Revert " *IMB-(\d+):* (.*)"$'),
),
'HMBXR5601': ( re.compile("^.* +(?:[Hh][Mm][Bb][Xx][Rr]5601[ _-]*|\#\s*)(\d+):*(.*)$"),
re.compile('^(\S*) Revert " *HMBXR5601-(\d+):* (.*)"$'),
),
'SMB': ( re.compile("^.* +(?:[Ss][Mm][Bb][ _-]*|\#\s*)(\d+):*(.*)$"),
re.compile('^(\S*) Revert " *SMB-(\d+):* (.*)"$'),
),
}
mergepattern = re.compile("^(.*)((?:Merge branch '.*'|Merge remote-tracking branch '.*'|Merge commit '.*'|Add '.*' from commit).*)$")