[Aplaws-commit] r1089 - in trunk: ccm-ldn-aplaws/bundles tools/bundle tools/bundle/TEMPLATE tools/misc

[<ap...@vh...>]

Author: apevec
Date: 2006-02-06 10:30:55 +0100 (Mon, 06 Feb 2006)
New Revision: 1089

Added:
   trunk/tools/bundle/TEMPLATE/
Removed:
   trunk/ccm-ldn-aplaws/bundles/TEMPLATE/
Modified:
   trunk/tools/bundle/TEMPLATE/rollingbuild.sh
   trunk/tools/misc/build-all.sh
Log:
move RPM bundle templates out of aplaws specific packages


Copied: trunk/tools/bundle/TEMPLATE (from rev 1087, trunk/ccm-ldn-aplaws/bundles/TEMPLATE)

Modified: trunk/tools/bundle/TEMPLATE/rollingbuild.sh
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/TEMPLATE/rollingbuild.sh	2006-02-01 14:21:50 UTC (rev 1087)
+++ trunk/tools/bundle/TEMPLATE/rollingbuild.sh	2006-02-06 09:30:55 UTC (rev 1089)
@@ -1,6 +1,8 @@
 #!/bin/sh
 #
 
+TEMPLATE=dirname $0
+
 # Exit immediately if command fails
 set -e
 
@@ -11,7 +13,7 @@
 . ./bundle.in
 
 # prepare .spec.in
-cat ../TEMPLATE/ccm-bundle.spec.IN ChangeLog > ccm-bundle-$BUNDLE_NAME.spec.in
+cat $TEMPLATE/ccm-bundle.spec.IN ChangeLog > ccm-bundle-$BUNDLE_NAME.spec.in
 
 # prepare .am
 cat <<EOF > Makefile.am
@@ -86,7 +88,7 @@
 # Build the rpms
 rpmbuild -ta --clean ccm-bundle-$BUNDLE_NAME-*.tar.gz
 
-../TEMPLATE/make-zip.sh
+$TEMPLATE/make-zip.sh
 
 # Cleanup the build dir
 #cd ..

Modified: trunk/tools/misc/build-all.sh
===================================================================
--- trunk/tools/misc/build-all.sh	2006-02-02 10:32:15 UTC (rev 1088)
+++ trunk/tools/misc/build-all.sh	2006-02-06 09:30:55 UTC (rev 1089)
@@ -2,6 +2,7 @@
 #
 # Build everything!
 
+[ -z "$BUNDLETEMPLATE" ] && BUNDLETEMPLATE="tools/bundle/TEMPLATE"
 [ -z "$BUNDLEDIR" ] && BUNDLEDIR="ccm-ldn-aplaws/ccm-ldn-aplaws"
 [ -z "$BUNDLES" ] && BUNDLES="standard complete demo devel"
 
@@ -597,7 +598,7 @@
     set -e
     cd $BUNDLEDIR/bundles/$BUNDLE
     check_svn_tagged
-    ../TEMPLATE/rollingbuild.sh
+    $BUNDLETEMPLATE/rollingbuild.sh
   )  || exit $?
 done