Changeset 34581 in osm for applications/editors


Ignore:
Timestamp:
2018-08-19T14:21:28+02:00 (6 years ago)
Author:
donvip
Message:

fix Ivy build of StreetSide (conflicts with build of wikipedia plugin hosted on GitHub)

Location:
applications/editors/josm/plugins
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/MicrosoftStreetside/build.xml

    r34577 r34581  
    3232        <import file="../build-common.xml"/>
    3333
    34         <path id="ivy.lib.path" path="ant/ivy-2.5.0-rc1.jar" />
    35         <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" />
    36 
    3734        <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
    3835                <include name="apache-commons.jar"/>
     
    5451        </target>
    5552
    56         <target name="fetch_dependencies" depends="clean_ivy">
     53        <target name="fetch_dependencies" depends="clean_ivy, init-ivy">
    5754                <echo>fetching dependencies with ivy</echo>
    5855                <ivy:settings file="ivy_settings.xml" />
  • applications/editors/josm/plugins/build-common.xml

    r34578 r34581  
    3232    <property name="plugin.sources.jar"     location="${plugin.dist.dir}/${ant.project.name}-sources.jar"/>
    3333    <property name="plugin.javadoc.jar"     location="${plugin.dist.dir}/${ant.project.name}-javadoc.jar"/>
     34    <property name="ivy.home"               location="${user.home}/.ant"/>
     35    <property name="ivy.jar.dir"            location="${ivy.home}/lib"/>
     36    <property name="ivy.jar.file"           location="${ivy.jar.dir}/ivy.jar"/>
     37    <property name="ivy.version"            value="2.5.0-rc1"/>
    3438
    3539    <!-- For Windows-specific stuff -->
     
    661665        </echo>
    662666    </target>
     667    <!--
     668    ** Ivy tasks
     669    -->
     670    <target name="download-ivy">
     671        <mkdir dir="${ivy.jar.dir}"/>
     672        <get src="https://jcenter.bintray.com/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" dest="${ivy.jar.file}" usetimestamp="true"/>
     673    </target>
     674    <target name="init-ivy" depends="download-ivy">
     675        <path id="ivy.lib.path">
     676            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
     677        </path>
     678        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
     679    </target>
    663680</project>
Note: See TracChangeset for help on using the changeset viewer.