Now that the build has become reliable - remove some debug; Refactor clean up and build set up

This commit is contained in:
Dan Hawkins 2018-09-15 14:19:21 +01:00
commit c2425b6165

View file

@ -88,10 +88,24 @@ def addToolchainPath(toolchainfolder) {
echo "Path is: ${PATH}"
}
// Import all eclipse projects in a given folder
def doImportProjects(ds5shellcommand, buildcommand, sourcefolder) {
doRegisterToolchain(ds5folder, toolchainfolder)
if (isUnix()) {
sh """
${ds5shellcommand} \'${buildcommand} -no-indexer -importAll "${sourcefolder}"\'
"""
}
else {
bat '%ds5shellcommand% %buildcommand% -no-indexer -importAll "%sourcefolder%"'
}
}
// Build and export files
def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, exportfolder = "${WORKSPACE}/bin") {
def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, exportfolder = "${WORKSPACE}/bin") {
doKillLeftovers()
addToolchainPath(toolchainfolder)
doImportProjects(ds5shellcommand, buildcommand, sourcefolder)
for (appInfo in apps ) {
(build, cleanbuild, project, variants, exportpathlist) = appInfo
if (build) {