Changeset 5362 in josm

Timestamp:

Jul 25, 2012 2:07:37 PM (10 months ago)

Author:

stoecker

Message:

reintroduce the feature to give the build a name

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/Version.java (modified) (3 diffs)

trunk/build.xml

@@ -55 +55 @@
         <property name="version.entry.commit.revision" value="UNKNOWN"/>
         <mkdir dir="${revision.dir}"/>
+        <!-- add Build-Name: ... when making special builds, e.g. DEBIAN -->
         <echo file="${revision.dir}/REVISION">
 # automatically generated by JOSM build.xml - do not edit

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -68 +68 @@
     private String releaseDescription;
     private String time;
+    private String buildName;
     private boolean isLocalBuild;
 
@@ -131 +132 @@
         }
 
+        // is this a specific build ?
+        //
+        buildName = null;
+        value = properties.get("Build-Name");
+        if (value != null && !value.trim().isEmpty())  {
+            buildName = value.trim();
+        }
+
         // the revision info
         //
@@ -199 +208 @@
         int v = getVersion();
         String s = (v == JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);
+        if (buildName != null) {
+            s += " " + buildName;
+        }
         if (isLocalBuild() && v != JOSM_UNKNOWN_VERSION) {
             s += " SVN";