From: Timo Mueller <timo.muel...@bmw-carit.de>
Signed-off-by: Timo Mueller <timo.muel...@bmw-carit.de>
---
scripts/build.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/scripts/build.sh b/scripts/build.sh
index e1ec5fc..73bf889 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -132,10 +132,14 @@ cd ${TOP}
#build
java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.bc.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-DbuildId=${RELEASE} || fail $? "normal build"
+java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.doc.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-DbuildId=${RELEASE} || fail $? "normal build"
java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.sdk.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-DbuildId=${RELEASE} || fail $? "normal build"
-if [ -f ${BUILD_DIR}/I.${RELEASE}/org.yocto.sdk-${RELEASE}.zip ] && [ -f
${BUILD_DIR}/I.${RELEASE}/org.yocto.bc-${RELEASE}.zip ]; then
+if [ -f ${BUILD_DIR}/I.${RELEASE}/org.yocto.sdk-${RELEASE}.zip ] &&
+ [ -f ${BUILD_DIR}/I.${RELEASE}/org.yocto.bc-${RELEASE}.zip ] &&
+ [ -f ${BUILD_DIR}/I.${RELEASE}/org.yocto.doc-${RELEASE}.zip ]; then
cp -f ${BUILD_DIR}/I.${RELEASE}/org.yocto.bc-${RELEASE}.zip
./org.yocto.bc-${RELEASE}-${DATE}.zip
+ cp -f ${BUILD_DIR}/I.${RELEASE}/org.yocto.doc-${RELEASE}.zip
./org.yocto.doc-${RELEASE}-${DATE}.zip
cp -f ${BUILD_DIR}/I.${RELEASE}/org.yocto.sdk-${RELEASE}.zip
./org.yocto.sdk-${RELEASE}-${DATE}.zip
rm -rf ${BUILD_DIR}
else
@@ -144,10 +148,13 @@ fi
#build archive for update site
java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.bc.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-DbuildId=${RELEASE} -Dp2.gathering=true || fail $? "archive build"
+java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.doc.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-DbuildId=${RELEASE} -Dp2.gathering=true || fail $? "archive build"
java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.sdk.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-DbuildId=${RELEASE} -Dp2.gathering=true || fail $? "archive build"
#clean up
-if [ -f
${BUILD_DIR}/I.${RELEASE}/org.yocto.sdk-${RELEASE}-group.group.group.zip ] && [
-f ${BUILD_DIR}/I.${RELEASE}/org.yocto.bc-${RELEASE}-group.group.group.zip ];
then
+if [ -f
${BUILD_DIR}/I.${RELEASE}/org.yocto.sdk-${RELEASE}-group.group.group.zip ] &&
+ [ -f
${BUILD_DIR}/I.${RELEASE}/org.yocto.bc-${RELEASE}-group.group.group.zip ] &&
+ [ -f
${BUILD_DIR}/I.${RELEASE}/org.yocto.doc-${RELEASE}-group.group.group.zip ]; then
cp -f
${BUILD_DIR}/I.${RELEASE}/org.yocto.sdk-${RELEASE}-group.group.group.zip
./org.yocto.sdk-${RELEASE}-${DATE}-archive.zip
rm -rf ${BUILD_TOP}
else
--
1.7.11.7
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
