[pkg-eucalyptus-commits] r155 - gwt/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2011-08-24 05:42:28 +0000 (Wed, 24 Aug 2011)
New Revision: 155

Modified:
   gwt/trunk/debian/orig-tar.sh
   gwt/trunk/debian/rules
Log:
Merged debian/orig-tar.sh and debian/rule's get-orig-source targets, which were doing the same thing.


Modified: gwt/trunk/debian/orig-tar.sh
===================================================================
--- gwt/trunk/debian/orig-tar.sh	2011-08-24 04:20:45 UTC (rev 154)
+++ gwt/trunk/debian/orig-tar.sh	2011-08-24 05:42:28 UTC (rev 155)
@@ -1,21 +1,22 @@
 #!/bin/sh -e
 
-# $1 = version
-TAR=../gwt_$2.orig.tar.gz
+# $1 = --upstream-version, see uscan(1).
+TAR=gwt_$2.orig.tar.xz
+TMP_DIRECTORY=`mktemp --tmpdir --directory gwt-build.XXXXXXXXXX`
 DIR=libgwt-java-$2.orig
+origDir=`pwd`
 
 # clean up the upstream tarball
-svn export http://google-web-toolkit.googlecode.com/svn/tags/$2/ $DIR
-svn export http://google-web-toolkit.googlecode.com/svn/tools/lib/apache/tapestry-util-text-4.0.2-src.zip $DIR/tapestry-src.zip
-unzip $DIR/tapestry-src.zip -d $DIR/user/src
-rm -f $DIR/tapestry-src.zip
-GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
-rm ../$2
+svn export http://google-web-toolkit.googlecode.com/svn/tags/$2/ $TMP_DIRECTORY/$DIR
+svn export http://google-web-toolkit.googlecode.com/svn/tools/lib/apache/tapestry-util-text-4.0.2-src.zip $TMP_DIRECTORY/tapestry-src.zip
+unzip $TMP_DIRECTORY/tapestry-src.zip -d $TMP_DIRECTORY/$DIR/user/src
+cd $TMP_DIRECTORY && tar --create --xz --file $TAR $DIR
 
-# move to directory 'tarballs'
+# Move to directory 'tarballs' if available.
 if [ -r .svn/deb-layout ]; then
   . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
 fi
+mv $TMP_DIRECTORY/$TAR $origDir
+echo "moved $TMP_DIRECTORY/$TAR to $origDir"
+
+rm -rf $TMP_DIRECTORY


Property changes on: gwt/trunk/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: gwt/trunk/debian/rules
===================================================================
--- gwt/trunk/debian/rules	2011-08-24 04:20:45 UTC (rev 154)
+++ gwt/trunk/debian/rules	2011-08-24 05:42:28 UTC (rev 155)
@@ -4,18 +4,12 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-SVN                := http://google-web-toolkit.googlecode.com/svn
-SVNTAG             := $(SVN)/tags/$(DEB_UPSTREAM_VERSION)
-SVNTAPESTRY        := $(SVN)/tools/lib/apache/tapestry-util-text-4.0.2-src.zip
-
 JAVA_HOME          := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE  := ./debian/build.xml
 DEB_JARS           := commons-collections3 jetty jetty-sslengine jetty-util ecj \
                       /usr/share/java/swt.jar servlet-api-2.5 junit
 DEB_ANT_ARGS       := -DartifactVersion=$(DEB_UPSTREAM_VERSION)
 
-TMP_DIRECTORY      := $(shell mktemp --tmpdir --directory gwt-build.XXXXXXXXXX)
-
 binary-post-install/libgwt-user-java::
 	for jar in user servlet; do \
 		dh_install -plibgwt-user-java target/gwt-$$jar-$(DEB_UPSTREAM_VERSION).jar usr/share/java; \
@@ -27,11 +21,4 @@
 	dh_link -plibgwt-dev-java usr/share/java/gwt-dev-linux-$(DEB_UPSTREAM_VERSION).jar usr/share/java/gwt-dev-linux.jar
 
 get-orig-source:
-	# Get tag from SVN, also include missing Tapestry sources
-	cd $(TMP_DIRECTORY) && \
-		svn export -q $(SVNTAG) gwt-$(DEB_UPSTREAM_VERSION).orig && \
-		svn export -q $(SVNTAPESTRY) tapestry-src.zip && \
-		unzip tapestry-src.zip -d gwt-$(DEB_UPSTREAM_VERSION).orig/user/src && \
-		tar --verbose --create --xz --file $(CURDIR)/../gwt_$(DEB_UPSTREAM_VERSION).orig.tar.xz gwt-$(DEB_UPSTREAM_VERSION).orig
-	rm -rf $(TMP_DIRECTORY)
-
+	debian/orig-tar.sh --upstream-version $(DEB_UPSTREAM_VERSION)