streamline usage of sx-build-release

svn path=/trunk/packages/sipb-xen-dev/; revision=466

diff --git a/debian/changelog b/debian/changelog
index 8a3909a..2906680 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sipb-xen-dev (16) unstable; urgency=low
+
+  * usage as "sx-build-release <package-name>", no "trunk/packages"
+  * clobber the build-release/<package-name> directory automatically
+
+ -- Greg Price <price@mit.edu>  Sat, 26 Apr 2008 23:12:03 -0400
+
 sipb-xen-dev (15) unstable; urgency=low
 
   * Stop requiring the current directory to be in the checkout.

diff --git a/sx-build-release b/sx-build-release
index bc79131..a23b03e 100755 (executable)
--- a/sx-build-release
+++ b/sx-build-release
@@ -3,19 +3,14 @@ svnuri=`svn info /srv/checkout | sed -n 's/^Repository Root: //p'`
 
 set -e
 if  [ $# -ne 1 ] ; then
-       echo " usage: sx-build-release trunk/packages/package_name"
+       echo " usage: sx-build-release package_name"
        exit 1
 fi
 
-if [ -d build-release ] ; then
-    echo "a previous build release directory exists; please clean up"
-    exit 1
-    fi
-
 package=$1
-svn export $svnuri/$package build-release/`basename $package`
-olddir=`pwd`
-cd build-release/`basename $package`
+rm -rf build-release/$package
+svn export $svnuri/trunk/packages/$package build-release/$package
+cd build-release/$package
 
 eval  `perl '-F:\s+' -lane 'print  $F[0]."=".$F[1] if /^Version|^Source|^Distribution/' \
     <(dpkg-parsechangelog)`
@@ -27,14 +22,15 @@ if ! svn ls $svnuri/package_tags/$Source >/dev/null 2>&1; then
       -m "Create package tags directory"
 fi
 if ! svn ls $svnuri/package_tags/$Source/$Version >/dev/null 2>&1; then
-  svn cp $svnuri/$package $svnuri/package_tags/$Source/$Version \
+  svn cp $svnuri/trunk/packages/$package $svnuri/package_tags/$Source/$Version \
       -m "Tag $Version of $Source"
 else
   echo "$(basename $0): tag already exists, not making again"
 fi
 
 cd ..
-reprepro-env include $Distribution  `pwd`/${Source}_*${Version}*.changes
+reprepro-env include unstable `pwd`/${Source}_*${Version}*.changes
+reprepro-env include stable   `pwd`/${Source}_*${Version}*.changes
 
-cd $olddir
+cd ..
 rm -rf build-release