Inject tidlc path

[scm/meta/abs.git] / build.template

diff --git a/build.template b/build.template
index 1a749f0..2ce886e 100644 (file)
--- a/build.template
+++ b/build.template
@@ -1,4 +1,4 @@
-$!/bin/bash
+#!/bin/bash
 set -x
 
 ABS_CMD=/home/build/abs
@@ -60,6 +60,10 @@ if [[ ! $rs_list =~ [0-9]{8}_[0-9] ]]; then
   echo ${rs_list}.${dateversion} > $SHARE_ROOT/rsver
 fi
 
+# Inject tidlc path
+TIDLC_PATH=`sed -n '/tidl/p' /home/build/.bashrc | cut -f2 -d':'`
+if [ ! -z ${TIDLC_PATH} ]; then echo "PATH=\$PATH:${TIDLC_PATH}" >> /home/build/.profile; fi
+
 for rs in $rs_list; do
   echo "BUILDING START TIME: `date`"
   #if [[ $rs == *"64.core"* ]]; then
@@ -67,7 +71,12 @@ for rs in $rs_list; do
   #else
     su - build -c "${ABS_CMD} build -r $rs -w ${BUILD_ROOT}/${PACKAGE} -s ABS -c ${BUILD_MODE} ${PARALLEL_JOBS} --profile-to-search ${PROFILE}"
   #fi
-  mv ${TMP_DIR}/*.tpk ${SHARE_ROOT}
+  count=`ls -1 ${TMP_DIR}/*.tpk 2>/dev/null | wc -l`
+  if [ $count != 0 ]; then
+    mv ${TMP_DIR}/*.tpk ${SHARE_ROOT}
+  else
+    mv ${TMP_DIR}/*.wgt ${SHARE_ROOT}
+  fi
   ret=$?; echo "BUILDING FINISH TIME: `date`"
   if [ $ret != 0 ]; then
     echo $rs build fail; _clear 8