Changeset 29442 in osm


Ignore:
Timestamp:
2013-03-30T11:51:16+01:00 (11 years ago)
Author:
stoecker
Message:

use commons instead of copied code

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

Legend:

Unmodified
Added
Removed

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

    r29435 r29442  
    3333    <!--
    3434    **********************************************************
    35     ** compile - complies the source tree
     35    ** compile - compiles the source tree
    3636    **********************************************************
    3737    -->

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

    r29435 r29442  
    11<?xml version="1.0" encoding="utf-8"?>
    22<!--
    3 ** This is the build.xml for the walkingpaper plugin
     3** This is a template build file for a JOSM  plugin.
     4**
     5** Maintaining versions
     6** ====================
     7** See README.template
    48**
    59** Usage
    610** =====
    7 ** To build it run
    8 **
    9 **    > ant  dist
    10 **
    11 ** To install the generated plugin locally (in your default plugin directory) run
    12 **
    13 **    > ant  install
    14 **
    15 ** To build against the core in ../../core, create a correct manifest and deploy to
    16 ** SVN,
    17 **    set the properties commit.message and plugin.main.version
    18 ** and run
    19 **    > ant  publish
    20 **
     11** Call "ant help" to get possible build targets.
    2112**
    2213-->
    2314<project name="walkingpapers" default="dist" basedir=".">
    24     <!--
    25     ** update before publishing
    26     -->
     15
     16    <!-- enter the SVN commit message -->
    2717    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     18    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    2819    <property name="plugin.main.version" value="4549"/>
    29     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    30     <property name="plugin.dist.dir" value="../../dist"/>
    31     <property name="plugin.build.dir" value="build"/>
    32     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    33     <property name="ant.build.javac.target" value="1.5"/>
    34     <target name="init">
    35         <mkdir dir="${plugin.build.dir}"/>
    36     </target>
    37     <target name="compile" depends="init">
    38         <echo message="creating ${plugin.jar}"/>
    39         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    40             <compilerarg value="-Xlint:deprecation"/>
    41             <compilerarg value="-Xlint:unchecked"/>
    42         </javac>
    43     </target>
    44     <target name="dist" depends="compile,revision">
    45         <copy todir="${plugin.build.dir}/images">
    46             <fileset dir="images"/>
    47         </copy>
    48         <copy todir="${plugin.build.dir}/data">
    49             <fileset dir="data"/>
    50         </copy>
    51         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    52             <manifest>
    53                 <attribute name="Author" value="Frederik Ramm"/>
    54                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.walkingpapers.WalkingPapersPlugin"/>
    55                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    56                 <attribute name="Plugin-Description" value="Supports downloading tiled, scanned maps from walking-papers.org. This plugin is still under early development and may be buggy."/>
    57                 <attribute name="Plugin-Icon" value="images/preferences/walkingpapers.png"/>
    58                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/WalkingPapers"/>
    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="-m '${commit.message}'"/>
    115             <arg value="commit"/>
    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} *****
    14720
    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" failonerror="false" resultproperty="svn.exit.code">
    160             <env key="LANG" value="C"/>
    161             <arg value="--version"/>
    162         </exec>
    163         <fail message="Fatal: command 'svn' not found. Please make sure svn is installed on your system.">
    164             <condition>
    165                 <isfailure code="${svn.exit.code}"/>
    166             </condition>
    167         </fail>
    168     </target>
    169     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    170     </target>
     21    <property name="plugin.author" value="Frederik Ram"/>
     22    <property name="plugin.class" value="org.openstreetmap.josm.plugins.walkingpapers.WalkingPapersPlugin"/>
     23    <property name="plugin.description" value="Supports downloading tiled, scanned maps from walking-papers.org. This plugin is still under early development and may be buggy."/>
     24    <property name="plugin.icon" value="images/preferences/walkingpapers.pn"/>
     25    <property name="plugin.link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/WalkingPapers"/>
     26
     27    <!-- ** include targets that all plugins have in common ** -->
     28    <import file="../build-common.xml"/>
     29
    17130</project>
Note: See TracChangeset for help on using the changeset viewer.