From 749a7baa710f01866fb1b8f6189be0223c2a3e9e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Sep 2018 14:28:30 +0100 Subject: [PATCH] Now that the build has become reliable - remove some debug; Refactor clean up and build set up --- compile/eclipsebuild/eclipseds5build.gsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 430cfca..f05603a 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -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) {