Changeset 34601 in osm for applications

Timestamp:

2018-08-26T20:21:31+02:00 (6 years ago)

Author:

donvip

Message:

define ivy tasks for all plugins

Location:

applications/editors/josm/plugins

Files:

• MicrosoftStreetside/build.xml (modified) (2 diffs)
• build-common.xml (modified) (2 diffs)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--** This is a template build file for a JOSM  plugin.
-**
-** Maintaining versions
-** ====================-->
-<project name="MicrosoftStreetside" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="MicrosoftStreetside" default="dist" basedir=".">
 
         <!-- Configure these properties (replace "..." accordingly).
@@ -42 +38 @@
         </target>
 
-        <target name="clean_ivy">
-                <delete failonerror="false">
-                        <fileset dir="${plugin.lib.dir}">
-                                <include name="**/*.jar"/>
-                                <exclude name="**/*-custom.jar" />
-                        </fileset>
-                </delete>
-        </target>
-
-        <target name="fetch_dependencies" depends="clean_ivy, init-ivy">
-                <echo>fetching dependencies with ivy</echo>
-                <ivy:settings file="ivy_settings.xml" />
-                <ivy:retrieve pattern="${plugin.lib.dir}/[artifact]-[revision](-[classifier]).[ext]" conf="default" />
-        </target>
-
         <target name="install-plugin" depends="clean, dist, install">
                 <echo>Installed Microsoft Streetside plugin</echo>

applications/editors/josm/plugins/build-common.xml

@@ -11 +11 @@
 **
 -->
-<project name="plugin_common" basedir="." xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if" xmlns:unless="ant:unless">
+<project name="plugin_common" basedir="." xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if" xmlns:unless="ant:unless" xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -681 +681 @@
         <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
     </target>
+        <target name="clean_ivy">
+                <delete failonerror="false">
+                        <fileset dir="${plugin.lib.dir}">
+                                <include name="**/*.jar"/>
+                                <exclude name="**/*-custom.jar" />
+                        </fileset>
+                </delete>
+        </target>
+        <target name="fetch_dependencies" depends="clean_ivy, init-ivy">
+                <echo>fetching dependencies with ivy</echo>
+                <ivy:settings file="ivy_settings.xml" />
+                <ivy:retrieve pattern="${plugin.lib.dir}/[artifact]-[revision](-[classifier]).[ext]" conf="default" />
+        </target>
 </project>