svn commit: r375080 - /lenya/zone/bin/nightly-trunk.sh

[th...@apache.org]

Author: thorsten
Date: Sun Feb  5 10:52:48 2006
New Revision: 375080

URL: http://svn.apache.org/viewcvs?rev=375080&view=rev
Log:
Removing the cocoon build dir before building lenya this let lenya build cocoon again.

Modified:
    lenya/zone/bin/nightly-trunk.sh

Modified: lenya/zone/bin/nightly-trunk.sh
URL: http://svn.apache.org/viewcvs/lenya/zone/bin/nightly-trunk.sh?rev=375080&r1=375079&r2=375080&view=diff
==============================================================================
--- lenya/zone/bin/nightly-trunk.sh (original)
+++ lenya/zone/bin/nightly-trunk.sh Sun Feb  5 10:52:48 2006
@@ -53,7 +53,7 @@
 if [ $cocoon = true ]; then
 #update cocoon
 echo >> $logfile
-echo "#update (if not set to false) cocoon and build" >> $logfile
+echo "#update (if not set to false) cocoon" >> $logfile
  cd /export/home/lenya/src/cocoon-2.1.x
  if [ $update = true ]; then
   echo >> $logfile
@@ -68,23 +68,6 @@
    exit 1
   fi
  fi
- echo "#building" >> $logfile
- ./build.sh clean >> $logfile 2>&1
- status=$?
-  if [ ! $status ]; then
-   subject="[lenya.trunk.update] cocoon build clean failed"
-   message="Please resolve possible conflicts by hand login into the zone server and looking at /export/home/lenya/src/cocoon-2.1.x"
-   sendMsg "$subject" "$weblog" "$message"
-   exit 1
-  fi
- ./build.sh >> $logfile 2>&1
- status=$?
-  if [ ! $status ]; then
-   subject="[lenya.trunk.update] cocoon build clean failed"
-   message="Please resolve possible conflicts by hand login into the zone server and looking at /export/home/lenya/src/cocoon-2.1.x"
-   sendMsg "$subject" "$weblog" "$message"
-   exit 1
-  fi
 fi
 
 #update trunk & restart
@@ -110,17 +93,11 @@
 rm /export/home/lenya/bin/lenya-trunk.pid  >> $logfile
 echo "#building clean" >> $logfile 2>&1
 rm /export/home/lenya/src/cocoon-2.1.x/local.b*
+rm -rf /export/home/lenya/src/cocoon-2.1.x/build/
+cp src/cocoon/local.b* /export/home/lenya/src/cocoon-2.1.x/
 ./build.sh clean >> $logfile 2>&1
- status=$?
- echo "statusBuildClean=$status" >> $logfile
   check=`cat $logfile|grep "BUILD FAILED"`
  echo "statusCheck=$check" >> $logfile
- if [ ! $status ]; then
-   subject="[lenya.trunk.update] lenya-trunk build clean failed"
-   message="Please resolve possible conflicts by hand login into the zone server and looking at  /export/home/lenya/src/lenya-trunk"
-   sendMsg "$subject" "$weblog" "$message"
-   exit 1
- fi
  if [ -n "$check" ]; then
    subject="[lenya.trunk.update] lenya-trunk build clean failed"
    message="Please resolve possible conflicts by hand login into the zone server and looking at  /export/home/lenya/src/lenya-trunk"
@@ -129,16 +106,8 @@
  fi
 echo "#building" >> $logfile 2>&1
 ./build.sh >> $logfile 2>&1
- status=$?
- echo "statusBuild=$status" >> $logfile
  check=`cat $logfile|grep "BUILD FAILED"`
  echo "statusCheck=$check" >> $logfile
- if [ ! $status ]; then
-   subject="[lenya.trunk.update] lenya-trunk build failed"
-   message="Please resolve possible conflicts by hand login into the zone server and looking at  /export/home/lenya/src/lenya-trunk"
-   sendMsg "$subject" "$weblog" "$message"
-   exit 1
- fi
  if [ -n "$check" ]; then
    subject="[lenya.trunk.update] lenya-trunk build failed"
    message="Please resolve possible conflicts by hand login into the zone server and looking at  /export/home/lenya/src/lenya-trunk"



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org