Put all compiled binaries in one variant specific folder on the target - making it easier to find all shared objects
This commit is contained in:
parent
8dd6686304
commit
128f4b117a
1 changed files with 4 additions and 4 deletions
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue