From 05c18c11a45d9765fb616956f278ac69e5a7ab97 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Sep 2018 12:52:17 +0100 Subject: [PATCH 1/6] Now that the build has become reliable - remove some debug; Refactor clean up and build set up --- compile/eclipsebuild/eclipseds5build.gsh | 33 ++++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index c0e28c0..1095d32 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -61,7 +61,27 @@ def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { } // Build and export files -def doBuild(apps, exportfolder = "${WORKSPACE}/bin") { +def doRegisterToolchain(ds5folder, toolchainfolder) { + # Register toolchain (if it is not already) + if (isUnix()) { + sh """ + "${ds5folder}/bin/add_toolchain" --non-interactive "${toolchainfolder}" + """ + env.PATH = env.TOOLCHAIN_FOLDER + ":" + env.PATH + } + else { + bat """ + "%ds5folder%\\bin\\add_toolchain" --non-interactive "%toolchainfolder%" + """ + env.PATH = env.TOOLCHAIN_FOLDER + ";" + env.PATH + } + echo "Path is: ${PATH}" +} + +// Build and export files +def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, exportfolder = "${WORKSPACE}/bin") { + doKillLeftovers() + doRegisterToolchain(ds5folder, toolchainfolder for (appInfo in apps ) { (build, cleanbuild, project, variants, exportpathlist) = appInfo if (build) { @@ -73,20 +93,17 @@ def doBuild(apps, exportfolder = "${WORKSPACE}/bin") { } for (build_variant in variants) { retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) - echo "Build command: ${DS5SHELL} \'${BUILD_COMMAND} ${buildtype} \"${project}/${build_variant}\"\'" - doKillLeftovers() + echo "Build command: ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\'" if (isUnix()) { sh """ - # Register toolchain (if it is not already) - "${DS5_FOLDER}/bin/add_toolchain" --non-interactive "${TOOLCHAIN_FOLDER}" echo Start time: `date` - ${DS5SHELL} \'${BUILD_COMMAND} ${buildtype} \"${project}/${build_variant}\"\' + ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\' echo End time: `date` """ } else { bat """ - "%DS5SHELL%" "%BUILD_COMMAND%" ${buildtype} "${project}\\${build_variant}" + "%ds5shellcommand%" "%buildcommand%" ${buildtype} "${project}\\${build_variant}" """ } doExport(exportfolder, exportpathlist, "", build_variant) @@ -102,4 +119,4 @@ def doBuild(apps, exportfolder = "${WORKSPACE}/bin") { } } -return this; \ No newline at end of file +return this; From 8783c9a9c3b960488de81a67fdcbb8e37157665b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Sep 2018 13:10:12 +0100 Subject: [PATCH 2/6] Now that the build has become reliable - remove some debug; Refactor clean up and build set up --- compile/eclipsebuild/eclipseds5build.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 1095d32..8d781a4 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -62,7 +62,7 @@ def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { // Build and export files def doRegisterToolchain(ds5folder, toolchainfolder) { - # Register toolchain (if it is not already) + // Register toolchain (if it is not already) if (isUnix()) { sh """ "${ds5folder}/bin/add_toolchain" --non-interactive "${toolchainfolder}" From c72196569f5c5d563095137f4724d0bdf6ddcc0d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Sep 2018 13:15:17 +0100 Subject: [PATCH 3/6] Now that the build has become reliable - remove some debug; Refactor clean up and build set up --- compile/eclipsebuild/eclipseds5build.gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 8d781a4..7409d96 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -81,7 +81,7 @@ def doRegisterToolchain(ds5folder, toolchainfolder) { // Build and export files def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, exportfolder = "${WORKSPACE}/bin") { doKillLeftovers() - doRegisterToolchain(ds5folder, toolchainfolder + doRegisterToolchain(ds5folder, toolchainfolder) for (appInfo in apps ) { (build, cleanbuild, project, variants, exportpathlist) = appInfo if (build) { From cd889893dd577a529f1f64e927815b888f1c3ec7 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Sep 2018 13:42:44 +0100 Subject: [PATCH 4/6] Now that the build has become reliable - remove some debug; Refactor clean up and build set up --- compile/eclipsebuild/eclipseds5build.gsh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 7409d96..69e9884 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -60,20 +60,30 @@ def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { return result } -// Build and export files +// Register toolchain def doRegisterToolchain(ds5folder, toolchainfolder) { // Register toolchain (if it is not already) if (isUnix()) { sh """ "${ds5folder}/bin/add_toolchain" --non-interactive "${toolchainfolder}" """ - env.PATH = env.TOOLCHAIN_FOLDER + ":" + env.PATH } else { bat """ "%ds5folder%\\bin\\add_toolchain" --non-interactive "%toolchainfolder%" """ - env.PATH = env.TOOLCHAIN_FOLDER + ";" + env.PATH + } + echo "Path is: ${PATH}" +} + +// Add toolchain to path +def addToolchainPath(toolchainfolder) { + // Register toolchain (if it is not already) + if (isUnix()) { + env.PATH = toolchainfolder + ":" + env.PATH + } + else { + env.PATH = toolchainfolder + ";" + env.PATH } echo "Path is: ${PATH}" } @@ -81,7 +91,7 @@ def doRegisterToolchain(ds5folder, toolchainfolder) { // Build and export files def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, exportfolder = "${WORKSPACE}/bin") { doKillLeftovers() - doRegisterToolchain(ds5folder, toolchainfolder) + addToolchainPath(toolchainfolder) for (appInfo in apps ) { (build, cleanbuild, project, variants, exportpathlist) = appInfo if (build) { @@ -93,6 +103,7 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, exp } for (build_variant in variants) { retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing) + doRegisterToolchain(ds5folder, toolchainfolder) echo "Build command: ${ds5shellcommand} \'${buildcommand} ${buildtype} \"${project}/${build_variant}\"\'" if (isUnix()) { sh """ From c2425b61656405cc4f585d67ca301b642b068ccc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Sep 2018 14:19:21 +0100 Subject: [PATCH 5/6] Now that the build has become reliable - remove some debug; Refactor clean up and build set up --- compile/eclipsebuild/eclipseds5build.gsh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 69e9884..430cfca 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -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) { From 749a7baa710f01866fb1b8f6189be0223c2a3e9e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 15 Sep 2018 14:28:30 +0100 Subject: [PATCH 6/6] 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) {