Changeset 16878 in josm for trunk


Ignore:
Timestamp:
2020-08-12T20:42:33+02:00 (4 years ago)
Author:
simon04
Message:

see #19117 - ant create-revision: do not depend on resolve

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r16659 r16878  
    3131        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}"/>
    3232    </target>
    33     <target name="init-properties" depends="resolve">
     33    <target name="init-properties">
    3434        <property environment="env"/>
    3535        <!-- Load properties in a target and not at top level, so this build file can be
     
    3838        of the importing ant file. Use ${base.dir} instead, which is always the parent
    3939        directory of this file. -->
     40        <dirname property="base.dir" file="${ant.file.josm}"/>
    4041        <property name="test.dir" location="${base.dir}/test"/>
    4142        <property name="src.dir" location="${base.dir}/src"/>
     
    183184    </target>
    184185    <!-- Mac OS X target -->
    185     <target name="mac" depends="init-properties">
     186    <target name="mac" depends="init">
    186187        <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
    187188        <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${tools.dir}/appbundler.jar"/>
     
    310311        </copy>
    311312    </target>
    312     <target name="init" depends="init-properties">
     313    <target name="init" depends="init-properties,resolve">
    313314        <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
    314315            <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
     
    321322        <mkdir dir="${dist.dir}"/>
    322323    </target>
    323     <target name="javadoc" depends="init-properties">
     324    <target name="javadoc" depends="init">
    324325        <javadoc destdir="javadoc"
    325326                sourcepath="${src.dir}"
     
    828829    </target>
    829830
    830     <target name="imageryindex" depends="init-properties,script-compile">
     831    <target name="imageryindex" depends="script-compile">
    831832        <echo message="Checking editor imagery difference"/>
    832833        <java classname="SyncEditorLayerIndex" failonerror="true" fork="false">
     
    866867    </target>
    867868
    868     <target name="checkstyle-compile" depends="init-properties">
     869    <target name="checkstyle-compile" depends="init">
    869870        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="checkstyle.classpath" conf="checkstyle"/>
    870871        <mkdir dir="${checkstyle-build.dir}"/>
     
    916917    </target>
    917918
    918     <target name="pmd" depends="init-properties">
     919    <target name="pmd" depends="init">
    919920        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="pmd.classpath" conf="pmd"/>
    920921        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
     
    944945      ** Compile build script for generating projection list.
    945946    -->
    946     <target name="epsg-compile" depends="init-properties">
     947    <target name="epsg-compile" depends="init">
    947948        <property name="proj-classpath" location="${build.dir}"/>
    948949        <mkdir dir="${proj-build.dir}"/>
Note: See TracChangeset for help on using the changeset viewer.