Ignore:
Timestamp:
2009-03-19T13:26:29+01:00 (16 years ago)
Author:
stoecker
Message:

cleanup build

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

Legend:

Unmodified
Added
Removed

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

    r12780 r14128  
    11<project name="Duplicate-Way" default="dist" basedir=".">
    2 <!-- compilation properties -->
    3     <property name="josm.build.dir"   value="../../core"/>
    4     <property name="josm.home.dir"    value="${user.home}/.josm"/>
    5     <property name="josm"         location="../../core/dist/josm-custom.jar" />
    6     <property name="plugin.build.dir" value="build"/>
    7     <property name="plugin.dist.dir"  value="../../dist"/>
    8     <property name="plugin.name"      value="${ant.project.name}"/>
    9     <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
     2    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     3    <property name="plugin.dist.dir"        value="../../dist"/>
     4    <property name="plugin.build.dir"       value="build"/>
     5    <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    106    <property name="ant.build.javac.target" value="1.5"/>
    117    <target name="init">
    … …  
    1410    <target name="compile" depends="init">
    1511        <echo message="creating ${plugin.jar}"/>
    16         <mkdir dir="build"></mkdir>
    17         <mkdir dir="${plugin.build.dir}/images"></mkdir>
    18         <copy todir="build">
    19             <fileset dir="${plugin.build.dir}" casesensitive="yes">
    20                 <filename name="**/*.class"/>
    21             </fileset>
    22         </copy>
    23         <copy todir="${plugin.build.dir}/images">
    24             <fileset dir="images" casesensitive="yes">
    25                 <filename name="**/*.png"/>
    26             </fileset>
    27         </copy>
    28         <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
    29             <include name="**/*.java" />
     12        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
     13            <compilerarg value="-Xlint:deprecation"/>
     14            <compilerarg value="-Xlint:unchecked"/>
    3015        </javac>
    3116    </target>
    32     <target name="dist" depends="compile">
    33         <jar destfile="${plugin.jar}" basedir="build">
     17    <target name="dist" depends="compile,revision">
     18        <copy todir="${plugin.build.dir}/images">
     19            <fileset dir="images"/>
     20        </copy>
     21        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    3422            <manifest>
     23                <attribute name="Author" value="Brent Easton"/>
    3524                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.duplicateway.DuplicateWayPlugin" />
     25                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    3626                <attribute name="Plugin-Description" value="Duplicate Ways with an offset" />
    37                 <attribute name="Plugin-Version" value="0.1"/>
    38                 <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>"/>
     27                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    3928            </manifest>
    4029        </jar>
    4130    </target>
     31    <target name="revision">
     32        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
     33            <env key="LANG" value="C"/>
     34            <arg value="info"/>
     35            <arg value="--xml"/>
     36            <arg value="."/>
     37        </exec>
     38        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
     39        <delete file="REVISION"/>
     40    </target>
    4241    <target name="clean">
    43         <delete dir="${plugin.build.dir}" />
    44         <delete file="${plugin.jar}" />
     42        <delete dir="${plugin.build.dir}"/>
     43        <delete file="${plugin.jar}"/>
    4544    </target>
    4645    <target name="install" depends="dist">
    47         <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
     46        <property environment="env"/>
     47        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
     48            <and>
     49                <os family="windows"/>
     50            </and>
     51        </condition>
     52        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    4853    </target>
    4954</project>

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

    r12780 r14128  
    11<project name="grid" default="dist" basedir=".">
    2 <!-- compilation properties -->
    3     <property name="josm.build.dir"   value="../../core"/>
    4     <property name="josm.home.dir"    value="${user.home}/.josm"/>
    5     <property name="josm"         location="../../core/dist/josm-custom.jar" />
    6     <property name="plugin.build.dir" value="build"/>
    7     <property name="plugin.dist.dir"  value="../../dist"/>
    8     <property name="plugin.name"      value="${ant.project.name}"/>
    9     <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
    10 <!-- point to your JOSM directory -->
    11     <property name="josm" location="${josm.build.dir}/dist/josm-custom.jar" />
     2    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     3    <property name="plugin.dist.dir"        value="../../dist"/>
     4    <property name="plugin.build.dir"       value="build"/>
     5    <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    126    <property name="ant.build.javac.target" value="1.5"/>
    137    <target name="init">
    14         <mkdir dir="build"></mkdir>
    15         <mkdir dir="dist"></mkdir>
     8        <mkdir dir="${plugin.build.dir}"/>
    169    </target>
    1710    <target name="compile" depends="init">
    1811        <echo message="creating ${plugin.jar}"/>
    19         <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
    20             <include name="**/*.java" />
     12        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
     13            <compilerarg value="-Xlint:deprecation"/>
     14            <compilerarg value="-Xlint:unchecked"/>
    2115        </javac>
    2216    </target>
    23     <target name="dist" depends="compile">
    24         <copy todir="build/images" >
    25             <fileset dir="images" />
     17    <target name="dist" depends="compile,revision">
     18        <copy todir="${plugin.build.dir}/images">
     19            <fileset dir="images"/>
    2620        </copy>
    27         <jar destfile="${plugin.jar}" basedir="build">
     21        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    2822            <manifest>
    2923                <attribute name="Plugin-Class" value="grid.GridPlugin" />
     24                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    3025                <attribute name="Plugin-Description" value="Provide a background layer that displays a map grid" />
     26                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    3127            </manifest>
    3228        </jar>
    3329    </target>
     30    <target name="revision">
     31        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
     32            <env key="LANG" value="C"/>
     33            <arg value="info"/>
     34            <arg value="--xml"/>
     35            <arg value="."/>
     36        </exec>
     37        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
     38        <delete file="REVISION"/>
     39    </target>
    3440    <target name="clean">
    35         <delete dir="${plugin.build.dir}" />
    36         <delete file="${plugin.jar}" />
     41        <delete dir="${plugin.build.dir}"/>
     42        <delete file="${plugin.jar}"/>
    3743    </target>
    3844    <target name="install" depends="dist">
    39         <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
     45        <property environment="env"/>
     46        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
     47            <and>
     48                <os family="windows"/>
     49            </and>
     50        </condition>
     51        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    4052    </target>
    4153</project>

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

    r12780 r14128  
    11<project name="navigator" default="dist" basedir=".">
    2 <!-- compilation properties -->
    3     <property name="josm.build.dir"   value="../../core"/>
    4     <property name="josm.home.dir"    value="${user.home}/.josm"/>
    5     <property name="josm"         location="../../core/dist/josm-custom.jar" />
    6     <property name="plugin.build.dir" value="build"/>
    7     <property name="plugin.dist.dir"  value="../../dist"/>
    8     <property name="plugin.name"      value="${ant.project.name}"/>
    9     <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
    10 <!-- plugin meta data (enter new version number if anything changed!) -->
    11     <property name="plugin.version" value="0.3.1"/>
    12     <property name="plugin.description" value="Provides navigation/autorouting functionality (V${plugin.version})."/>
    13     <property name="plugin.stage" value="50"/>
    14     <property name="plugin.class" value="at.dallermassl.josm.plugin.navigator.NavigatorPlugin"/>
    15 <!-- update site meta data -->
    16     <property name="plugin.site.file" value="josm-site.xml"/>
    17     <property name="plugin.site.description" value="Josm's Surveyor Update Site"/>
    18     <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/${ant.project.name}/"/>
    19     <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/${ant.project.name}/"/>
     2    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     3    <property name="plugin.dist.dir"        value="../../dist"/>
     4    <property name="plugin.build.dir"       value="build"/>
     5    <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    206    <property name="ant.build.javac.target" value="1.5"/>
    21     <target name="dist" depends="compile,site">
    22 <!-- images -->
    23         <copy todir="${plugin.build.dir}/images">
    24             <fileset dir="src/images" />
    25         </copy>
    26 <!-- copy configuration xml files
    27      <copy todir="${plugin.build.dir}">
    28        <fileset dir="src">
    29          <include name="*.xml"/>
    30        </fileset>
    31      </copy>
    32      -->
    33 <!-- create jar file -->
    34         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    35             <manifest>
    36                 <attribute name="Plugin-Class" value="${plugin.class}" />
    37                 <attribute name="Plugin-Description" value="${plugin.description}" />
    38                 <attribute name="Plugin-Version" value="${plugin.version}" />
    39                 <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5" />
    40                 <attribute name="Plugin-Stage" value="${plugin.stage}" />
    41             </manifest>
    42         </jar>
     7    <target name="init">
     8        <mkdir dir="${plugin.build.dir}"/>
    439    </target>
    4410    <target name="compile" depends="init">
    4511        <echo message="creating ${plugin.jar}"/>
    46         <mkdir dir="${plugin.build.dir}"/>
    47         <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
     12        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}">
     13            <compilerarg value="-Xlint:deprecation"/>
     14            <compilerarg value="-Xlint:unchecked"/>
    4815            <classpath>
    49                 <pathelement path="${josm.build.dir}/build"/>
    50                 <fileset dir="${josm.build.dir}/lib">
    51                     <include name="**/*.jar"/>
    52                 </fileset>
     16                <pathelement location="${josm}"/>
    5317                <fileset dir="lib">
    5418                    <include name="**/*.jar"/>
    … …  
    5721        </javac>
    5822    </target>
    59     <target name="install" depends="dist">
    60         <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
    61         <copy todir="${josm.home.dir}/plugins">
    62             <fileset dir="lib">
    63                 <include name="**/*.jar"/>
    64             </fileset>
     23    <target name="dist" depends="compile,revision">
     24        <unjar dest="${plugin.build.dir}">
     25            <fileset dir="lib"/>
     26        </unjar>
     27        <copy todir="${plugin.build.dir}/images">
     28            <fileset dir="images"/>
    6529        </copy>
     30        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
     31            <manifest>
     32                <attribute name="Author" value="Christof Dallermassl" />
     33                <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.navigator.NavigatorPlugin" />
     34                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
     35                <attribute name="Plugin-Description" value="Provides navigation/autorouting functionality" />
     36                <attribute name="Plugin-Stage" value="50" />
     37                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
     38            </manifest>
     39        </jar>
    6640    </target>
    67     <target name="init">
    68         <echo>java version: ${java.version}</echo>
     41    <target name="revision">
     42        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
     43            <env key="LANG" value="C"/>
     44            <arg value="info"/>
     45            <arg value="--xml"/>
     46            <arg value="."/>
     47        </exec>
     48        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
     49        <delete file="REVISION"/>
    6950    </target>
    7051    <target name="clean">
    71         <delete dir="${plugin.build.dir}" />
    72         <delete dir="${plugin.site.file}" />
    73         <delete file="${plugin.jar}" />
     52        <delete dir="${plugin.build.dir}"/>
     53        <delete file="${plugin.jar}"/>
    7454    </target>
    75 <!-- write site description for the given plugin so josm will accept it -->
    76     <target name="site">
    77         <echo message="creating site description in ${plugin.site.file}"/>
    78         <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
    79   &lt;plugins>
    80   &lt;plugin id="${ant.project.name}" version="${plugin.version}">
    81   &lt;name>${ant.project.name}&lt;/name>
    82   &lt;description>${plugin.description}&lt;/description>
    83   &lt;resource>${plugin.site.url}${plugin.jar}&lt;/resource>
    84   &lt;/plugin>
    85   &lt;/plugins>
    86 </echo>
    87     </target>
    88 <!-- write site description for the given plugin (not implemented in JOSM as full version yet!) -->
    89     <target name="site-full-donotuse">
    90         <echo message="creating site description in ${plugin.site.file}"/>
    91         <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
    92     &lt;site version="1.0">
    93     &lt;!-- meta data of site -->
    94 &lt;site-info>
    95 &lt;site-name>${plugin.site.description}&lt;/site-name>
    96 &lt;site-url>${plugin.site.url}&lt;/site-url>
    97 &lt;/site-info>
    98 
    99 &lt;!-- plugins available on this site -->
    100 &lt;plugins>
    101 &lt;plugin id="${ant.project.name}" version="${plugin.version}">
    102 &lt;name>${ant.project.name}&lt;/name>
    103 &lt;description>${plugin.description}&lt;/description>
    104 &lt;resources>
    105 &lt;resource src="${plugin.site.url}${plugin.jar}"
    106 target="${josm.home.dir}/plugins/${plugin.jar}"/>
    107 &lt;/resources>
    108 &lt;/plugin>
    109 &lt;/plugins>
    110 &lt;/site>
    111 </echo>
    112     </target>
    113 <!-- upload the site description and the jar file via ssh -->
    114     <target name="upload" depends="dist,site">
    115         <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
    116         <exec executable="scp">
    117             <arg value="${plugin.jar}"/>
    118             <arg value="${plugin.site.file}"/>
    119             <arg value="${plugin.site.upload.target}"/>
    120         </exec>
     55    <target name="install" depends="dist">
     56        <property environment="env"/>
     57        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
     58            <and>
     59                <os family="windows"/>
     60            </and>
     61        </condition>
     62        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    12163    </target>
    12264</project>
Note: See TracChangeset for help on using the changeset viewer.