Changeset 5153 in osm


Ignore:
Timestamp:
2007-10-24T20:13:09+02:00 (17 years ago)
Author:
joerg
Message:

josm/plugins/*build.xml: now we use the unique target dist for creating .jar files. Use a lot more variables to be able to move the build directory. destination directory for .jar files is now plugins/dist/*.jar. correcteed clean targets

Location:
applications/editors/josm/plugins
Files:
23 edited

Legend:

Unmodified
Added
Removed

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

    r5147 r5153  
    2121  </target>
    2222
    23   <target name="build" depends="compile">
     23  <target name="build" depends="dist">
     24  </target>
     25
     26  <target name="dist" depends="compile">
     27    <mkdir dir="dist"/>
    2428    <ant        dir="colorscheme"       antfile="build.xml"     target="dist"/>
    25     <ant        dir="lang"              antfile="build.xml"     target="install-all"/>
    26     <ant        dir="mappaint"          antfile="build.xml"     target="build"/>
     29    <ant        dir="duplicateway"      antfile="build.xml"     target="dist"/>
     30    <ant        dir="lang"              antfile="build.xml"     target="dist"/>
     31    <ant        dir="mappaint"          antfile="build.xml"     target="dist"/>
    2732    <ant        dir="namefinder"        antfile="build.xml"     target="dist"/>
    28     <ant        dir="nearclick"         antfile="build.xml"     target="build"/>
    29     <ant        dir="osmarender"        antfile="build.xml"     target="build"/>
    30     <ant        dir="plastic_laf"       antfile="build.xml"     target="build"/>
     33    <ant        dir="nearclick"         antfile="build.xml"     target="dist"/>
     34    <ant        dir="openvisible"       antfile="build.xml"     target="dist"/>
     35    <ant        dir="osmarender"        antfile="build.xml"     target="dist"/>
     36    <ant        dir="plastic_laf"       antfile="build.xml"     target="dist"/>
    3137    <ant        dir="slippymap"         antfile="build.xml"     target="dist"/>
    32     <ant        dir="tagging-preset-tester"     antfile="build.xml"     target="build"/>
    33     <ant        dir="validator"         antfile="build.xml"     target="build"/>
    34     <ant        dir="wmsplugin"         antfile="build.xml"     target="build"/>
    35     <ant        dir="ywms"              antfile="build.xml"     target="build"/>
     38    <ant        dir="tagging-preset-tester"     antfile="build.xml"     target="dist"/>
     39    <ant        dir="utilsplugin"       antfile="build.xml"     target="dist"/>
     40    <ant        dir="validator"         antfile="build.xml"     target="dist"/>
     41    <ant        dir="wmsplugin"         antfile="build.xml"     target="dist"/>
     42    <ant        dir="ywms"              antfile="build.xml"     target="dist"/>
    3643
    3744    <ant        dir="livegps"           antfile="build.xml"     target="dist"/>
    3845    <ant        dir="surveyor"          antfile="build.xml"     target="dist"/>
    39     <!--ant     dir="grid"              antfile="build.xml"     target="build"/-->
    40     <!-- ant    dir="pluginmanager"     antfile="build.xml"     target="dist"/ -->
    41     <!-- ant    dir="tways"             antfile="build.xml"     target="build"/ -->
    42     <!-- ant    dir="waypoints"         antfile="build.xml"     target="build"/ -->
    43     <!-- ant    dir="navigator"         antfile="build.xml"     target="dist"/ -->
     46  </target>
     47
     48  <target name="build_defect" depends="compile">
     49    <ant        dir="lakewalker"        antfile="build.xml"     target="dist"/>
     50    <ant        dir="navigator"         antfile="build.xml"     target="dist"/>
     51    <ant        dir="pluginmanager"     antfile="build.xml"     target="dist"/>
     52    <ant        dir="waypoints"         antfile="build.xml"     target="dist"/>
     53    <ant        dir="grid"              antfile="build.xml"     target="dist"/>
    4454  </target>
    4555
    4656  <target name="clean">
    4757    <ant        dir="colorscheme"       antfile="build.xml"     target="clean"/>
     58    <ant        dir="duplicateway"      antfile="build.xml"     target="clean"/>
    4859    <ant        dir="grid"              antfile="build.xml"     target="clean"/>
     60    <ant        dir="lakewalker"        antfile="build.xml"     target="clean"/>
    4961    <ant        dir="lang"              antfile="build.xml"     target="clean"/>
    5062    <ant        dir="mappaint"          antfile="build.xml"     target="clean"/>
    … …  
    5264    <ant        dir="navigator"         antfile="build.xml"     target="clean"/>
    5365    <ant        dir="nearclick"         antfile="build.xml"     target="clean"/>
     66    <ant        dir="openvisible"       antfile="build.xml"     target="clean"/>
    5467    <ant        dir="osmarender"        antfile="build.xml"     target="clean"/>
    5568    <ant        dir="plastic_laf"       antfile="build.xml"     target="clean"/>
    5669    <ant        dir="pluginmanager"     antfile="build.xml"     target="clean"/>
     70    <ant        dir="slippymap"         antfile="build.xml"     target="clean"/>
    5771    <ant        dir="tagging-preset-tester"     antfile="build.xml"     target="clean"/>
    58     <ant        dir="tways"             antfile="build.xml"     target="clean"/>
     72    <ant        dir="utilsplugin"       antfile="build.xml"     target="clean"/>
    5973    <ant        dir="validator"         antfile="build.xml"     target="clean"/>
    6074    <ant        dir="waypoints"         antfile="build.xml"     target="clean"/>
    … …  
    6478    <ant        dir="surveyor"          antfile="build.xml"     target="clean"/>
    6579    <ant        dir="livegps"           antfile="build.xml"     target="clean"/>
     80
     81    <delete dir="dist" />
    6682  </target>
    6783
    … …  
    6985  </target>
    7086
    71   <target name="install" depends="build">
     87  <target name="install" depends="dist">
    7288  </target>
    7389

  • applications/editors/josm/plugins/colorscheme/build.xml

    r5147 r5153  
    22
    33  <!-- compilation properties -->
    4   <property name="josm.build.dir" value="../../core"/>
    5   <property name="josm.home.dir" value="${user.home}/.josm"/>
    6   <property name="plugin.build.dir" value="bin"/>
    7   <property name="plugin.name" value="${ant.project.name}"/>
    8   <property name="plugin.jar" value="${plugin.name}.jar"/>
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    911 
    1012  <!-- plugin meta data (enter new version number if anything changed!) -->
    … …  
    6567
    6668  <target name="clean">
     69    <delete dir="${plugin.site.file}" />
    6770    <delete dir="${plugin.build.dir}" />
    68     <delete dir="${plugin.site.file}" />
    69     <delete dir="${plugin.jar}" />
     71    <delete file="${plugin.jar}" />
    7072  </target>
    7173

  • applications/editors/josm/plugins/duplicateway/build.xml

    r5147 r5153  
    1 <project name="Duplicate-Way" default="jar" basedir=".">
     1<project name="Duplicate-Way" default="dist" basedir=".">
    22
    3   <property name="josm" location="../../core/dist/josm-custom.jar" />
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11 
     12  <target name="init">
     13    <mkdir dir="${plugin.build.dir}"/>
     14  </target>
    415
    5   <target name="compile" depends="clean">
     16
     17  <target name="compile" depends="init">
    618    <mkdir dir="build"></mkdir>
    7     <mkdir dir="build/images"></mkdir>
     19    <mkdir dir="${plugin.build.dir}/images"></mkdir>
    820    <copy todir="build">
    9       <fileset dir="bin" casesensitive="yes">
     21      <fileset dir="${plugin.build.dir}" casesensitive="yes">
    1022        <filename name="**/*.class"/>
    1123      </fileset>
    1224    </copy>
    13     <copy todir="build/images">
     25    <copy todir="${plugin.build.dir}/images">
    1426      <fileset dir="images" casesensitive="yes">
    1527        <filename name="**/*.png"/>
    … …  
    1830  </target>
    1931
    20   <target name="jar" depends="compile">
    21     <jar destfile="Duplicate-Way.jar" basedir="build">
     32  <target name="dist" depends="compile">
     33    <jar destfile="${plugin.jar}" basedir="build">
    2234      <manifest>
    2335        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.duplicateway.DuplicateWayPlugin" />
    … …  
    3042
    3143  <target name="clean">
    32     <delete dir="build" />
    33     <delete file="Duplicate-Way.jar" />
     44    <delete dir="${plugin.build.dir}" />
     45    <delete file="${plugin.jar}" />
    3446  </target>
    3547
    36   <target name="install" depends="jar">
    37     <copy file="Duplicate-Way.jar" todir="${user.home}/.josm/plugins"/>
     48  <target name="install" depends="dist">
     49    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
    3850  </target>
    3951

  • applications/editors/josm/plugins/grid/build.xml

    r5147 r5153  
    1 <project name="grid" default="build" basedir=".">
     1<project name="grid" default="dist" basedir=".">
    22
    33  <!-- compilation properties -->
    4   <property name="josm.build.dir" value="../../core"/>
    5   <property name="josm.home.dir" value="${user.home}/.josm"/>
    6   <property name="plugin.build.dir" value="bin"/>
    7   <property name="plugin.name" value="${ant.project.name}"/>
    8   <property name="plugin.jar" value="${plugin.name}.jar"/>
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11 
    912 
    1013  <!-- point to your JOSM directory -->
    … …  
    2427  </target>
    2528
    26   <target name="build" depends="compile">
     29  <target name="dist" depends="compile">
    2730    <copy todir="build/images" >
    2831      <fileset dir="images" />
    … …  
    3740
    3841  <target name="clean">
    39     <delete dir="build" />
    40     <delete dir="dist" />
    41     <delete dir="${plugin.jar}" />
     42    <delete dir="${plugin.build.dir}" />
     43    <delete file="${plugin.jar}" />
    4244  </target>
    4345
    44   <target name="install" depends="build">
     46  <target name="install" depends="dist">
    4547    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
    4648  </target>

  • applications/editors/josm/plugins/lakewalker/build.xml

    r5147 r5153  
    1 <project name="Lakewalker" default="jar" basedir=".">
     1<project name="Lakewalker" default="dist" basedir=".">
    22
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11 
    312  <property name="josm" location="../../core/dist/josm-custom.jar" />
    413
    5   <target name="compile" depends="clean">
     14  <target name="init">
     15    <mkdir dir="${plugin.build.dir}"/>
     16  </target>
     17
     18  <target name="compile" depends="init">
    619    <mkdir dir="build"></mkdir>
    720    <mkdir dir="build/images"></mkdir>
    821    <copy todir="build">
    9       <fileset dir="bin" casesensitive="yes">
     22      <fileset dir="${plugin.build.dir}" casesensitive="yes">
    1023        <filename name="**/*.class"/>
    1124      </fileset>
    … …  
    1831  </target>
    1932
    20   <target name="jar" depends="compile">
    21     <jar destfile="Lakewalker.jar" basedir="build">
     33  <target name="dist" depends="compile">
     34    <jar destfile="${plugin.jar}" basedir="build">
    2235      <manifest>
    2336        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerPlugin" />
    … …  
    3043
    3144  <target name="clean">
    32     <delete dir="build" />
    33     <delete file="Lakewalker.jar" />
     45    <delete dir="${plugin.build.dir}" />
     46    <delete file="${plugin.jar}" />
    3447  </target>
    3548
    36   <target name="install" depends="jar">
    37     <copy file="Lakewalker.jar" todir="${user.home}/Application Data/JOSM/plugins"/>
     49  <target name="install" depends="dist">
     50    <copy file="${plugin.jar}" todir="${user.home}/Application Data/JOSM/plugins"/>
    3851    <copy todir="${user.home}/Application Data/JOSM/plugins/Lakewalker">
    3952      <fileset dir="Lakewalker">

  • applications/editors/josm/plugins/lang/build.xml

    r5147 r5153  
    11<project name="lang" default="install-all" basedir=".">
    22
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11 
    312
    4   <!-- compilation properties -->
    5   <property name="josm.build.dir" value="../../core"/>
    6   <property name="josm.home.dir" value="${user.home}/.josm"/>
    7   <property name="plugin.build.dir" value="bin"/>
    8   <property name="plugin.name" value="${ant.project.name}"/>
    9   <property name="plugin.jar" value="${plugin.name}.jar"/>
    10   <property name="plugins" value=".."/>
    11 
     13  <target name="dist" depends="install-all">
     14  </target>
     15 
    1216  <target name="install-all" depends="josm-build,keys.pot">
    1317    <ant target="install"><property name="language" value="de"/></ant>
    … …  
    1822
    1923  <target name="install">
    20     <mkdir dir="${language}/bin"/>
    21     <mkdir dir="dist"/>
    22     <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/bin" />
     24    <mkdir dir="${language}/build"/>
     25    <mkdir dir="../dist"/>
     26    <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/build" />
    2327
    2428    <exec executable="msgmerge">
    … …  
    2731
    2832    <exec executable="msgfmt">
    29       <arg line="--java2 -d${language}/bin -rorg.openstreetmap.josm.Translation -l${language} ${language}/${language}.po"/>
     33      <arg line="--java2 -d${language}/build -rorg.openstreetmap.josm.Translation -l${language} ${language}/${language}.po"/>
    3034    </exec>
    3135
    32     <copy file="i18n.properties" todir="${language}/bin/org/openstreetmap/josm" />
     36    <copy file="i18n.properties" todir="${language}/build/org/openstreetmap/josm" />
    3337
    34     <jar destfile="dist/lang-${language}.jar" basedir="${language}/bin">
     38    <jar destfile="../dist/lang-${language}.jar" basedir="${language}/build">
    3539      <manifest>
    3640        <attribute name="Plugin-Class" value="org.openstreetmap.josm.TranslationLoader_${language}" />
    … …  
    5862
    5963  <target name="clean">
    60     <delete dir="build" />
    61     <delete dir="dist" />
    62     <delete dir="${plugin.jar}" />
     64    <ant target="clean_lang"><property name="language" value="de"/></ant>
     65    <ant target="clean_lang"><property name="language" value="fr"/></ant>
     66    <ant target="clean_lang"><property name="language" value="ro"/></ant>
     67    <ant target="clean_lang"><property name="language" value="en_GB"/></ant>
     68    <delete dir="${plugin.build.dir}" />
     69  </target>
     70
     71  <target name="clean_lang">
     72    <delete file="../dist/lang-${language}.jar" />
     73    <delete dir="${language}/build"/>
    6374  </target>
    6475

  • applications/editors/josm/plugins/livegps/build.xml

    r5147 r5153  
    11<project name="livegps" default="dist" basedir=".">
     2
    23  <!-- compilation properties -->
    3   <property name="josm.build.dir" value="../../core"/>
    4   <property name="josm.home.dir" value="${user.home}/.josm"/>
    5   <property name="plugin.build.dir" value="build"/>
    6   <property name="plugin.name" value="${ant.project.name}"/>
    7   <property name="plugin.jar" value="${plugin.name}.jar"/>
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11 
     12  <property name="plugin.jar" value="../dist/${plugin.name}.jar"/>
    813  <property name="livegpsplugin.jar" value="${josm.home.dir}/plugins/livegps.jar"/>
    914 
    … …  
    4752          <include name="**/*.jar"/>
    4853        </fileset>
    49         <pathelement location="${livegpsplugin.jar}"/>
     54        <pathelement location="${plugin.jar}"/>
    5055      </classpath>
    5156    </javac>
    … …  
    6368    <delete dir="${plugin.build.dir}" />
    6469    <delete dir="${plugin.site.file}" />
    65     <delete dir="${plugin.jar}" />
     70    <delete file="${plugin.jar}" />
    6671  </target>
    6772

  • applications/editors/josm/plugins/mappaint/build.xml

    r5147 r5153  
    1 <project name="mappaint" default="build" basedir=".">
     1<project name="mappaint" default="dist" basedir=".">
    22
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11 
    312  <!-- There's no josm.jar in the svn, so point "josm" to a local copy of your JOSM binary -->
    413  <property name="josm" location="../../core/dist/josm-custom.jar" />
    … …  
    2534  </target>
    2635
    27   <target name="build" depends="compile">
     36  <target name="dist" depends="compile">
    2837    <copy todir="build/standard">
    2938      <fileset dir="styles/standard"></fileset>
    … …  
    3746    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    3847    <delete file="REVISION"/>
    39     <jar destfile="dist/mappaint.jar" basedir="build">
     48    <jar destfile="${plugin.jar}" basedir="build">
    4049      <manifest>
    4150        <attribute name="Plugin-Class" value="mappaint.MapPaintPlugin" />
    … …  
    4958
    5059  <target name="clean">
    51     <delete dir="build" />
    52     <delete dir="dist" />
     60    <delete dir="${plugin.build.dir}" />
     61    <delete file="${plugin.jar}" />
    5362  </target>
    5463
    … …  
    5766  </target>
    5867
    59   <target name="install" depends="build">
    60     <copy file="dist/mappaint.jar" todir="${plugins}"/>
     68  <target name="install" depends="dist">
     69    <copy file="${plugin.jar}" todir="${plugins}"/>
    6170  </target>
    6271

  • applications/editors/josm/plugins/namefinder/build.xml

    r5147 r5153  
    11<project name="namefinder" default="dist" basedir=".">
    2   <property name="josm.prj.dir" value="../../core"/>
    3   <property name="josm.home.dir" value="${user.home}/.josm"/>
    4   <property name="plugin.build.dir" value="build"/>
    52
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11 
    612  <!-- init target -->
    713  <target name="init">
    8     <mkdir dir="build" />
    9     <mkdir dir="dist" />
     14    <mkdir dir="${plugin.build.dir}" />
    1015  </target>
    11 
     16 
    1217  <!-- clean target -->
    1318  <target name="clean">
    14     <delete dir="build" />
    15     <delete dir="dist" />
     19    <delete dir="${plugin.build.dir}" />
     20    <delete file="${plugin.jar}" />
    1621  </target>
    1722 
    … …  
    2025    <javac srcdir="namefinder" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
    2126      <classpath>
    22         <pathelement path="${josm.prj.dir}/build"/>
    23         <pathelement path="${josm.prj.dir}/src"/>
    24         <fileset dir="${josm.prj.dir}/lib">
     27        <pathelement path="${josm.build.dir}/build"/>
     28        <pathelement path="${josm.build.dir}/src"/>
     29        <fileset dir="${josm.build.dir}/lib">
    2530          <include name="**/*.jar"/>
    2631        </fileset>
    … …  
    2833    </javac>
    2934  </target>
    30 
     35 
    3136  <!-- dist target - create jar file -->
    3237  <target name="dist" depends="compile">
    33     <jar destfile="dist/${ant.project.name}.jar" basedir="${plugin.build.dir}">
     38    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    3439      <manifest>
    3540        <attribute name="Plugin-Class" value="namefinder.NameFinderPlugin" />
    … …  
    3944    </jar>
    4045  </target>
    41 
    42   <!-- dist target - copy jar file to plugin destination -->
     46 
     47  <!-- install target - copy jar file to plugin destination -->
    4348  <target name="install" depends="dist">
    44     <copy file="dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
     49    <copy file="../dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
    4550  </target>
    4651 
    4752</project>
     53

  • applications/editors/josm/plugins/navigator/build.xml

    r5147 r5153  
    22
    33  <!-- compilation properties -->
    4   <property name="josm.build.dir" value="../../core"/>
    5   <property name="josm.home.dir" value="${user.home}/.josm"/>
    6   <property name="plugin.build.dir" value="bin"/>
    7   <property name="plugin.name" value="${ant.project.name}"/>
    8   <property name="plugin.jar" value="${plugin.name}.jar"/>
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    911 
    1012  <!-- plugin meta data (enter new version number if anything changed!) -->

  • applications/editors/josm/plugins/nearclick/build.xml

    r5147 r5153  
    1 <project name="nearclick" default="build" basedir=".">
     1<project name="nearclick" default="dist" basedir=".">
     2
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    211
    312  <!-- There's no josm.jar in the svn, so point "josm" to a local copy of your JOSM binary -->
    … …  
    2534  </target>
    2635
    27   <target name="build" depends="compile">
    28     <jar destfile="dist/nearclick.jar" basedir="build">
     36  <target name="dist" depends="compile">
     37    <jar destfile="${plugin.jar}" basedir="build">
    2938      <manifest>
    3039        <attribute name="Plugin-Class" value="nearclick.NearClickPlugin" />
    … …  
    3544
    3645  <target name="clean">
    37     <delete dir="build" />
    38     <delete dir="dist" />
     46    <delete dir="${plugin.build.dir}" />
     47    <delete file="${plugin.jar}" />
    3948  </target>
    40 
     49 
    4150  <target name="clean_install">
    4251    <delete file="${plugins}/nearclick.jar" />
    4352  </target>
    4453
    45   <target name="install" depends="build">
    46     <copy file="dist/nearclick.jar" todir="${plugins}"/>
     54  <target name="install" depends="dist">
     55    <copy file="${plugin.jar}" todir="${plugins}"/>
    4756  </target>
    4857

  • applications/editors/josm/plugins/openvisible/build.xml

    r5147 r5153  
    44  <property name="josm.build.dir" value="../../core"/>
    55  <property name="josm.home.dir" value="${user.home}/.josm"/>
    6   <property name="plugin.build.dir" value="bin"/>
    7   <property name="plugin.dist.dir" value="dist"/>
     6  <property name="plugin.build.dir" value="build"/>
     7  <property name="plugin.dist.dir" value="../dist"/>
    88  <property name="plugin.name" value="${ant.project.name}"/>
    9   <property name="plugin.jar" value="${plugin.name}.jar"/>
     9  <property name="plugin.jar" value="../dist/${plugin.name}.jar"/>
    1010 
    1111  <!-- plugin meta data (enter new version number if anything changed!) -->
    … …  
    8181  </target>
    8282
    83   <target name="clean">
    84     <delete dir="${plugin.build.dir}" />
    85     <delete dir="${plugin.site.file}" />
    86     <delete dir="${plugin.jar}" />
    87   </target>
    88 
    8983  <!-- write site description for the given plugin so josm will accept it -->
    9084  <target name="site">
    … …  
    138132</target>
    139133
     134<target name="clean">
     135  <delete dir="${plugin.build.dir}" />
     136  <delete dir="${plugin.site.file}" />
     137  <delete file="${plugin.jar}" />
     138</target>
     139
    140140</project>

  • applications/editors/josm/plugins/osmarender/build.xml

    r5147 r5153  
    11<project name="osmarender" default="install" basedir=".">
     2
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    211
    312  <property name="josm" location="../../core/dist/josm-custom.jar" />
    … …  
    514
    615  <target name="compile">
    7     <mkdir dir="bin"></mkdir>
    8     <mkdir dir="dist"></mkdir>
    9     <javac srcdir="src" debug="true" classpath="${josm}" destdir="bin">
     16    <mkdir dir="${plugin.build.dir}"></mkdir>
     17    <mkdir dir="${plugin.dist.dir}"></mkdir>
     18    <javac srcdir="src" debug="true" classpath="${josm}" destdir="${plugin.build.dir}">
    1019      <include name="**/*.java" />
    1120    </javac>
    1221  </target>
    1322
    14   <target name="build"  depends="compile">
    15     <copy todir="bin" file="${rendering}/osmarender6/osmarender.xsl"/>
    16     <copy tofile="bin/osm-map-features.xml"
     23  <target name="dist"  depends="compile">
     24    <copy todir="${plugin.build.dir}" file="${rendering}/osmarender6/osmarender.xsl"/>
     25    <copy tofile="${plugin.build.dir}/osm-map-features.xml"
    1726          file="${rendering}/osmarender5/osm-map-features-z17.xml"/>
    18     <jar destfile="dist/osmarender.jar" basedir="bin">
     27    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    1928      <manifest>
    2029        <attribute name="Plugin-Class" value="OsmarenderPlugin" />
    … …  
    2534
    2635  <target name="clean">
    27     <delete dir="bin" />
    28     <delete dir="dist" />
     36    <delete dir="${plugin.build.dir}" />
     37    <delete file="${plugin.jar}" />
    2938  </target>
    3039
    31   <target name="install" depends="compile,build" />
     40  <target name="install" depends="compile,dist" />
    3241
    3342</project>

  • applications/editors/josm/plugins/plastic_laf/build.xml

    r5147 r5153  
    1 <project name="plastic_laf" default="build" basedir=".">
     1<project name="plastic_laf" default="dist" basedir=".">
    22
    3   <target name="build">
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11
     12  <target name="dist">
    413    <mkdir dir="dist"></mkdir>
    5     <unjar dest="bin" src="lib/looks-2.0.4.jar" />
    6     <javac srcdir="src" destdir="bin">
     14    <unjar dest="${plugin.build.dir}" src="lib/looks-2.0.4.jar" />
     15    <javac srcdir="src" destdir="${plugin.build.dir}">
    716      <include name="**/*.java" />
    817    </javac>
    9     <jar destfile="dist/plastic_laf.jar" basedir="bin">
     18    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    1019      <manifest>
    1120        <attribute name="Plugin-Class" value="plastic_laf.Plugin" />
    … …  
    1726
    1827  <target name="clean">
    19     <delete dir="dist" />
     28    <delete dir="${plugin.build.dir}" />
     29    <delete file="${plugin.jar}" />
    2030  </target>
    2131

  • applications/editors/josm/plugins/pluginmanager/build.xml

    r5147 r5153  
    11<project name="pluginmanager" default="dist" basedir=".">
     2
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    211
    312  <!-- compilation properties -->
    … …  
    6877    <delete dir="${plugin.build.dir}" />
    6978    <delete dir="${plugin.site.file}" />
    70     <delete dir="${plugin.jar}" />
     79    <delete file="${plugin.jar}" />
    7180  </target>
    7281

  • applications/editors/josm/plugins/slippymap/build.xml

    r5147 r5153  
    11<project name="slippymap" default="dist" basedir=".">
     2
     3
     4  <!-- compilation properties -->
     5  <property name="josm.build.dir"       value="../../core"/>
     6  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     7  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     8  <property name="plugin.build.dir"     value="build"/>
     9  <property name="plugin.dist.dir"      value="../dist"/>
     10  <property name="plugin.name"          value="${ant.project.name}"/>
     11  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     12 
    213
    314  <target name="dist" depends="compile">
    … …  
    617      <fileset dir="images" />
    718    </copy>
    8 
     19   
    920    <!-- create josm-custom.jar -->
    10     <jar destfile="slippymap.jar" basedir="build">
     21    <jar destfile="${plugin.jar}" basedir="build">
    1122      <manifest>
    1223        <attribute name="Plugin-Class" value="slippymap.SlippyMapPlugin" />
    … …  
    1930    <javac srcdir="slippymap" classpath="../../core/dist/josm-custom.jar" destdir="build" />
    2031  </target>
    21 
     32 
    2233  <target name="init">
    23     <mkdir dir="build" />
     34    <mkdir dir="${plugin.build.dir}" />
    2435  </target>
    25 
     36 
    2637  <target name="clean">
    27     <delete dir="build" />
     38    <delete dir="${plugin.build.dir}" />
     39    <delete file="${plugin.jar}" />
    2840  </target>
    29 
     41 
    3042</project>

  • applications/editors/josm/plugins/surveyor/build.xml

    r5147 r5153  
    11<project name="surveyor" default="dist" basedir=".">
     2 
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    211
    3   <!-- compilation properties -->
    4   <property name="josm.build.dir" value="../../core"/>
    5   <property name="josm.home.dir" value="${user.home}/.josm"/>
    6   <property name="plugin.build.dir" value="bin"/>
    7   <property name="plugin.name" value="${ant.project.name}"/>
    8   <property name="plugin.jar" value="${plugin.name}.jar"/>
    9   <property name="livegpsplugin.jar" value="../livegps/livegps.jar"/>
     12  <property name="livegpsplugin.jar" value="../dist/livegps.jar"/>
    1013 
    1114  <!-- plugin meta data (enter new version number if anything changed!) -->
    … …  
    2124  <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/surveyor/"/>
    2225 
    23 
     26 
    2427  <target name="dist" depends="compile,site">
    2528    <!-- images -->
    … …  
    5154          <include name="**/*.jar"/>
    5255        </fileset>
    53         <pathelement location="${livegpsplugin.jar}"/>
     56        <pathelement location="${livegpsplugin.jar}"/>
    5457      </classpath>
    5558    </javac>
    5659  </target>
    57 
     60 
    5861  <target name="install" depends="dist">
    5962    <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
    … …  
    6770    <delete dir="${plugin.build.dir}" />
    6871    <delete dir="${plugin.site.file}" />
    69     <delete dir="${plugin.jar}" />
     72    <delete file="${plugin.jar}" />
    7073  </target>
    7174

  • applications/editors/josm/plugins/tagging-preset-tester/build.xml

    r5147 r5153  
    1 <project name="tagging-preset-tester" default="build" basedir=".">
     1<project name="tagging-preset-tester" default="dist" basedir=".">
    22
    3         <target name="compile">
    4                 <mkdir dir="build"/>
    5                 <javac srcdir="src" destdir="build" classpath="../../core/dist/josm-custom.jar" />
    6         </target>
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    711
    8         <target name="build" depends="compile">
    9           <mkdir dir="dist"/>
    10           <jar destfile="dist/tagging-preset-tester.jar"
    11                basedir="build"
    12                manifest="src/org/openstreetmap/josm/plugins/taggingpresettester/MANIFEST.MF">
    13             <fileset dir="."><include name="images/*"/></fileset>
    14           </jar>
    15         </target>
     12  <target name="compile">
     13    <mkdir dir="build"/>
     14    <javac srcdir="src" destdir="build" classpath="../../core/dist/josm-custom.jar" />
     15  </target>
    1616
    17         <target name="clean">
    18           <delete dir="dist"/>
    19           <delete dir="build"/>
    20         </target>
     17  <target name="dist" depends="compile">
     18    <mkdir dir="dist"/>
     19    <jar destfile="${plugin.jar}"
     20         basedir="build"
     21         manifest="src/org/openstreetmap/josm/plugins/taggingpresettester/MANIFEST.MF">
     22      <fileset dir="."><include name="images/*"/></fileset>
     23    </jar>
     24  </target>
     25 
     26  <target name="clean">
     27    <delete dir="${plugin.build.dir}" />
     28    <delete file="${plugin.jar}" />
     29  </target>
    2130
    2231</project>

  • applications/editors/josm/plugins/utilsplugin/build.xml

    r5147 r5153  
    1 <project name="utilsplugin" default="build" basedir=".">
    2   <property name="josm" location="../../core/dist/josm-custom.jar" />
    3  
     1<project name="utilsplugin" default="dist" basedir=".">
     2
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
     11
    412  <target name="init">
    513    <mkdir dir="build"/>
    … …  
    1018  </target>
    1119
    12   <target name="build" depends="clean, compile">
     20  <target name="dist" depends="clean, compile">
    1321    <copy todir="build/images">
    1422      <fileset dir="images"/>
    1523    </copy>
    16     <jar destfile="utilsplugin.jar" basedir="build">
     24    <jar destfile="${plugin.jar}" basedir="build">
    1725      <manifest>
    1826        <attribute name="Plugin-Class" value="UtilsPlugin.UtilsPlugin"/>
    … …  
    2634
    2735  <target name="clean">
    28     <delete dir="build" />
     36    <delete dir="${plugin.build.dir}" />
     37    <delete file="${plugin.jar}" />
    2938  </target>
    3039
    31   <target name="install" depends="build">
    32     <copy file="utilsplugin.jar" todir="${user.home}/.josm/plugins"/>
     40  <target name="install" depends="dist">
     41    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
    3342  </target>
    3443</project>

  • applications/editors/josm/plugins/validator/build.xml

    r5147 r5153  
    1 <project name="validator" default="build" basedir=".">
     1<project name="validator" default="dist" basedir=".">
     2
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    211
    312  <!-- point to your JOSM directory -->
    … …  
    716 
    817  <target name="init">
    9     <mkdir dir="build"/>
     18    <mkdir dir="${plugin.build.dir}"/>
    1019  </target>
    1120
    … …  
    1625  </target>
    1726
    18   <target name="build" depends="clean, compile">
     27  <target name="dist" depends="clean, compile">
    1928    <copy todir="build/images">
    2029      <fileset dir="images"/>
    … …  
    2837    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    2938    <delete file="REVISION"/>
    30     <jar destfile="validator.jar" basedir="build">
     39    <jar destfile="${plugin.jar}" basedir="build">
    3140      <manifest>
    3241        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
    … …  
    3948  </target>
    4049
     50  <!-- clean target -->
    4151  <target name="clean">
    42     <delete dir="build" />
     52    <delete dir="${plugin.build.dir}" />
     53    <delete file="${plugin.jar}" />
    4354  </target>
    4455
    45   <target name="install" depends="build">
    46     <copy file="validator.jar" todir="${user.home}/.josm/plugins"/>
     56  <target name="install" depends="dist">
     57    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
    4758  </target>
    4859
    … …  
    5162    </java>
    5263  </target>
     64
    5365</project>

  • applications/editors/josm/plugins/waypoints/build.xml

    r5147 r5153  
    1 <project name="waypoints" default="build" basedir=".">
     1<project name="waypoints" default="dist" basedir=".">
     2
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    211
    312  <!-- point to your JOSM directory -->
    … …  
    1726  </target>
    1827
    19   <target name="build" depends="compile">
     28  <target name="dist" depends="compile">
    2029    <!--
    2130        <copy todir="build/images">
    … …  
    3140  </target>
    3241
     42  <!-- clean target -->
    3343  <target name="clean">
    34     <delete dir="build" />
    35     <delete dir="dist" />
     44    <delete dir="${plugin.build.dir}" />
     45    <delete file="${plugin.jar}" />
    3646  </target>
    3747
    38   <target name="install" depends="build">
     48  <target name="install" depends="dist">
    3949    <copy file="dist/waypoints.jar" todir="${user.home}/.josm/plugins"/>
    4050  </target>

  • applications/editors/josm/plugins/wmsplugin/build.xml

    r5147 r5153  
    1 <project name="wmsplugin" default="build" basedir=".">
     1<project name="wmsplugin" default="dist" basedir=".">
    22
    3   <!-- point to your JOSM directory -->
    4   <property name="josm" location="../../core/dist/josm-custom.jar" />
    5 
    6 
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    711
    812  <target name="init">
    … …  
    1721  </target>
    1822
    19   <target name="build" depends="compile">
     23  <target name="dist" depends="compile">
    2024    <copy todir="build/images" >
    2125      <fileset dir="images" />
    2226    </copy>
    23     <jar destfile="dist/wmsplugin.jar" basedir="build">
     27    <jar destfile="${plugin.jar}" basedir="build">
    2428      <manifest>
    2529        <attribute name="Plugin-Class" value="wmsplugin.WMSPlugin" />
    … …  
    3135
    3236  <target name="clean">
    33     <delete dir="build" />
    34     <delete dir="dist" />
     37    <delete dir="${plugin.build.dir}" />
     38    <delete file="${plugin.jar}" />
    3539  </target>
    36 
    37   <target name="install" depends="build">
    38     <copy file="dist/wmsplugin.jar" todir="${user.home}/.josm/plugins"/>
     40 
     41  <target name="install" depends="dist">
     42    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
    3943  </target>
    40 
     44 
    4145</project>

  • applications/editors/josm/plugins/ywms/build.xml

    r5147 r5153  
    1 <project name="ywms" default="build" basedir=".">
    2  
    3   <!-- point to your JOSM directory -->
    4   <property name="josm" location="../../core/dist/josm-custom.jar" />
    5  
     1<project name="ywms" default="dist" basedir=".">
    62
     3  <!-- compilation properties -->
     4  <property name="josm.build.dir"       value="../../core"/>
     5  <property name="josm.home.dir"        value="${user.home}/.josm"/>
     6  <property name="josm"                 location="../../core/dist/josm-custom.jar" />
     7  <property name="plugin.build.dir"     value="build"/>
     8  <property name="plugin.dist.dir"      value="../dist"/>
     9  <property name="plugin.name"          value="${ant.project.name}"/>
     10  <property name="plugin.jar"           value="../dist/${plugin.name}.jar"/>
    711 
    812  <target name="init">
    9     <mkdir dir="build"/>
     13    <mkdir dir="${plugin.build.dir}"/>
    1014  </target>
    1115
    … …  
    1620  </target>
    1721
    18   <target name="build" depends="compile">
    19     <copy todir="build/resources">
     22  <target name="dist" depends="compile">
     23    <copy todir="${plugin.build.dir}/resources">
    2024      <fileset dir="resources"/>
    2125    </copy>
    22     <copy todir="build/images">
     26    <copy todir="${plugin.build.dir}/images">
    2327      <fileset dir="images"/>
    2428    </copy>
    … …  
    3135    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    3236    <delete file="REVISION"/>
    33     <jar destfile="ywms.jar" basedir="build">
     37    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    3438      <manifest>
    3539        <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.ywms.YWMSPlugin"/>
    … …  
    4347
    4448  <target name="clean">
    45     <delete dir="build" />
     49    <delete dir="${plugin.build.dir}" />
     50    <delete file="${plugin.jar}" />
    4651  </target>
    47 
    48   <target name="install" depends="build">
    49     <copy file="ywms.jar" todir="${user.home}/.josm/plugins"/>
     52 
     53  <target name="install" depends="dist">
     54    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
    5055  </target>
    5156
Note: See TracChangeset for help on using the changeset viewer.