Changeset 29534 in osm for applications/editors/josm


Ignore:
Timestamp:
2013-04-23T13:34:28+02:00 (12 years ago)
Author:
donvip
Message:

[josm_measurement] Fix build.xml and some warnings

Location:
applications/editors/josm/plugins/measurement
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified applications/editors/josm/plugins/measurement/.classpath

    r23458 r29534  
    33        <classpathentry kind="src" path="src"/>
    44        <classpathentry including="images/" kind="src" path=""/>
    5         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
     5        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    66        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    77        <classpathentry kind="output" path="build"/>

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

    r29435 r29534  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <!--
    3 ** This is the build file for the measurement plugin
    4 **
    5 ** Maintaining versions
    6 ** ====================
    7 ** see README.template
    8 **
    9 ** Usage
    10 ** =====
    11 ** To build it run
    12 **
    13 **    > ant  dist
    14 **
    15 ** To install the generated plugin locally (in your default plugin directory) run
    16 **
    17 **    > ant  install
    18 **
    19 ** To build against the core in ../../core, create a correct manifest and deploy to
    20 ** SVN,
    21 **    set the properties commit.message and plugin.main.version
    22 ** and run
    23 **    > ant  publish
    24 **
    25 **
    26 -->
    272<project name="measurement" default="dist" basedir=".">
     3    <!-- enter the SVN commit message -->
    284    <property name="commit.message" value="recompile dure to core change"/>
     5    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    296    <property name="plugin.main.version" value="5560"/>
    30     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    31     <property name="plugin.dist.dir" value="../../dist"/>
    32     <property name="plugin.build.dir" value="build"/>
    33     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    34     <property name="ant.build.javac.target" value="1.6"/>
    35     <target name="init">
    36         <mkdir dir="${plugin.build.dir}"/>
    37     </target>
    38     <target name="compile" depends="init">
    39         <echo message="creating ${plugin.jar}"/>
    40         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    41             <compilerarg value="-Xlint:deprecation"/>
    42             <compilerarg value="-Xlint:unchecked"/>
    43         </javac>
    44     </target>
    45     <target name="dist" depends="compile,revision">
    46         <copy todir="${plugin.build.dir}/images">
    47             <fileset dir="images"/>
    48         </copy>
    49         <copy todir="${plugin.build.dir}/data">
    50             <fileset dir="data"/>
    51         </copy>
    52         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    53             <manifest>
    54                 <attribute name="Author" value="Raphael Mack, Reza Mohammadi"/>
    55                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin"/>
    56                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    57                 <attribute name="Plugin-Description" value="Provide a measurement dialog and a layer to measure length and angle of segments, area surrounded by a (simple) closed way and create measurement paths (which also can be imported from a gps layer)."/>
    58                 <attribute name="Plugin-Icon" value="images/dialogs/measure.png"/>
    59                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    60                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    61             </manifest>
    62         </jar>
    63     </target>
    64     <target name="revision">
    65         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    66             <env key="LANG" value="C"/>
    67             <arg value="info"/>
    68             <arg value="--xml"/>
    69             <arg value="."/>
    70         </exec>
    71         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    72         <delete file="REVISION"/>
    73     </target>
    74     <target name="clean">
    75         <delete dir="${plugin.build.dir}"/>
    76         <delete file="${plugin.jar}"/>
    77     </target>
    78     <target name="install" depends="dist">
    79         <property environment="env"/>
    80         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    81             <and>
    82                 <os family="windows"/>
    83             </and>
    84         </condition>
    85         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    86     </target>
    87     <!--
    88          ************************** Publishing the plugin ***********************************
    89         -->
    90     <!--
    91         ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    92         ** property ${coreversion.info.entry.revision}
    93         **
    94         -->
    95     <target name="core-info">
    96         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    97             <env key="LANG" value="C"/>
    98             <arg value="info"/>
    99             <arg value="--xml"/>
    100             <arg value="../../core"/>
    101         </exec>
    102         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    103         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    104         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    105         <delete file="core.info.xml"/>
    106     </target>
    107     <!--
    108         ** commits the source tree for this plugin
    109         -->
    110     <target name="commit-current">
    111         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    112         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    113             <env key="LANG" value="C"/>
    114             <arg value="commit"/>
    115             <arg value="-m '${commit.message}'"/>
    116             <arg value="."/>
    117         </exec>
    118     </target>
    119     <!--
    120         ** updates (svn up) the source tree for this plugin
    121         -->
    122     <target name="update-current">
    123         <echo>Updating plugin source ...</echo>
    124         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    125             <env key="LANG" value="C"/>
    126             <arg value="up"/>
    127             <arg value="."/>
    128         </exec>
    129         <echo>Updating ${plugin.jar} ...</echo>
    130         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    131             <env key="LANG" value="C"/>
    132             <arg value="up"/>
    133             <arg value="../dist/${plugin.jar}"/>
    134         </exec>
    135     </target>
    136     <!--
    137         ** commits the plugin.jar
    138         -->
    139     <target name="commit-dist">
    140         <echo>
    141     ***** Properties of published ${plugin.jar} *****
    142     Commit message    : '${commit.message}'
    143     Plugin-Mainversion: ${plugin.main.version}
    144     JOSM build version: ${coreversion.info.entry.revision}
    145     Plugin-Version    : ${version.entry.commit.revision}
    146     ***** / Properties of published ${plugin.jar} *****
     7   
     8    <!-- Configure these properties (replace "..." accordingly).
     9         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
     10    -->
     11    <property name="plugin.author" value="Raphael Mack, Reza Mohammadi"/>
     12    <property name="plugin.class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin"/>
     13    <property name="plugin.description" value="Provide a measurement dialog and a layer to measure length and angle of segments, area surrounded by a (simple) closed way and create measurement paths (which also can be imported from a gps layer)."/>
     14    <property name="plugin.icon" value="images/dialogs/measure.png"/>
    14715
    148     Now commiting ${plugin.jar} ...
    149     </echo>
    150         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    151             <env key="LANG" value="C"/>
    152             <arg value="-m '${commit.message}'"/>
    153             <arg value="commit"/>
    154             <arg value="${plugin.jar}"/>
    155         </exec>
    156     </target>
    157     <!-- ** make sure svn is present as a command line tool ** -->
    158     <target name="ensure-svn-present">
    159         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    160             <env key="LANG" value="C"/>
    161             <arg value="--version"/>
    162         </exec>
    163         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    164             <!-- return code not set at all? Most likely svn isn't installed -->
    165             <condition>
    166                 <not>
    167                     <isset property="svn.exit.code"/>
    168                 </not>
    169             </condition>
    170         </fail>
    171         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    172             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    173             <condition>
    174                 <isfailure code="${svn.exit.code}"/>
    175             </condition>
    176         </fail>
    177     </target>
    178     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    179     </target>
     16    <!-- ** include targets that all plugins have in common ** -->
     17    <import file="../build-common.xml"/>
    18018</project>
Note: See TracChangeset for help on using the changeset viewer.