This commit is contained in:
Dan Hawkins 2019-12-06 16:08:04 +00:00
commit ec1acff09b
2 changed files with 8 additions and 1 deletions

View file

@ -156,7 +156,7 @@ def doBuildAndExportProject(String ds5folder, String toolchainfolder, String ds5
doDisplayLeftovers() doDisplayLeftovers()
doRegisterToolchain(ds5folder, toolchainfolder) doRegisterToolchain(ds5folder, toolchainfolder)
echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer -build \"${project}/${build_variant}\"\'" echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer -build \"${project}/${build_variant}\"\'"
timeout(time: 10, unit: 'MINUTES') { timeout(time: 20, unit: 'MINUTES') {
if (isUnix()) { if (isUnix()) {
sh """ sh """
echo Start time: `date` echo Start time: `date`

View file

@ -159,4 +159,11 @@ String generate(meta, String sourcerevision, String sourcepath, String basebuild
return generate(meta, sourcerevision, sourcepath, bbn) return generate(meta, sourcerevision, sourcepath, bbn)
} }
String copyfrom(meta, othermeta) {
meta.gitinfo = othermeta.gitinfo
meta.buildstampinfo = othermeta.buildstampinfo
return meta.buildstampinfo.buildstamp
}
return this; return this;