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

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

Author: sskracic
Date: 2005-09-23 12:51:35 +0200 (Fri, 23 Sep 2005)
New Revision: 918

Modified:
   trunk/tools/misc/build-all.sh
Log:
  Replaced hardcoded pkg version and release numbers with
a lookup to the actual .spec file.


Modified: trunk/tools/misc/build-all.sh
===================================================================
--- trunk/tools/misc/build-all.sh	2005-09-23 09:13:53 UTC (rev 917)
+++ trunk/tools/misc/build-all.sh	2005-09-23 10:51:35 UTC (rev 918)
@@ -602,31 +602,33 @@
 
 (
   set -e
-  BUNDLE_VERSION=`grep 'VERSION=' tools/bundle/configure.in | sed -e 's/VERSION=//'`
-  BUNDLE_RELEASE=`grep 'RELEASE=' tools/bundle/configure.in | sed -e 's/RELEASE=//'`
-  TOOLS_VERSION=`grep 'VERSION=' tools/tools/configure.in | sed -e 's/VERSION=//'`
-  TOOLS_RELEASE=`grep 'RELEASE=' tools/tools/configure.in | sed -e 's/RELEASE=//'`
-  DEVEL_VERSION=`grep 'VERSION=' tools/devel/configure.in | sed -e 's/VERSION=//'`
-  DEVEL_RELEASE=`grep 'RELEASE=' tools/devel/configure.in | sed -e 's/RELEASE=//'`
-  SCRIPTS_VERSION=`grep 'VERSION=' tools/scripts/configure.in | sed -e 's/VERSION=//'`
-  SCRIPTS_RELEASE=`grep 'RELEASE=' tools/scripts/configure.in | sed -e 's/RELEASE=//'`
 
-  cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/junitperf-1.8-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/httpunit-1.5.4-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-java-1.0-1.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/servlet-2.3-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-#  cp $HOMERPMDIR/servlet-2.2-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-tools-servlet-tomcat-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-tools-servlet-resin-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-devel-perforce-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-devel-cvs-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMERPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
+  BUNDLE_RADIX=`rpm -q --specfile tools/bundle/ccm-tools-bundle.spec`
+  TOOLS_RADIX=`rpm -q --specfile tools/tools/ccm-tools.spec`
+  DEVEL_RADIX=`rpm -q --specfile tools/devel/ccm-devel.spec`
+  SCRIPTS_RADIX=`rpm -q --specfile tools/scripts/ccm-scripts.spec`
+  JUNIT_RADIX=`rpm -q --specfile tools/rpms/junit/junit.spec`
+  JUNITPERF_RADIX=`rpm -q --specfile tools/rpms/junitperf/junitperf.spec`
+  HTTPUNIT_RADIX=`rpm -q --specfile tools/rpms/httpunit/httpunit.spec`
+  CCM_JAVA_RADIX=`rpm -q --specfile tools/rpms/ccm-java/ccm-java.spec`
+  SERVLET_RADIX=`rpm -q --specfile tools/rpms/servlet/servlet.spec`
 
+  tools_chop=${TOOLS_RADIX%-*}
+  TOOLS_VERSION=${tools_chop##*-}
+  devel_chop=${DEVEL_RADIX%-*}
+  DEVEL_VERSION=${devel_chop##*-}
+  scripts_chop=${SCRIPTS_RADIX%-*}
+  SCRIPTS_VERSION=${scripts_chop##*-}
+
+  for radix in $BUNDLE_RADIX $TOOLS_RADIX $DEVEL_RADIX $SCRIPTS_RADIX $JUNIT_RADIX $JUNITPERF_RADIX $HTTPUNIT_RADIX $CCM_JAVA_RADIX $SERVLET_RADIX
+  do
+      cp ${HOMERPMDIR}/${radix}.noarch.rpm ${BUILD_HOME}/dist/runtime/RPMS
+      if [ -f ${HOMESRPMDIR}/${radix}.src.rpm ]
+      then
+          cp ${HOMESRPMDIR}/${radix}.src.rpm ${BUILD_HOME}/dist/runtime/SRPMS
+      fi
+  done
+
   if [ "x$CCM_DIST_NOZIPS" != "x1" ]; then
     cp tools/tools/ccm-tools-$TOOLS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
     cp tools/tools/ccm-tools-servlet-tomcat-$TOOLS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
@@ -635,17 +637,6 @@
     cp tools/scripts/ccm-scripts-$SCRIPTS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
   fi
 
-  cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-  cp $HOMESRPMDIR/junitperf-1.8-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-  cp $HOMESRPMDIR/httpunit-1.5.4-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-  cp $HOMESRPMDIR/ccm-java-1.0-1.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-  cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-  cp $HOMESRPMDIR/servlet-2.3-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-#  cp $HOMERPMDIR/servlet-2.2-1ccm.src.rpm $BUILD_HOME/dist/runtime/RPMS
-  cp $HOMESRPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-  cp $HOMESRPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-  cp $HOMESRPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-  cp $HOMESRPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
 )
 
 for DOC in $RUNTIME_DOCS