[Pkg-voip-commits] r6186 - in /tools/builder: builder sources

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Sep  9 19:58:27 2008
New Revision: 6186

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6186
Log:
* Support building modules from dahdi-modules as well.
* Add dahdi-modules to the sources list.

Modified:
    tools/builder/builder
    tools/builder/sources

Modified: tools/builder/builder
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/builder?rev=6186&op=diff
==============================================================================
--- tools/builder/builder (original)
+++ tools/builder/builder Tue Sep  9 19:58:27 2008
@@ -53,6 +53,12 @@
   package=`echo $package_full| sed -e 's|.*/||'`
 
   say "Checking $package"
+
+  dummy_mod_package=no
+  case "$package" in 
+    zaptel-modules|dahdi-modules) dummy_mod_package=yes
+    ;;
+  esac 
   
   # don't build a package that is already in the repository
   # when to build:
@@ -66,8 +72,8 @@
   fi
   # Don't check the version of zaptel-modules. Zaptel's addition invalidates 
   # old versions (see below).
-  if [ "$package" = 'zaptel-modules' ] && \
-    $REPREPRO listfilter $LOCAL_DISTRO Package | grep -q zaptel-modules
+  if [ "$dummy_mod_package" = 'yes' ] && 
+    $REPREPRO listfilter $LOCAL_DISTRO Package | grep -q $package
   then
     continue;
   fi
@@ -154,21 +160,26 @@
   # Commit:
   changes_file=$svn_checkout_base/${package}_${full_version}_$ARCH.changes
   # finished building. commit package to repository
-  if [ "$package" = 'zaptel-modules' ]; then
+  if [ "$dummy_mod_package" = 'yes' ]; then
     # commit the embedded packages rather than the dummy package
-    dummy_deb=$svn_checkout_base/zaptel-modules-dummy_${full_version}_all.deb
+    dummy_deb=$svn_checkout_base/$package-dummy_${full_version}_all.deb
     debs_base=$svn_checkout_base/debs
     rm -rf $debs_base
     dpkg -x $dummy_deb $debs_base
-    for deb in $debs_base/usr/share/zaptel/*.deb; do
+    for deb in $debs_base/usr/lib/dummy-debs/*.deb; do
       $REPREPRO --ignore=wrongdistribution includedeb $LOCAL_DISTRO $deb
     done
   else
     $REPREPRO --ignore=wrongdistribution include $LOCAL_DISTRO $changes_file
   fi
   # Commiting a new version of zaptel invalidates zaptel-modules
-  if [ "$package" = 'zaptel' ]; then
-  	packs_to_remove=`$REPREPRO listfilter $LOCAL_DISTRO 'Package' | awk '/zaptel-modules/{print $2}'`
+  case "$package" in
+    zaptel) mods_package='zaptel-modules';;
+    dahdi-linux) mods_package='dahdi-modules';;
+    *)mods_package='';;
+  esac
+  if [ "$mods_package" != '' ]; then
+  	packs_to_remove=`$REPREPRO listfilter $LOCAL_DISTRO 'Package' | awk "/$mods_package/"'{print $2}'`
 	if [ "$packs_to_remove" != '' ]; then
 		$REPREPRO remove $LOCAL_DISTRO $packs_to_remove
 	fi

Modified: tools/builder/sources
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/sources?rev=6186&op=diff
==============================================================================
--- tools/builder/sources (original)
+++ tools/builder/sources Tue Sep  9 19:58:27 2008
@@ -51,6 +51,7 @@
 # This little hack will be included separately. Anyway, there must be
 # better ways to rebuild modules. Half the complexity of the script is
 # special cases for building it.
+tools/builder/dahdi-modules	debian-pkg-voip 	./
 tools/builder/zaptel-modules	debian-pkg-voip 	./
 
 #ari		debian-pkg-voip trunk