Merge commit 'a21ec9aace' into production

This commit is contained in:
Dan Hawkins 2018-02-15 11:18:49 +00:00
commit c2458d0c82

View file

@ -1,18 +1,18 @@
// Build and export files
def doBuild(apps) {
for (appInfo in apps ) {
build = appInfo[0]
project = appInfo[1]
variants = appInfo[2]
exportpath = appInfo[3]
(build, project, variants, exportpath) = appInfo
if (build) {
for (build_variant in variants) {
retry(3) { // Eclipse occasionally raises exceptions (rather than the builds failing)
if (isUnix()) {
sh "${BUILD_COMMAND} -build ${project}/${build_variant}"
}
echo "Build command: ${BUILD_COMMAND} -build \"${project}/${build_variant}\""
sh "${BUILD_COMMAND} -build \"${project}/${build_variant}\""
}
else {
bat "%BUILD_COMMAND% -build ${project}/${build_variant}"
bat """
"%BUILD_COMMAND%" -build "${project}\\${build_variant}"
"""
}
}
if (exportpath) {
@ -39,4 +39,4 @@ def doBuild(apps) {
}
}
return this;
return this;