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

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

Author: sskracic
Date: 2004-11-18 16:11:45 +0100 (Thu, 18 Nov 2004)
New Revision: 110

Modified:
   tools/trunk/misc/build-all.sh
Log:
ccm-tools should be buildable without ccm-tools installed beforehand.


Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh	2004-11-17 16:25:58 UTC (rev 109)
+++ tools/trunk/misc/build-all.sh	2004-11-18 15:11:45 UTC (rev 110)
@@ -108,6 +108,7 @@
 
 HOMERPMDIR="$(eval echo ~$USER)/rpm/RPMS/noarch"
 HOMESRPMDIR="$(eval echo ~$USER)/rpm/SRPMS"
+HOMEBUILDDIR="$(eval echo ~$USER)/rpm/BUILD"
 RPMDIR="/var/ccm-devel/rpm/$USER/RPMS/noarch"
 SRPMDIR="/var/ccm-devel/rpm/$USER/SRPMS"
 
@@ -247,12 +248,12 @@
 (
   set -e
   cd tools/tools
-  ./rollingbuild.sh
   TOOLS_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
   TOOLS_RELEASE=`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`
+  ccm_tools_home="$HOMEBUILDDIR/ccm-tools-$TOOLS_VERSION"
+  CCM_TOOLS_HOME="$ccm_tools_home" ./rollingbuild.sh
   $RPM $RPM_ARGS -ivh --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT  --relocate /var=$VIRTUAL_ROOT/var $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm
 #  $BUILD_HOME/rpm -ivh --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT  --relocate /var=$VIRTUAL_ROOT/var --define "_dbpath $VIRTUAL_ROOT/rpmdb" $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm $HOMERPMDIR/ccm-tools-servlet-tomcat-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm $HOMERPMDIR/ccm-tools-servlet-resin-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm 
-  echo $CCM_TOOLS_HOME
 ) || exit $?
 . $VIRTUAL_ROOT/etc/profile.d/ccm-tools.sh