Changeset 29985 in osm for applications/viewer/jmapviewer


Ignore:
Timestamp:
2013-09-28T10:48:44+02:00 (11 years ago)
Author:
the111
Message:

[jmapviewer] fix #josm8747 - enhanced versions/releases

Location:
applications/viewer/jmapviewer
Files:
3 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • applications/viewer/jmapviewer

    • Property ReleaseVersion set to 1.0
  • applications/viewer/jmapviewer/build.xml

    r29618 r29985  
    55
    66        <target name="clean">
     7                <mkdir dir="bin" />
    78                <delete>
    89                        <fileset dir="bin">
    910                                <include name="**" />
    1011                        </fileset>
     12                        <fileset dir="." includes="*.jar"/>
    1113                </delete>
    1214        </target>
     
    2527       
    2628    <target name="svn_info" description="Get SVN info for use in JAR/ZIP filenames.">
    27         <!-- Create temporary SVN info file -->
    28         <exec executable="svn" output="svn-info.properties">
    29             <arg line="info" />
     29        <!-- Get the svn ReleaseVersion property -->
     30        <exec executable="svn" outputproperty="svnReleaseVersion">
     31            <arg line="propget ReleaseVersion" />
    3032            <env key="LANG" value="en_US"/>
    3133        </exec>
    32         <property prefix="svn" file="svn-info.properties" />
    33         <!-- Delete temporary SVN info file -->
    34         <delete file="svn-info.properties" />
    3534    </target>
    3635       
    3736        <target name="pack">
    3837                <!-- Create the JAR file containing the compiled class files -->
    39                 <jar destfile="JMapViewer_${svn.Revision}.jar" filesetmanifest="mergewithoutmain">
     38                <jar destfile="JMapViewer_${svnReleaseVersion}.jar" filesetmanifest="mergewithoutmain">
    4039                        <fileset dir="bin" includes="**/jmapviewer/**" />
    4140                </jar>
    4241                <!-- Create the JAR file containing the source java files -->
    43                 <jar destfile="JMapViewer_${svn.Revision}_src.jar" filesetmanifest="mergewithoutmain">
     42                <jar destfile="JMapViewer_${svnReleaseVersion}_src.jar" filesetmanifest="mergewithoutmain">
    4443                        <fileset dir="src" includes="**/jmapviewer/**" />
    4544                </jar>
     
    4746       
    4847        <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.">
    49                 <jar destfile="JMapViewer_${svn.Revision}_Demo.jar" filesetmanifest="mergewithoutmain">
     48                <jar destfile="JMapViewer_${svnReleaseVersion}_Demo.jar" filesetmanifest="mergewithoutmain">
    5049                        <manifest>
    5150                                <attribute name="Main-Class" value="org.openstreetmap.gui.jmapviewer.Demo" />
    52                                 <attribute name="Class-Path" value="JMapViewer_${svn.Revision}.jar" />
     51                                <attribute name="Class-Path" value="JMapViewer_${svnReleaseVersion}.jar" />
    5352                        </manifest>
    5453                </jar>
     
    5655
    5756        <target name="create_release_zip" description="Create a release zip file containing the binary and source jar files as well as the demo starter">
    58                 <zip basedir="." destfile="releases/${svn.Revision}/JMapViewer-${svn.Revision}.zip">
     57                <zip basedir="." destfile="releases/${svnReleaseVersion}/JMapViewer-${svnReleaseVersion}.zip">
    5958                        <include name="JMapViewer*.jar" />
    6059                        <include name="Readme.txt" />
     
    6766       
    6867        <target name="create_source_release_zip" description="Create a release zip file containing the source files">
    69                 <zip destfile="releases/${svn.Revision}/JMapViewer-${svn.Revision}-Source.zip">
    70                         <zipfileset file="Readme.txt" prefix="jmapviewer-${svn.Revision}"/>
    71                         <zipfileset file="build.xml" prefix="jmapviewer-${svn.Revision}"/>
    72                         <zipfileset file="Gpl.txt" prefix="jmapviewer-${svn.Revision}"/>
    73                         <zipfileset dir="src" includes="**/jmapviewer/**" prefix="jmapviewer-${svn.Revision}"/>
     68                <zip destfile="releases/${svnReleaseVersion}/JMapViewer-${svnReleaseVersion}-Source.zip">
     69                        <zipfileset file="Readme.txt" prefix="jmapviewer-${svnReleaseVersion}"/>
     70                        <zipfileset file="build.xml" prefix="jmapviewer-${svnReleaseVersion}"/>
     71                        <zipfileset file="Gpl.txt" prefix="jmapviewer-${svnReleaseVersion}"/>
     72                        <zipfileset dir="src" includes="**/jmapviewer/**" prefix="jmapviewer-${svnReleaseVersion}"/>
    7473                </zip>
    7574        </target>
Note: See TracChangeset for help on using the changeset viewer.