Changeset 30750 in osm


Ignore:
Timestamp:
2014-10-19T18:51:39+02:00 (10 years ago)
Author:
donvip
Message:

[josm_trustosm] remove JGoodies, relies on plastic_laf plugin instead

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

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/trustosm/.classpath

    r30745 r30750  
    1313        </classpathentry>
    1414        <classpathentry kind="lib" path="lib/jcalendar-1.4.jar"/>
    15         <classpathentry kind="lib" path="lib/jgoodies-common-1.2.0.jar"/>
    16         <classpathentry kind="lib" path="lib/jgoodies-looks-2.4.1.jar"/>
    1715        <classpathentry kind="lib" path="lib/swingx-core-1.6.5-1.jar"/>
    1816        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

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

    r30746 r30750  
    11<?xml version="1.0" encoding="utf-8"?>
    22<project name="trustosm" default="dist" basedir=".">
     3
    34    <!-- enter the SVN commit message -->
    45    <property name="commit.message" value="New plugin for digital signing osm data"/>
    56    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="7001"/>
    7     <!--
    8       ************************************************
    9       ** should not be necessary to change the following properties
    10      -->
    11     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    12     <property name="plugin.build.dir" value="build"/>
    13     <property name="plugin.src.dir" value="src"/>
    14     <property name="plugin.lib.dir" value="lib"/>
    15     <!-- this is the directory where the plugin jar is copied to -->
    16     <property name="plugin.dist.dir" value="../../dist"/>
    17     <property name="ant.build.javac.target" value="1.7"/>
    18     <property name="plugin.dist.dir" value="../../dist"/>
    19     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    20     <!--
    21     **********************************************************
    22     ** init - initializes the build
    23     **********************************************************
     7    <property name="plugin.main.version" value="7001" />
     8
     9    <!-- Configure these properties (replace "..." accordingly).
     10         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    2411    -->
    25     <target name="init">
    26         <mkdir dir="${plugin.build.dir}"/>
    27     </target>
    28     <!--
    29     **********************************************************
    30     ** compile - complies the source tree
    31     **********************************************************
    32     -->
    33     <target name="compile" depends="init">
    34         <echo message="compiling sources for  ${plugin.jar} ... "/>
    35         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" encoding="UTF-8">
    36             <compilerarg value="-Xlint:deprecation"/>
    37             <compilerarg value="-Xlint:unchecked"/>
    38             <classpath>
    39                 <pathelement location="${josm}"/>
    40                 <fileset dir="${plugin.lib.dir}">
    41                     <include name="**/*.jar"/>
    42                 </fileset>
    43             </classpath>
    44         </javac>
    45     </target>
     12    <property name="plugin.author" value="Christoph Wagner" />
     13    <property name="plugin.class" value="org.openstreetmap.josm.plugins.trustosm.TrustOSMplugin" />
     14    <property name="plugin.description" value="Plugin to digital sign OSM-Data" />
     15    <property name="plugin.icon" value="images/trustosm.png" />
     16    <property name="plugin.link" value=""/>
     17    <property name="plugin.requires" value="plastic_laf"/>
     18
     19    <property name="josm" location="../../core/dist/josm-custom.jar" />
     20    <property name="plugin.dist.dir" value="../../dist" />
     21
     22    <!-- ** include targets that all plugins have in common ** -->
     23    <import file="../build-common.xml" />
     24
     25    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
     26        <include name="plastic_laf.jar"/>
     27    </fileset>
    4628    <!-- create a property containing all .jar files, prefix lib/, and seperated with a space -->
    4729    <pathconvert property="libs.project" pathsep=" ">
    … …  
    6143        </path>
    6244    </pathconvert>
     45    <!-- additional entry in manifest -->
     46    <target name="additional-manifest">
     47        <manifest file="MANIFEST" mode="update">
     48            <attribute name="Class-Path" value="${libs.project}"/>
     49        </manifest>
     50    </target>
     51    <!--
     52    **********************************************************
     53    ** setup-dist - copies files for distribution
     54    **********************************************************
     55    -->
     56    <target name="setup-dist">
     57        <antcall target="setup-dist-default" />
     58        <copy todir="${plugin.build.dir}/lib">
     59            <fileset dir="${plugin.lib.dir}"/>
     60        </copy>
     61    </target>
    6362    <!--
    6463    **********************************************************
    … …  
    6867    <target name="dist" depends="compile,revision">
    6968        <echo message="creating ${ant.project.name}.jar ... "/>
    70         <copy todir="${plugin.build.dir}/lib">
    71             <fileset dir="${plugin.lib.dir}"/>
    72         </copy>
    73         <copy todir="${plugin.build.dir}/resources">
    74             <fileset dir="resources"/>
    75         </copy>
    76         <copy todir="${plugin.build.dir}/images">
    77             <fileset dir="images"/>
    78         </copy>
    79         <copy todir="${plugin.build.dir}/data">
    80             <fileset dir="data"/>
    81         </copy>
    82         <copy todir="${plugin.build.dir}">
    83             <fileset dir=".">
    84                 <include name="README"/>
    85                 <include name="LICENSE"/>
    86             </fileset>
    87         </copy>
    88         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    89             <!--
    90         ************************************************
    91         ** configure these properties. Most of them will be copied to the plugins
    92         ** manifest file. Property values will also show up in the list available
    93         ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
    94         **
    95         ************************************************
    96     -->
    97             <manifest>
    98                 <attribute name="Author" value="Christoph Wagner"/>
    99                 <attribute name="Class-Path" value="${libs.project}"/>
    100                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.trustosm.TrustOSMplugin"/>
    101                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    102                 <attribute name="Plugin-Description" value="Plugin to digital sign OSM-Data"/>
    103                 <attribute name="Plugin-Icon" value="images/trustosm.png"/>
    104                 <!--<attribute name="Plugin-Link" value="..."/>-->
    105                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    106                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    107             </manifest>
    108         </jar>
    109     </target>
    110     <!--
    111     **********************************************************
    112     ** revision - extracts the current revision number for the
    113     **    file build.number and stores it in the XML property
    114     **    version.*
    115     **********************************************************
    116     -->
    117     <target name="revision">
    118         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    119             <env key="LANG" value="C"/>
    120             <arg value="info"/>
    121             <arg value="--xml"/>
    122             <arg value="."/>
    123         </exec>
    124         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    125         <delete file="REVISION"/>
    126     </target>
    127     <!--
    128     **********************************************************
    129     ** clean - clean up the build environment
    130     **********************************************************
    131     -->
    132     <target name="clean">
    133         <delete dir="${plugin.build.dir}"/>
    134         <delete file="${plugin.jar}"/>
    135     </target>
    136     <!--
    137     **********************************************************
    138     ** install - install the plugin in your local JOSM installation
    139     **********************************************************
    140     -->
    141     <target name="install" depends="dist">
    142         <property environment="env"/>
    143         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    144             <and>
    145                 <os family="windows"/>
    146             </and>
    147         </condition>
    148         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    149     </target>
    150     <!--
    151     ************************** Publishing the plugin ***********************************
    152     -->
    153     <!--
    154         ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    155         ** property ${coreversion.info.entry.revision}
    156         **
    157         -->
    158     <target name="core-info">
    159         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    160             <env key="LANG" value="C"/>
    161             <arg value="info"/>
    162             <arg value="--xml"/>
    163             <arg value="../../core"/>
    164         </exec>
    165         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    166         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    167         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    168         <delete file="core.info.xml"/>
    169     </target>
    170     <!--
    171         ** commits the source tree for this plugin
    172         -->
    173     <target name="commit-current">
    174         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    175         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    176             <env key="LANG" value="C"/>
    177             <arg value="commit"/>
    178             <arg value="-m '${commit.message}'"/>
    179             <arg value="."/>
    180         </exec>
    181     </target>
    182     <!--
    183         ** updates (svn up) the source tree for this plugin
    184         -->
    185     <target name="update-current">
    186         <echo>Updating plugin source ...</echo>
    187         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    188             <env key="LANG" value="C"/>
    189             <arg value="up"/>
    190             <arg value="."/>
    191         </exec>
    192         <echo>Updating ${plugin.jar} ...</echo>
    193         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    194             <env key="LANG" value="C"/>
    195             <arg value="up"/>
    196             <arg value="../dist/${plugin.jar}"/>
    197         </exec>
    198     </target>
    199     <!--
    200         ** commits the plugin.jar
    201         -->
    202     <target name="commit-dist">
    203         <echo>
    204     ***** Properties of published ${plugin.jar} *****
    205     Commit message    : '${commit.message}'                   
    206     Plugin-Mainversion: ${plugin.main.version}
    207     JOSM build version: ${coreversion.info.entry.revision}
    208     Plugin-Version    : ${version.entry.commit.revision}
    209     ***** / Properties of published ${plugin.jar} *****                   
    210                        
    211     Now commiting ${plugin.jar} ...
    212     </echo>
    213         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    214             <env key="LANG" value="C"/>
    215             <arg value="-m '${commit.message}'"/>
    216             <arg value="commit"/>
    217             <arg value="${plugin.jar}"/>
    218         </exec>
    219     </target>
    220     <!-- ** make sure svn is present as a command line tool ** -->
    221     <target name="ensure-svn-present">
    222         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    223             <env key="LANG" value="C"/>
    224             <arg value="--version"/>
    225         </exec>
    226         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    227             <!-- return code not set at all? Most likely svn isn't installed -->
    228             <condition>
    229                 <not>
    230                     <isset property="svn.exit.code"/>
    231                 </not>
    232             </condition>
    233         </fail>
    234         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    235             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    236             <condition>
    237                 <isfailure code="${svn.exit.code}"/>
    238             </condition>
    239         </fail>
    240     </target>
    241     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
     69        <antcall target="setup-dist" />
     70        <delete file="MANIFEST" failonerror="no"/>
     71        <manifest file="MANIFEST" mode="update">
     72            <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
     73            <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
     74            <attribute name="Plugin-Class" value="${plugin.class}" />
     75            <attribute name="Plugin-Description" value="${plugin.description}" />
     76            <attribute name="Plugin-Date" value="${version.entry.commit.date}" />
     77            <attribute name="Author" value="${plugin.author}"/>
     78        </manifest>
     79        <antcall target="add-manifest-attribute">
     80            <param name="manifest.attribute" value="Plugin-Link"/>
     81            <param name="property.name" value="plugin.link"/>
     82            <param name="property.value" value="${plugin.link}"/>
     83        </antcall>
     84        <antcall target="add-manifest-attribute">
     85            <param name="manifest.attribute" value="Plugin-Icon"/>
     86            <param name="property.name" value="plugin.icon"/>
     87            <param name="property.value" value="${plugin.icon}"/>
     88        </antcall>
     89        <antcall target="add-manifest-attribute">
     90            <param name="manifest.attribute" value="Plugin-Early"/>
     91            <param name="property.name" value="plugin.early"/>
     92            <param name="property.value" value="${plugin.early}"/>
     93        </antcall>
     94        <antcall target="add-manifest-attribute">
     95            <param name="manifest.attribute" value="Plugin-Requires"/>
     96            <param name="property.name" value="plugin.requires"/>
     97            <param name="property.value" value="${plugin.requires}"/>
     98        </antcall>
     99        <antcall target="add-manifest-attribute">
     100            <param name="manifest.attribute" value="Plugin-Stage"/>
     101            <param name="property.name" value="plugin.stage"/>
     102            <param name="property.value" value="${plugin.stage}"/>
     103        </antcall>
     104        <antcall target="additional-manifest" />
     105        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifest="MANIFEST"/>
     106        <delete file="MANIFEST" failonerror="no"/>
     107        <antcall target="post-dist" />
    242108    </target>
    243109</project>
Note: See TracChangeset for help on using the changeset viewer.