Changeset 27960 in osm for applications


Ignore:
Timestamp:
2012-03-01T09:44:12+01:00 (13 years ago)
Author:
stoecker
Message:

fix revision for conflation plugin

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

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java

    r27939 r27960  
    1919       
    2020        listModel = new LogListModel();
    21         logPanel = new JList<String>(listModel);
     21        logPanel = new JList(listModel);
    2222        createLayout(logPanel, true, null);
    2323    }
    2424   
    25     private class LogListModel extends AbstractListModel<String> {
     25    private class LogListModel extends AbstractListModel {
    2626
    2727        public int getSize() {

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

    r26341 r27960  
    137137        <echo>
    138138    ***** Properties of published ${plugin.jar} *****
    139     Commit message    : '${commit.message}'                 
     139    Commit message    : '${commit.message}'
    140140    Plugin-Mainversion: ${plugin.main.version}
    141141    JOSM build version: ${coreversion.info.entry.revision}
    142142    Plugin-Version    : ${version.entry.commit.revision}
    143     ***** / Properties of published ${plugin.jar} *****                 
    144                        
     143    ***** / Properties of published ${plugin.jar} *****
     144
    145145    Now commiting ${plugin.jar} ...
    146146    </echo>

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

    r27923 r27960  
    1414        <ant antfile="build.xml" target="dist" dir="cadastre-fr"/>
    1515        <ant antfile="build.xml" target="dist" dir="colorscheme"/>
     16        <ant antfile="build.xml" target="dist" dir="conflation"/>
    1617        <ant antfile="build.xml" target="dist" dir="canvec_helper"/>
    1718        <ant antfile="build.xml" target="dist" dir="ColumbusCSV"/>
    … …  
    5253        <ant antfile="build.xml" target="dist" dir="multipoly-convert"/>
    5354        <ant antfile="build.xml" target="dist" dir="namemanager"/>
     55        <ant antfile="build.xml" target="dist" dir="NanoLog"/>
    5456        <ant antfile="build.xml" target="dist" dir="native-password-manager"/>
    5557        <ant antfile="build.xml" target="dist" dir="nearclick"/>
    … …  
    9496    </target>
    9597    <target name="build_defect" depends="compile">
    96         <ant antfile="build.xml" target="dist" dir="rgisopen"/>
    9798        <ant antfile="build.xml" target="dist" dir="trustosm"/>
    9899    </target>
    … …  
    106107        <ant antfile="build.xml" target="clean" dir="ColumbusCSV"/>
    107108        <ant antfile="build.xml" target="clean" dir="CommandLine"/>
     109        <ant antfile="build.xml" target="clean" dir="conflation"/>
    108110        <ant antfile="build.xml" target="clean" dir="Create_grid_of_ways"/>
    109111        <ant antfile="build.xml" target="clean" dir="czechaddress"/>
    … …  
    141143        <ant antfile="build.xml" target="clean" dir="multipoly-convert"/>
    142144        <ant antfile="build.xml" target="clean" dir="namemanager"/>
     145        <ant antfile="build.xml" target="clean" dir="NanoLog"/>
    143146        <ant antfile="build.xml" target="clean" dir="native-password-manager"/>
    144147        <ant antfile="build.xml" target="clean" dir="nearclick"/>

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

    r27959 r27960  
    11<?xml version="1.0" encoding="utf-8"?>
    22<!--
    3 ** This is the build file for the conflation JOSM plugin.
    4 **
    53** Maintaining versions
    64** ====================
    … …  
    3331    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    3432    <property name="plugin.main.version" value="4980"/>
    35     <!--
    36       ************************************************
    37       ** should not be necessary to change the following properties
    38      -->
    39     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    40     <property name="utilsplugin2" location="../../dist/utilsplugin2.jar"/>
    41     <property name="plugin.build.dir" value="build"/>
    42     <property name="plugin.src.dir" value="src"/>
    43     <!-- this is the directory where the plugin jar is copied to -->
    44     <property name="plugin.dist.dir" value="../../dist"/>
    45     <property name="ant.build.javac.target" value="1.5"/>
    46     <property name="ant.build.javac.source" value="1.5"/>
    47     <property name="plugin.dist.dir" value="../../dist"/>
    48     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     33    <property name="utilsplugin2" location="${plugin.dist.dir}/utilsplugin2.jar"/>
     34
    4935    <!--
    5036    **********************************************************
    51     ** init - initializes the build
     37    ** include targets that all plugins have in common
    5238    **********************************************************
    5339    -->
    54     <target name="init">
    55         <mkdir dir="${plugin.build.dir}"/>
    56     </target>
     40    <import file="../build-common.xml"/>
     41
    5742    <!--
    5843    **********************************************************
    … …  
    7661    **********************************************************
    7762    -->
    78     <target name="dist" depends="compile">
     63    <target name="dist" depends="compile,revision">
    7964        <echo message="creating ${ant.project.name}.jar ... "/>
    8065        <copy todir="${plugin.build.dir}/resources">
    … …  
    115100        </jar>
    116101    </target>
    117     <!--
    118     **********************************************************
    119     ** revision - extracts the current revision number for the
    120     **    file build.number and stores it in the XML property
    121     **    version.*
    122     **********************************************************
    123     -->
    124     <target name="revision">
    125         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    126             <env key="LANG" value="C"/>
    127             <arg value="info"/>
    128             <arg value="--xml"/>
    129             <arg value="."/>
    130         </exec>
    131         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    132         <delete file="REVISION"/>
    133     </target>
    134     <!--
    135     **********************************************************
    136     ** clean - clean up the build environment
    137     **********************************************************
    138     -->
    139     <target name="clean">
    140         <delete dir="${plugin.build.dir}"/>
    141         <delete file="${plugin.jar}"/>
    142     </target>
    143     <!--
    144     **********************************************************
    145     ** install - install the plugin in your local JOSM installation
    146     **********************************************************
    147     -->
    148     <target name="install" depends="dist">
    149         <property environment="env"/>
    150         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    151             <and>
    152                 <os family="windows"/>
    153             </and>
    154         </condition>
    155         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    156     </target>
    157     <!--
    158     ************************** Publishing the plugin ***********************************
    159     -->
    160     <!--
    161         ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    162         ** property ${coreversion.info.entry.revision}
    163         **
    164         -->
    165     <target name="core-info">
    166         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    167             <env key="LANG" value="C"/>
    168             <arg value="info"/>
    169             <arg value="--xml"/>
    170             <arg value="../../core"/>
    171         </exec>
    172         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    173         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    174         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    175         <delete file="core.info.xml"/>
    176     </target>
    177     <!--
    178         ** commits the source tree for this plugin
    179         -->
    180     <target name="commit-current">
    181         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    182         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    183             <env key="LANG" value="C"/>
    184             <arg value="commit"/>
    185             <arg value="-m '${commit.message}'"/>
    186             <arg value="."/>
    187         </exec>
    188     </target>
    189     <!--
    190         ** updates (svn up) the source tree for this plugin
    191         -->
    192     <target name="update-current">
    193         <echo>Updating plugin source ...</echo>
    194         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    195             <env key="LANG" value="C"/>
    196             <arg value="up"/>
    197             <arg value="."/>
    198         </exec>
    199         <echo>Updating ${plugin.jar} ...</echo>
    200         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    201             <env key="LANG" value="C"/>
    202             <arg value="up"/>
    203             <arg value="../dist/${plugin.jar}"/>
    204         </exec>
    205     </target>
    206     <!--
    207         ** commits the plugin.jar
    208         -->
    209     <target name="commit-dist">
    210         <echo>
    211     ***** Properties of published ${plugin.jar} *****
    212     Commit message    : '${commit.message}'                   
    213     Plugin-Mainversion: ${plugin.main.version}
    214     JOSM build version: ${coreversion.info.entry.revision}
    215     Plugin-Version    : ${version.entry.commit.revision}
    216     ***** / Properties of published ${plugin.jar} *****                   
    217                        
    218     Now commiting ${plugin.jar} ...
    219     </echo>
    220         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    221             <env key="LANG" value="C"/>
    222             <arg value="-m '${commit.message}'"/>
    223             <arg value="commit"/>
    224             <arg value="${plugin.jar}"/>
    225         </exec>
    226     </target>
    227     <!-- ** make sure svn is present as a command line tool ** -->
    228     <target name="ensure-svn-present">
    229         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    230             <env key="LANG" value="C"/>
    231             <arg value="--version"/>
    232         </exec>
    233         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    234             <!-- return code not set at all? Most likely svn isn't installed -->
    235             <condition>
    236                 <not>
    237                     <isset property="svn.exit.code"/>
    238                 </not>
    239             </condition>
    240         </fail>
    241         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    242             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    243             <condition>
    244                 <isfailure code="${svn.exit.code}"/>
    245             </condition>
    246         </fail>
    247     </target>
    248     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    249     </target>
    250102</project>
Note: See TracChangeset for help on using the changeset viewer.