[DebianGIS-dev] r1818 - packages/josm/trunk/debian

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2008-12-23 20:46:27 +0000 (Tue, 23 Dec 2008)
New Revision: 1818

Modified:
   packages/josm/trunk/debian/rules
Log:
 * Revision is got from upstream SVN
 * Some refactoring, moving all magic strings to constants


Modified: packages/josm/trunk/debian/rules
===================================================================
--- packages/josm/trunk/debian/rules	2008-12-23 14:23:06 UTC (rev 1817)
+++ packages/josm/trunk/debian/rules	2008-12-23 20:46:27 UTC (rev 1818)
@@ -7,6 +7,7 @@
 
 JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
 ANT_HOME  := /usr/share/ant
+ANT_ARGS := -Ddebian.version=${DEB_VERSION}
 DEB_ANT_BUILD_TARGET := dist
 
 # Dependencies
@@ -17,19 +18,16 @@
 
 SVNREPO := http://josm.openstreetmap.de/svn/trunk
 SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/
+
 DATE := $(shell date +%Y%m%d)
 ifdef SVNREV
 VERSION := 0.0.svn${SVNREV}
 else
 VERSION := 0.0.0.${DATE}
 endif
+DESTDIR := ../tarballs/josm-${VERSION}
+DESTTGZ := ../tarballs/josm_${VERSION}.orig.tar.gz
 
-clean::
-	dh_clean $(CURDIR)/REVISION
-
-configure/josm::
-	echo Revision: ${DEB_VERSION} > $(CURDIR)/REVISION
-
 install/josm::
 	install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar
 	dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar usr/share/josm/josm.jar
@@ -42,19 +40,22 @@
 	dh_testdir
 	test -d ../tarballs/. || mkdir -p ../tarballs
 	@echo Downloading josm from ${SVNREPO}
-	svn export -r ${SVNREV} --ignore-externals ${SVNREPO} ../tarballs/josm-${VERSION}
+	svn export -r ${SVNREV} --ignore-externals ${SVNREPO} ${DESTDIR}
 	@echo Removing jar files and test data
-	find ../tarballs/josm-${VERSION} -name "*.jar" -exec rm -v {} \;
-	rm -f ../tarballs/josm-${VERSION}/data/*
+	find ${DESTDIR} -name "*.jar" -exec rm -v {} \;
+	rm -f ${DESTDIR}/data/*
 	@echo Removing icons directory
-	rm -rf ../tarballs/josm-${VERSION}/styles/standard/icons/
+	rm -rf ${DESTDIR}/styles/standard/icons/
+	@echo Fetching revision metadata
+	svn info --xml -r ${SVNREV} ${SVNREPO} > ${DESTDIR}/REVISION
 	@echo Fetching internalization data...
-	svn export ${SVNI18NREPO} ../tarballs/josm-${VERSION}/i18n
+	svn export ${SVNI18NREPO} ${DESTDIR}/i18n
 	@echo Building snapshot tarball																	
-	tar czf ../tarballs/josm_${VERSION}.orig.tar.gz -C ../tarballs josm-${VERSION}
+	tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
 	@echo Cleaning up
-	rm -rf ../tarballs/josm-${VERSION}
+	rm -rf ${DESTDIR}
 	@echo .
 	@echo To update debian/changelog type
 	@echo dch -v ${VERSION}-1
 	@echo .
+