Now that the build has become reliable - remove some debug; Refactor clean up and build set up
This commit is contained in:
parent
cd889893dd
commit
c2425b6165
1 changed files with 15 additions and 1 deletions
|
|
@ -88,10 +88,24 @@ def addToolchainPath(toolchainfolder) {
|
||||||
echo "Path is: ${PATH}"
|
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
|
// 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()
|
doKillLeftovers()
|
||||||
addToolchainPath(toolchainfolder)
|
addToolchainPath(toolchainfolder)
|
||||||
|
doImportProjects(ds5shellcommand, buildcommand, sourcefolder)
|
||||||
for (appInfo in apps ) {
|
for (appInfo in apps ) {
|
||||||
(build, cleanbuild, project, variants, exportpathlist) = appInfo
|
(build, cleanbuild, project, variants, exportpathlist) = appInfo
|
||||||
if (build) {
|
if (build) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue