Changeset 31783 in osm

Timestamp:

2015-12-01T23:08:30+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Move plugin-properties to a single file

To avoid having two places for setting project-wide properties, these are now set in the new file gradle.properties and picked up both by Ant and Gradle.

Location:

applications/editors/josm/plugins/mapillary

Files:

• build.gradle (modified) (1 diff)
• build.xml (modified) (1 diff)
• gradle.properties (added)

applications/editors/josm/plugins/mapillary/build.gradle

@@ -107 +107 @@
   from configurations.packIntoJar.collect { it.isDirectory() ? it : zipTree(it) }
   manifest {
-    attributes("Plugin-Mainversion": "8433",
+    attributes("Plugin-Mainversion": project.property('plugin.main.version'),
                "Plugin-Version": "31395",
-               "Plugin-Class": "org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin",
-               "Plugin-Description": "Enables user to work with pictures hosted at mapillary.com",
+               "Plugin-Class": project.property('plugin.class'),
+               "Plugin-Description": project.property('plugin.description'),
                "Plugin-Date": String.format("%1\$tY-%1\$tm-%1\$tdT%1\$tH:%1\$tM:%1\$tS%1\$tz", new GregorianCalendar()),
-               "Author": "nokutu <nokutu@openmailbox.org>",
-               "Plugin-Link": "https://wiki.openstreetmap.org/wiki/JOSM/Plugins/Mapillary",
-               "Plugin-Icon": "images/icon24.png",
-               "Plugin-Requires": "commons-imaging",
-               "Plugin-Canloadatruntime": "true")
+               "Author": project.property('plugin.author'),
+               "Plugin-Link": project.property('plugin.link'),
+               "Plugin-Icon": project.property("plugin.icon"),
+               "Plugin-Requires": project.property("plugin.requires"),
+               "Plugin-Canloadatruntime": project.property('plugin.canloadatruntime'))
   }
 }

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

@@ -2 +2 @@
 <project name="Mapillary" default="dist" basedir=".">
 
-    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8433"/>
-    <property name="plugin.canloadatruntime" value="true"/>
-    <property name="plugin.version" value="1.0.4"/>
-    <property name="plugin.author" value="nokutu &lt;nokutu@openmailbox.org&gt;"/>
-    <property name="plugin.class" value="org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin"/>
-    <property name="plugin.description" value="Allows the user to work with pictures hosted at mapillary.com"/>
-    <property name="plugin.icon" value="images/icon24.png"/>
-    <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/Mapillary"/>
-    <!--<property name="plugin.early" value="..."/>-->
-    <property name="plugin.requires" value="apache-commons;apache-http"/>
-    <!--<property name="plugin.stage" value="..."/>-->
-    
-        <property name="josm" location="../../core/dist/josm-custom.jar"/>
-        <property name="plugin.dist.dir" value="../../dist"/>
-        
-    <!-- ** include targets that all plugins have in common ** -->
-    
-    <import file="../build-common.xml"/>
-    
-    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
-        <include name="apache-commons.jar"/>
-        <include name="apache-http.jar"/>
-    </fileset>
+  <!-- edit the properties of this plugin in the file `gradle.properties` -->
+  <property file="${basedir}/gradle.properties"/>
+
+  <property name="josm" location="../../core/dist/josm-custom.jar"/>
+  <property name="plugin.dist.dir" value="../../dist"/>
+
+  <!-- ** include targets that all plugins have in common ** -->
+  <import file="../build-common.xml"/>
+
+  <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+    <include name="apache-commons.jar"/>
+    <include name="apache-http.jar"/>
+  </fileset>
 </project>