Index: applications/viewer/jmapviewer/build.xml
===================================================================
--- applications/viewer/jmapviewer/build.xml	(revision 29883)
+++ applications/viewer/jmapviewer/build.xml	(revision 29985)
@@ -5,8 +5,10 @@
 
 	<target name="clean">
+		<mkdir dir="bin" />
 		<delete>
 			<fileset dir="bin">
 				<include name="**" />
 			</fileset>
+			<fileset dir="." includes="*.jar"/>
 		</delete>
 	</target>
@@ -25,21 +27,18 @@
 	
     <target name="svn_info" description="Get SVN info for use in JAR/ZIP filenames.">
-        <!-- Create temporary SVN info file -->
-        <exec executable="svn" output="svn-info.properties">
-            <arg line="info" />
+        <!-- Get the svn ReleaseVersion property -->
+        <exec executable="svn" outputproperty="svnReleaseVersion">
+            <arg line="propget ReleaseVersion" />
             <env key="LANG" value="en_US"/>
         </exec>
-        <property prefix="svn" file="svn-info.properties" />
-        <!-- Delete temporary SVN info file -->
-        <delete file="svn-info.properties" />
     </target>
 	
 	<target name="pack">
 		<!-- Create the JAR file containing the compiled class files -->
-		<jar destfile="JMapViewer_${svn.Revision}.jar" filesetmanifest="mergewithoutmain">
+		<jar destfile="JMapViewer_${svnReleaseVersion}.jar" filesetmanifest="mergewithoutmain">
 			<fileset dir="bin" includes="**/jmapviewer/**" />
 		</jar>
 		<!-- Create the JAR file containing the source java files -->
-		<jar destfile="JMapViewer_${svn.Revision}_src.jar" filesetmanifest="mergewithoutmain">
+		<jar destfile="JMapViewer_${svnReleaseVersion}_src.jar" filesetmanifest="mergewithoutmain">
 			<fileset dir="src" includes="**/jmapviewer/**" />
 		</jar>
@@ -47,8 +46,8 @@
 	
 	<target name="create_run_jar" description="Create a JAR file that can be used to execute the JMapViewer demo app. Requires JMapViewer.jar to be present.">
-		<jar destfile="JMapViewer_${svn.Revision}_Demo.jar" filesetmanifest="mergewithoutmain">
+		<jar destfile="JMapViewer_${svnReleaseVersion}_Demo.jar" filesetmanifest="mergewithoutmain">
 			<manifest>
 				<attribute name="Main-Class" value="org.openstreetmap.gui.jmapviewer.Demo" />
-				<attribute name="Class-Path" value="JMapViewer_${svn.Revision}.jar" />
+				<attribute name="Class-Path" value="JMapViewer_${svnReleaseVersion}.jar" />
 			</manifest>
 		</jar>
@@ -56,5 +55,5 @@
 
 	<target name="create_release_zip" description="Create a release zip file containing the binary and source jar files as well as the demo starter">
-		<zip basedir="." destfile="releases/${svn.Revision}/JMapViewer-${svn.Revision}.zip">
+		<zip basedir="." destfile="releases/${svnReleaseVersion}/JMapViewer-${svnReleaseVersion}.zip">
 			<include name="JMapViewer*.jar" />
 			<include name="Readme.txt" />
@@ -67,9 +66,9 @@
 	
 	<target name="create_source_release_zip" description="Create a release zip file containing the source files">
-		<zip destfile="releases/${svn.Revision}/JMapViewer-${svn.Revision}-Source.zip">
-			<zipfileset file="Readme.txt" prefix="jmapviewer-${svn.Revision}"/>
-			<zipfileset file="build.xml" prefix="jmapviewer-${svn.Revision}"/>
-			<zipfileset file="Gpl.txt" prefix="jmapviewer-${svn.Revision}"/>
-			<zipfileset dir="src" includes="**/jmapviewer/**" prefix="jmapviewer-${svn.Revision}"/>
+		<zip destfile="releases/${svnReleaseVersion}/JMapViewer-${svnReleaseVersion}-Source.zip">
+			<zipfileset file="Readme.txt" prefix="jmapviewer-${svnReleaseVersion}"/>
+			<zipfileset file="build.xml" prefix="jmapviewer-${svnReleaseVersion}"/>
+			<zipfileset file="Gpl.txt" prefix="jmapviewer-${svnReleaseVersion}"/>
+			<zipfileset dir="src" includes="**/jmapviewer/**" prefix="jmapviewer-${svnReleaseVersion}"/>
 		</zip>
 	</target>