Changeset 4024 in osm for applications

Timestamp:

2007-08-08T22:30:31+02:00 (17 years ago)

Author:

frsantos

Message:

Store version and build date in jar Manifest instead of REVISION file

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/util/Util.java (modified) (3 diffs)

applications/editors/josm/plugins/validator/build.xml

@@ -17 +17 @@
 
         <target name="build" depends="clean, compile">
-                <copy todir="build/resources">
-                        <fileset dir="resources"/>
-                </copy>
                 <copy todir="build/images">
                         <fileset dir="images"/>
                 </copy>
-                <exec append="false" output="build/resources/REVISION" executable="svn" failifexecutionfails="false">
+                <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
                         <env key="LANG" value="C"/>
                         <arg value="info"/>
+                        <arg value="--xml"/>
                         <arg value="."/>
                 </exec>
-                <property file="build/resources/REVISION" />
+                <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+                <delete file="REVISION"/>
                 <jar destfile="validator.jar" basedir="build">
                         <manifest>
                                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
                                 <attribute name="Plugin-Description" value="A OSM data validator"/>
-                                <attribute name="Plugin-Version" value="${Revision}"/>
+                                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                                 <attribute name="Author" value="Francisco R. Santos &lt;frsantos@gmail.com>"/>
                         </manifest>

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java

@@ -8 +8 @@
 import java.net.URLConnection;
 import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.swing.JButton;
@@ -15 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.PluginProxy;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -81 +80 @@
         public static Version getVersion()
     {
-        String revision;
-        try 
-        {
-                        revision = loadFile(Util.class.getResource("/resources/REVISION"));
-                } 
-        catch (Exception e) 
-        {
-                        return null;
-                }
-
-                Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-                Matcher match = versionPattern.matcher(revision);
-                String version = match.matches() ? match.group(1) : "UNKNOWN";
-
-                Pattern timePattern = Pattern.compile(".*?Last Changed Date: ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-                match = timePattern.matcher(revision);
-                String time = match.matches() ? match.group(1) : "UNKNOWN";
-                
-                return new Version(version, time);
+        PluginInformation info = PluginInformation.getLoaded("validator");
+        if( info == null )
+            return null;
+
+                return new Version(info.version, info.attr.get("Plugin-Date"));
     }