HMBXR5601-827 - Update compile output suitable for packaging

This commit is contained in:
Dan Hawkins 2019-08-19 16:43:26 +01:00
commit 8307a878e8

View file

@ -164,7 +164,7 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou
doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder)
}
for (appInfo in apps) {
(build, export, project, variants, exportpathlist, destpart) = appInfo
(build, doexport, project, variants, exportpathlist, destpart) = appInfo
if (build) {
for (build_variant in variants) {
retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing)
@ -191,7 +191,7 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou
if (result != 0) {
error "Failed to check files...."
}
if (export) {
if (doexport) {
result = doExport(exportfolder, exportpathlist, destpart, build_variant)
if (result != 0) {
error "Failed to copy...."
@ -210,7 +210,7 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou
}
}
else {
if (export) {
if (doexport) {
if (!variants) {
result = doExport(exportfolder, exportpathlist, destpart)
if (result != 0) {