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

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

Author: sskracic
Date: 2004-11-11 17:45:33 +0100 (Thu, 11 Nov 2004)
New Revision: 92

Modified:
   tools/trunk/misc/build-all.sh
Log:
  The script now autogenerates an approximation of project.xml
in the top-level app directory, ie. in $BUILD_HOME/ccm-cms,
not in the $BUILD_HOME/ccm-cms/ccm-cms.  It constructs the
<ccm:prebuilt> list based on the currently installed ccm-*
RPMs (in virtual rpm db, of course).


Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh	2004-11-10 23:11:10 UTC (rev 91)
+++ tools/trunk/misc/build-all.sh	2004-11-11 16:45:33 UTC (rev 92)
@@ -174,8 +174,15 @@
   mkdir -p $VIRTUAL_ROOT/etc/ccm
   mkdir -p $VIRTUAL_ROOT/etc/profile.d
   mkdir -p $VIRTUAL_ROOT/share/ccm-tools
+  mkdir -p $VIRTUAL_ROOT/share/doc
+  mkdir -p $VIRTUAL_ROOT/bin
+  mkdir -p $VIRTUAL_ROOT/var/cache
+  mkdir -p $VIRTUAL_ROOT/var/lib/ccm
+  mkdir -p $VIRTUAL_ROOT/var/lib/ccm-devel
+  mkdir -p $VIRTUAL_ROOT/var/log
+  mkdir -p $VIRTUAL_ROOT/var/opt/ccm/data
 
-  $RPM --dbpath $RPM_DB --initdb
+  $RPM $RPM_ARGS --initdb
 
   cat > fake.spec <<EOF
 Name: fake
@@ -206,6 +213,8 @@
 Provides: perl(File::Copy)
 Provides: perl(File::Find)
 Provides: perl(POSIX)
+Provides: perl(Carp)
+Provides: perl(lib)
 
 
 %description
@@ -216,7 +225,7 @@
 
   rpmbuild -ba fake.spec
 
-  $RPM --dbpath $RPM_DB -ivh $HOMERPMDIR/fake-2.0.0-1.noarch.rpm
+  $RPM $RPM_ARGS -ivh $HOMERPMDIR/fake-2.0.0-1.noarch.rpm
 
 # Build the build tools
 for i in httpunit junit junitperf servlet servlet22
@@ -292,10 +301,41 @@
   (
     set -e
     cd $i
+    # generate skeleton project.xml
+    # But!  We must list all installed WAF RPMs in
+    # <prebuilt> section of project.xml, otherwise
+    # no build.xml will be generated.
+    cat > project.xml <<EOF
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<ccm:project name="$CCM_APP"
+       prettyName="Red Hat Web Application Framework"
+         ccmVersion="6.1"
+      versionFrom="$CCM_APP"
+        xmlns:ccm="http://ccm.redhat.com/ccm-project">
+
+  <ccm:build>
+    <ccm:application name="$CCM_APP" prettyName="Red Hat Web Application Framework" buildOrder="1"/>
+  </ccm:build>
+
+  <ccm:prebuilt>
+$($RPM $RPM_ARGS -qa --qf "<ccm:application name=\"%{NAME}\" version=\"%{VERSION}\"/>\n" 'ccm*')
+  </ccm:prebuilt>
+
+</ccm:project>
+EOF
+
     echo "BUILDING $i in directory `pwd`"
-    rm -rf rollingbuild
     export CCM_APPS=$i
-    $BUILD_HOME/rollingbuild.sh
+    rm -rf rollingbuild build MANIFEST MANIFEST.SKIP
+
+    if [ "x$AUTO_BUILD_COUNTER" != "x" ]; then
+      CCM_BUILD_COUNTER=$AUTO_BUILD_COUNTER
+      export CCM_BUILD_COUNTER
+    fi
+
+    $CCM_SCRIPTS_HOME/bin/build.sh
+
   ) || exit $?
   (
     set -e