[Aplaws-commit] r117 - tools/trunk/misc

[<ssk...@re...>]

Author: sskracic
Date: 2004-11-19 19:53:29 +0100 (Fri, 19 Nov 2004)
New Revision: 117

Modified:
   tools/trunk/misc/build-all.sh
Log:
  Removed the last dependency on ccm-devel environment, notably the
hardcoded /var/ccm-devel/rpm/$USER directory path where ccm apps (but
not tools) are to be built.  Now the ~/rpm top dir is used for building
both tools and apps.  Consequently, RPMs for ccm apps are written to
~/rpm/RPMS/noarch.  Take care.


Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh	2004-11-19 18:20:31 UTC (rev 116)
+++ tools/trunk/misc/build-all.sh	2004-11-19 18:53:29 UTC (rev 117)
@@ -110,8 +110,6 @@
 HOMERPMDIR="$HOMETOPDIR/RPMS/noarch"
 HOMESRPMDIR="$HOMETOPDIR/SRPMS"
 HOMEBUILDDIR="$HOMETOPDIR/BUILD"
-RPMDIR="/var/ccm-devel/rpm/$USER/RPMS/noarch"
-SRPMDIR="/var/ccm-devel/rpm/$USER/SRPMS"
 
 PATH=$VIRTUAL_ROOT/bin:$PATH
 
@@ -299,7 +297,7 @@
   . $VIRTUAL_ROOT/etc/profile.d/ccm-devel.sh
   . $VIRTUAL_ROOT/etc/profile.d/ccm-scripts.sh
 
-export CCM_RPM_DIR=/var/ccm-devel/rpm/$USER
+export CCM_RPM_DIR=$HOMETOPDIR
 export CCM_RPMBUILD_FLAGS="$RPM_ARGS"
 export CLASSPATH="$CLASSPATH:$CCM_SHARED_LIB_DIST_DIR/servlet.jar"
 
@@ -351,7 +349,7 @@
   (
     set -e
     set_application_properties $i
-    $RPM $RPM_ARGS --relocate /usr=$VIRTUAL_ROOT  --relocate /etc=$VIRTUAL_ROOT/etc -ivh $RPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
+    $RPM $RPM_ARGS --relocate /usr=$VIRTUAL_ROOT  --relocate /etc=$VIRTUAL_ROOT/etc -ivh $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
   ) || exit $?
 done
 
@@ -485,9 +483,9 @@
     set_application_properties $APP
 
     # Copy binary, documentation & source RPMs
-    cp $RPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
-    cp $RPMDIR/$APP_NAME-doc-$APP_VERSION-$RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
-    cp $SRPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.src.rpm $BUILD_HOME/dist/bundles/$BUNDLE/SRPMS
+    cp $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
+    cp $HOMERPMDIR/$APP_NAME-doc-$APP_VERSION-$RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
+    cp $HOMESRPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.src.rpm $BUILD_HOME/dist/bundles/$BUNDLE/SRPMS
 
     # Copy binary ZIP
     if [ "x$CCM_DIST_NOZIPS" != "x1" ]; then