Ignore:
Timestamp:
2013-03-07T22:10:13+01:00 (12 years ago)
Author:
stoecker
Message:

fix deprecations, cleanup some more build.xml's

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

Legend:

Unmodified
Added
Removed

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

    r27857 r29351  
    11<?xml version="1.0" encoding="utf-8"?>
    22<!--
    3 ** This is a template build file for the osmarender plugin
     3** This is a template build file for a JOSM plugin.
    44**
    55** Maintaining versions
    66** ====================
    7 ** see README.template
     7** See README.template
    88**
    99** Usage
    1010** =====
    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 **
     11** Call "ant help" to get possible build targets.
    2512**
    2613-->
    2714<project name="osmarender" default="install" basedir=".">
    28     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    29     <property name="plugin.dist.dir" value="../../dist"/>
    30     <property name="plugin.build.dir" value="build"/>
    31     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    32     <property name="ant.build.javac.target" value="1.5"/>
     15
     16    <!-- enter the SVN commit message -->
     17    <property name="commit.message" value="Fixed #4360 - osmarender plugin does not load"/>
     18    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     19    <property name="plugin.main.version" value="5631"/>
     20
    3321    <property name="stylesheets" location="./stylesheets"/>
    3422    <property name="xslt" location="./xslt"/>
    35     <property name="commit.message" value="Fixed #4360 - osmarender plugin does not load"/>
    36     <property name="plugin.main.version" value="4968"/>
    37     <target name="init">
    38         <mkdir dir="${plugin.build.dir}"/>
    39     </target>
    40     <target name="compile" depends="init">
    41         <echo message="creating ${plugin.jar}"/>
    42         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    43             <compilerarg value="-Xlint:deprecation"/>
    44             <compilerarg value="-Xlint:unchecked"/>
    45         </javac>
    46     </target>
    47     <target name="copy-styles">
     23
     24    <property name="plugin.author" value="80n"/>
     25    <property name="plugin.class" value="org.openstreetmap.josm.plugins.osmarender.OsmarenderPlugin"/>
     26    <property name="plugin.description" value="Launches FireFox to display the current visible screen as a nice SVG image."/>
     27
     28    <!-- ** include targets that all plugins have in common ** -->
     29    <import file="../build-common.xml"/>
     30
     31    <target name="setup-dist">
     32        <antcall target="setup-dist-default" />
    4833        <copy todir="${plugin.build.dir}" file="${xslt}/osmarender.xsl"/>
    4934        <copy tofile="${plugin.build.dir}/osm-map-features.xml" file="${stylesheets}/osm-map-features-z17.xml"/>
    5035    </target>
    51     <target name="dist" depends="compile,revision,copy-styles">
    52         <copy todir="${plugin.build.dir}/data">
    53             <fileset dir="data"/>
    54         </copy>
    55         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    56             <manifest>
    57                 <attribute name="Author" value="80n"/>
    58                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.osmarender.OsmarenderPlugin"/>
    59                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    60                 <attribute name="Plugin-Description" value="Launches FireFox to display the current visible screen as a nice SVG image."/>
    61                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    62                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    63             </manifest>
    64         </jar>
    65     </target>
     36
    6637    <target name="revision">
    6738        <exec append="false" output="REVISION" executable="perl" failifexecutionfails="false">
    … …  
    8354        <delete file="REVISION"/>
    8455    </target>
    85     <target name="clean">
    86         <delete dir="${plugin.build.dir}"/>
    87         <delete file="${plugin.jar}"/>
    88     </target>
    89     <target name="install" depends="dist">
    90         <property environment="env"/>
    91         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    92             <and>
    93                 <os family="windows"/>
    94             </and>
    95         </condition>
    96         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    97     </target>
    98     <!--
    99          ************************** Publishing the plugin ***********************************
    100         -->
    101     <!--
    102         ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    103         ** property ${coreversion.info.entry.revision}
    104         **
    105         -->
    106     <target name="core-info">
    107         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    108             <env key="LANG" value="C"/>
    109             <arg value="info"/>
    110             <arg value="--xml"/>
    111             <arg value="../../core"/>
    112         </exec>
    113         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    114         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    115         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    116         <delete file="core.info.xml"/>
    117     </target>
    118     <!--
    119         ** commits the source tree for this plugin
    120         -->
    121     <target name="commit-current">
    122         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    123         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    124             <env key="LANG" value="C"/>
    125             <arg value="commit"/>
    126             <arg value="-m '${commit.message}'"/>
    127             <arg value="."/>
    128         </exec>
    129     </target>
    130     <!--
    131         ** updates (svn up) the source tree for this plugin
    132         -->
    133     <target name="update-current">
    134         <echo>Updating plugin source ...</echo>
    135         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    136             <env key="LANG" value="C"/>
    137             <arg value="up"/>
    138             <arg value="."/>
    139         </exec>
    140         <echo>Updating ${plugin.jar} ...</echo>
    141         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    142             <env key="LANG" value="C"/>
    143             <arg value="up"/>
    144             <arg value="../dist/${plugin.jar}"/>
    145         </exec>
    146     </target>
    147     <!--
    148         ** commits the plugin.jar
    149         -->
    150     <target name="commit-dist">
    151         <echo>
    152     ***** Properties of published ${plugin.jar} *****
    153     Commit message    : '${commit.message}'
    154     Plugin-Mainversion: ${plugin.main.version}
    155     JOSM build version: ${coreversion.info.entry.revision}
    156     Plugin-Version    : ${version.entry.commit.revision}
    157     ***** / Properties of published ${plugin.jar} *****
    15856
    159     Now commiting ${plugin.jar} ...
    160     </echo>
    161         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    162             <env key="LANG" value="C"/>
    163             <arg value="-m '${commit.message}'"/>
    164             <arg value="commit"/>
    165             <arg value="${plugin.jar}"/>
    166         </exec>
    167     </target>
    168     <!-- ** make sure svn is present as a command line tool ** -->
    169     <target name="ensure-svn-present">
    170         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    171             <env key="LANG" value="C"/>
    172             <arg value="--version"/>
    173         </exec>
    174         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    175             <!-- return code not set at all? Most likely svn isn't installed -->
    176             <condition>
    177                 <not>
    178                     <isset property="svn.exit.code"/>
    179                 </not>
    180             </condition>
    181         </fail>
    182         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    183             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    184             <condition>
    185                 <isfailure code="${svn.exit.code}"/>
    186             </condition>
    187         </fail>
    188     </target>
    189     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    190     </target>
    19157</project>

  • applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java

    r28367 r29351  
    161161            panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
    162162            firefox.setText(Main.pref.get("osmarender.firefox"));
    163             gui.getMapPreference().mapcontent.addTab(tr("Osmarender"), panel);
     163            gui.getMapPreference().getTabPane().addTab(tr("Osmarender"), panel);
    164164        }
    165165
Note: See TracChangeset for help on using the changeset viewer.