From 5f2d517705bc385a80b7e59c1a48245af746637c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 8 Sep 2018 19:53:12 +0100 Subject: [PATCH] Put all compiled binaries in one variant specific folder on the target - making it easier to find all shared objects --- compile/eclipsebuild/eclipseds5build.gsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compile/eclipsebuild/eclipseds5build.gsh b/compile/eclipsebuild/eclipseds5build.gsh index 5d8c5a3..9f702fe 100644 --- a/compile/eclipsebuild/eclipseds5build.gsh +++ b/compile/eclipsebuild/eclipseds5build.gsh @@ -1,5 +1,5 @@ -def doExport(exportfolder, exportpathlist, build_variant = "") { +def doExport(exportfolder, exportpathlist, project = "", build_variant = "") { def result = 0 for (exportpath in exportpathlist) { echo "Export path at: ${exportpath}" @@ -7,7 +7,7 @@ def doExport(exportfolder, exportpathlist, build_variant = "") { echo "Build variant is ${build_variant}" if (build_variant) { echo "Build variant is ${build_variant}" - env.destFolder = "${exportfolder}/${build_variant}/${project}" + env.destFolder = "${exportfolder}/${build_variant}" env.srcFile = "${WORKSPACE}/${exportpath}" env.srcFileExpanded = srcFile.replace("-BUILDVARIANT-", "${build_variant}") } @@ -68,14 +68,14 @@ def doBuild(apps, exportfolder = "${WORKSPACE}/bin") { "%DS5SHELL%" "%BUILD_COMMAND%" ${buildtype} "${project}\\${build_variant}" """ } - doExport(exportfolder, exportpathlist, build_variant) + doExport(exportfolder, exportpathlist, "", build_variant) } } } else { // Only export if the project has no variants - signifying that there are files to export which have been prebuilt if (!variants) { - doExport(exportfolder, exportpathlist) + doExport(exportfolder, exportpathlist, project) } } }