[Aplaws-commit] r280 - in tools/trunk: misc rpms

[<mb...@re...>]

Author: mbooth
Date: 2005-02-21 18:38:07 +0100 (Mon, 21 Feb 2005)
New Revision: 280

Removed:
   tools/trunk/rpms/servlet22/
Modified:
   tools/trunk/misc/build-all.sh
Log:
Remove legacy servlet22


Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh	2005-02-21 16:42:23 UTC (rev 279)
+++ tools/trunk/misc/build-all.sh	2005-02-21 17:38:07 UTC (rev 280)
@@ -235,7 +235,7 @@
   export RPM_DIR=$HOMETOPDIR
 
 # Build the build tools
-for i in httpunit junit junitperf servlet servlet22
+for i in httpunit junit junitperf servlet
 do
   (
     set -e
@@ -244,9 +244,7 @@
     TOOLS_NAME=`grep 'Name:' *.spec | sed -e 's/Name://' | sed -e 's/ //g'`
     TOOLS_VERSION=`grep 'Version:' *.spec | sed -e 's/Version://' | sed -e 's/ //g'`
     TOOLS_RELEASE=`grep 'Release:' *.spec | sed -e 's/Release://' | sed -e 's/ //g'`
-    if [ $i != "servlet22" ]; then
-      $RPM $RPM_ARGS -ivh --relocate /usr=$VIRTUAL_ROOT $HOMERPMDIR/$TOOLS_NAME-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm
-    fi
+    $RPM $RPM_ARGS -ivh --relocate /usr=$VIRTUAL_ROOT $HOMERPMDIR/$TOOLS_NAME-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm
   ) || exit $?
 done