[pkg-java] r4018 - trunk/aspectj/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-08-14 20:02:29 +0000 (Tue, 14 Aug 2007)
New Revision: 4018

Modified:
   trunk/aspectj/debian/cvs-get.sh
Log:
we really need to preserve the toplevel directory in the .orig.tar.gz


Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh	2007-08-14 18:02:43 UTC (rev 4017)
+++ trunk/aspectj/debian/cvs-get.sh	2007-08-14 20:02:29 UTC (rev 4018)
@@ -4,45 +4,46 @@
 #
 set -e
 
-TMPDIR=`mktemp -t -d aspectj-cvs.XXXXXXXXXX`
+TMPDIR=`mktemp -t -d aspectj-cvs.XXXXXXXXXX` || exit 1
 trap "rm -Rf $TMPDIR" 0
 
 VERSION=`head -1 debian/changelog | cut -d ' ' -f 2 | sed -e 's#(\([^-]\+\)-.*)#\1#'`
 TAG="V`echo $VERSION | tr . _`_final"
+ORIGDIR="$TMPDIR/aspectj_$VERSION.orig"
 
 CVSROOT=":pserver:anonymous at dev.eclipse.org:/cvsroot/tools"
 
 echo "retrieving AspectJ sources tagged $TAG"
-(cd $TMPDIR && cvs -d $CVSROOT export -r$TAG org.aspectj/modules)
+mkdir $ORIGDIR || exit 1
+(cd $ORIGDIR && cvs -d $CVSROOT export -r$TAG org.aspectj/modules >/dev/null 2>&1)
 
 echo "removing unneeded files"
-find $TMPDIR/org.aspectj -name .cvsignore | xargs -r rm
+find $ORIGDIR/org.aspectj -name .cvsignore | xargs -r rm
 
 # We'll use Debian version of these
-rm -Rf $TMPDIR/org.aspectj/modules/lib/ant
-rm -Rf $TMPDIR/org.aspectj/modules/lib/junit
-rm -Rf $TMPDIR/org.aspectj/modules/lib/commons
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/ant
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/junit
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/commons
 
 # Keep sources only, rebuild them at package build time
-rm -Rf $TMPDIR/org.aspectj/modules/lib/build
-rm -Rf $TMPDIR/org.aspectj/modules/lib/bcel/bcel.jar
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/bcel/bcel.jar
 
 # The LICENSE.TXT here refers to managementapi-jrockit81.jar which is removed as well
 # See http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/modules/lib/ext/jrockit/LICENSE.TXT?root=Tools_Project&view=co
-(cd $TMPDIR/org.aspectj/modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.TXT managementapi-jrockit81.jar)
+(cd $ORIGDIR/org.aspectj/modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.TXT managementapi-jrockit81.jar)
 
 # These ones are not needed
-rm -Rf $TMPDIR/org.aspectj/modules/lib/asm
-rm -Rf $TMPDIR/org.aspectj/modules/lib/docbook
-rm -Rf $TMPDIR/org.aspectj/modules/lib/jdiff
-rm -Rf $TMPDIR/org.aspectj/modules/lib/jython
-rm -Rf $TMPDIR/org.aspectj/modules/lib/regexp
-rm -Rf $TMPDIR/org.aspectj/modules/lib/saxon
-rm -Rf $TMPDIR/org.aspectj/modules/lib/test
-rm -Rf $TMPDIR/org.aspectj/modules/build/products/tools/dist/lib
-rm -f  $TMPDIR/org.aspectj/modules/docs/sandbox/aopalliance/aopalliance.jar
-rm -f  $TMPDIR/org.aspectj/modules/docs/sandbox/aopalliance/lib/aj-aopalliance.jar
-rm -f  $TMPDIR/org.aspectj/modules/docs/teaching/exercises/junit.jar
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/asm
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/docbook
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/jdiff
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/jython
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/regexp
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/saxon
+rm -Rf $ORIGDIR/org.aspectj/modules/lib/test
+rm -Rf $ORIGDIR/org.aspectj/modules/build/products/tools/dist/lib
+rm -f  $ORIGDIR/org.aspectj/modules/docs/sandbox/aopalliance/aopalliance.jar
+rm -f  $ORIGDIR/org.aspectj/modules/docs/sandbox/aopalliance/lib/aj-aopalliance.jar
+rm -f  $ORIGDIR/org.aspectj/modules/docs/teaching/exercises/junit.jar
 
 echo "generating ../aspectj_$VERSION.orig.tar.gz"
-tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz org.aspectj
+tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz aspectj_$VERSION.orig