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

[<ssk...@vh...>]

Author: sskracic
Date: 2005-08-27 01:19:25 +0200 (Sat, 27 Aug 2005)
New Revision: 725

Modified:
   tools/trunk/misc/build-all.sh
Log:
  Bootstrapping the build-all from the machine with no ccm-tools
installed beforehand was not possible, now it is.


Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh	2005-08-26 21:49:14 UTC (rev 724)
+++ tools/trunk/misc/build-all.sh	2005-08-26 23:19:25 UTC (rev 725)
@@ -471,7 +471,7 @@
   set -e
   cd tools/devel
   check_svn_tagged
-  ./rollingbuild.sh
+  CCM_TOOLS_HOME=$VIRTUAL_ROOT/share/ccm-tools ./rollingbuild.sh
   DEVEL_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
   DEVEL_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
   $RPM $RPM_ARGS -ivh --noscripts --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT  --relocate /var=$VIRTUAL_ROOT/var $HOMERPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm
@@ -482,7 +482,7 @@
   set -e
   cd tools/scripts
   check_svn_tagged
-  ./rollingbuild.sh
+  CCM_TOOLS_HOME=$VIRTUAL_ROOT/share/ccm-tools ./rollingbuild.sh
   SCRIPTS_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
   SCRIPTS_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
   $RPM $RPM_ARGS -ivh --noscripts --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT $HOMERPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.noarch.rpm
@@ -554,7 +554,7 @@
         export CCM_BUILD_COUNTER
     fi
 
-    $CCM_SCRIPTS_HOME/bin/build.sh
+    CCM_TOOLS_HOME=$VIRTUAL_ROOT/share/ccm-tools CCM_SCRIPTS_HOME=$VIRTUAL_ROOT/share/ccm-scripts CCM_CONFIG_HOME=$VIRTUAL_ROOT/share/ccm-devel $VIRTUAL_ROOT/share/ccm-scripts/bin/build.sh
 
   ) || exit $?
   (