Merge commit '99d341a1b0' into production
This commit is contained in:
commit
bd5f2cfa10
1 changed files with 20 additions and 1 deletions
|
|
@ -1,4 +1,20 @@
|
||||||
|
|
||||||
|
def doKillLeftovers() {
|
||||||
|
if (isUnix()) {
|
||||||
|
sh """
|
||||||
|
# Killing any processes that may interfere with the next build
|
||||||
|
# The build system must be setup to do more than one eclipse build concurrently
|
||||||
|
ps aux | grep "eclipsews"
|
||||||
|
ps aux | grep "make"
|
||||||
|
ps aux | grep "arm-linux"
|
||||||
|
# Don't return an error if the processes don't exist
|
||||||
|
pkill -9 eclipsews || true
|
||||||
|
pkill -9 make || true
|
||||||
|
pkill -9 ".*arm-linux.*" || true
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def doExport(exportfolder, exportpathlist, project = "", build_variant = "") {
|
def doExport(exportfolder, exportpathlist, project = "", build_variant = "") {
|
||||||
def result = 0
|
def result = 0
|
||||||
for (exportpath in exportpathlist) {
|
for (exportpath in exportpathlist) {
|
||||||
|
|
@ -58,8 +74,11 @@ def doBuild(apps, exportfolder = "${WORKSPACE}/bin") {
|
||||||
for (build_variant in variants) {
|
for (build_variant in variants) {
|
||||||
retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing)
|
retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing)
|
||||||
echo "Build command: ${DS5SHELL} \'${BUILD_COMMAND} ${buildtype} \"${project}/${build_variant}\"\'"
|
echo "Build command: ${DS5SHELL} \'${BUILD_COMMAND} ${buildtype} \"${project}/${build_variant}\"\'"
|
||||||
|
doKillLeftovers()
|
||||||
if (isUnix()) {
|
if (isUnix()) {
|
||||||
sh """
|
sh """
|
||||||
|
# Register toolchain (if it is not already)
|
||||||
|
"${DS5_FOLDER}/bin/add_toolchain" --non-interactive "${TOOLCHAIN_FOLDER}"
|
||||||
echo Start time: `date`
|
echo Start time: `date`
|
||||||
${DS5SHELL} \'${BUILD_COMMAND} ${buildtype} \"${project}/${build_variant}\"\'
|
${DS5SHELL} \'${BUILD_COMMAND} ${buildtype} \"${project}/${build_variant}\"\'
|
||||||
echo End time: `date`
|
echo End time: `date`
|
||||||
|
|
@ -83,4 +102,4 @@ def doBuild(apps, exportfolder = "${WORKSPACE}/bin") {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
Loading…
Add table
Add a link
Reference in a new issue