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:28:30 +01:00
commit 749a7baa71

View file

@ -89,7 +89,7 @@ def addToolchainPath(toolchainfolder) {
}
// Import all eclipse projects in a given folder
def doImportProjects(ds5shellcommand, buildcommand, sourcefolder) {
def doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder) {
doRegisterToolchain(ds5folder, toolchainfolder)
if (isUnix()) {
sh """
@ -105,7 +105,7 @@ def doImportProjects(ds5shellcommand, buildcommand, sourcefolder) {
def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder, exportfolder = "${WORKSPACE}/bin") {
doKillLeftovers()
addToolchainPath(toolchainfolder)
doImportProjects(ds5shellcommand, buildcommand, sourcefolder)
doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder)
for (appInfo in apps ) {
(build, cleanbuild, project, variants, exportpathlist) = appInfo
if (build) {