Changeset 19056 in osm for applications/editors/josm/plugins/livegps
- Timestamp:
- 2009-12-12T18:13:43+01:00 (15 years ago)
- Location:
- applications/editors/josm/plugins/livegps
- Files:
-
- 2 edited
-
build.xml (modified) (1 diff)
-
src/livegps/LiveGpsPlugin.java (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/livegps/build.xml
r18597 r19056 1 <?xml version="1.0" encoding="UTF-8"?> 2 <!-- 3 ** This is the build file for the livegps 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 --> 1 27 <project name="livegps" default="dist" basedir="."> 2 <property name="josm" location="../../core/dist/josm-custom.jar"/> 3 <property name="plugin.dist.dir" value="../../dist"/> 4 <property name="plugin.build.dir" value="build"/> 5 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 6 <property name="ant.build.javac.target" value="1.5"/> 7 <target name="init"> 8 <mkdir dir="${plugin.build.dir}"/> 9 </target> 10 <target name="compile" depends="init"> 11 <echo message="creating ${plugin.jar}"/> 12 <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}"> 13 <compilerarg value="-Xlint:deprecation"/> 14 <compilerarg value="-Xlint:unchecked"/> 15 </javac> 16 </target> 17 <target name="dist" depends="compile,revision"> 18 <copy todir="${plugin.build.dir}/images"> 19 <fileset dir="images"/> 20 </copy> 21 <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> 22 <manifest> 23 <attribute name="Author" value="Frederik Ramm"/> 24 <attribute name="Plugin-Class" value="livegps.LiveGpsPlugin"/> 25 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/> 26 <attribute name="Plugin-Description" value="Support live GPS input (moving dot) through a connection to gpsd server."/> 27 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/LiveGPS"/> 28 <attribute name="Plugin-Mainversion" value="2450"/> 29 <attribute name="Plugin-Stage" value="50"/> 30 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 31 </manifest> 32 </jar> 33 </target> 34 <target name="revision"> 35 <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> 36 <env key="LANG" value="C"/> 37 <arg value="info"/> 38 <arg value="--xml"/> 39 <arg value="."/> 40 </exec> 41 <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> 42 <delete file="REVISION"/> 43 </target> 44 <target name="clean"> 45 <delete dir="${plugin.build.dir}"/> 46 <delete file="${plugin.jar}"/> 47 </target> 48 <target name="install" depends="dist"> 49 <property environment="env"/> 50 <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins"> 51 <and> 52 <os family="windows"/> 53 </and> 54 </condition> 55 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 56 </target> 28 29 <property name="commit.message" value="Updated to JOSM 2621; updated build.xml" /> 30 <property name="plugin.main.version" value="2621" /> 31 32 33 <property name="josm" location="../../core/dist/josm-custom.jar"/> 34 <property name="plugin.dist.dir" value="../../dist"/> 35 <property name="plugin.build.dir" value="build"/> 36 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 37 <property name="ant.build.javac.target" value="1.5"/> 38 <target name="init"> 39 <mkdir dir="${plugin.build.dir}"/> 40 </target> 41 <target name="compile" depends="init"> 42 <echo message="creating ${plugin.jar}"/> 43 <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}"> 44 <compilerarg value="-Xlint:deprecation"/> 45 <compilerarg value="-Xlint:unchecked"/> 46 </javac> 47 </target> 48 <target name="dist" depends="compile,revision"> 49 <copy todir="${plugin.build.dir}/images"> 50 <fileset dir="images"/> 51 </copy> 52 <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> 53 <manifest> 54 <attribute name="Author" value="Frederik Ramm"/> 55 <attribute name="Plugin-Class" value="livegps.LiveGpsPlugin"/> 56 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/> 57 <attribute name="Plugin-Description" value="Support live GPS input (moving dot) through a connection to gpsd server."/> 58 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/LiveGPS"/> 59 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 60 <attribute name="Plugin-Stage" value="50"/> 61 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 62 </manifest> 63 </jar> 64 </target> 65 <target name="revision"> 66 <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> 67 <env key="LANG" value="C"/> 68 <arg value="info"/> 69 <arg value="--xml"/> 70 <arg value="."/> 71 </exec> 72 <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> 73 <delete file="REVISION"/> 74 </target> 75 <target name="clean"> 76 <delete dir="${plugin.build.dir}"/> 77 <delete file="${plugin.jar}"/> 78 </target> 79 <target name="install" depends="dist"> 80 <property environment="env"/> 81 <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins"> 82 <and> 83 <os family="windows"/> 84 </and> 85 </condition> 86 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 87 </target> 88 89 90 <!-- 91 ************************** Publishing the plugin *********************************** 92 --> 93 <!-- 94 ** extracts the JOSM release for the JOSM version in ../core and saves it in the 95 ** property ${coreversion.info.entry.revision} 96 ** 97 --> 98 <target name="core-info"> 99 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> 100 <env key="LANG" value="C"/> 101 <arg value="info"/> 102 <arg value="--xml"/> 103 <arg value="../../core"/> 104 </exec> 105 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/> 106 <echo>Building against core revision ${coreversion.info.entry.revision}.</echo> 107 <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo> 108 <delete file="core.info.xml" /> 109 </target> 110 111 <!-- 112 ** commits the source tree for this plugin 113 --> 114 <target name="commit-current"> 115 <echo>Commiting the plugin source with message '${commit.message}' ...</echo> 116 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 117 <env key="LANG" value="C"/> 118 <arg value="commit"/> 119 <arg value="-m '${commit.message}'"/> 120 <arg value="."/> 121 </exec> 122 </target> 123 124 <!-- 125 ** updates (svn up) the source tree for this plugin 126 --> 127 <target name="update-current"> 128 <echo>Updating plugin source ...</echo> 129 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 130 <env key="LANG" value="C"/> 131 <arg value="up"/> 132 <arg value="."/> 133 </exec> 134 <echo>Updating ${plugin.jar} ...</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="../dist/${plugin.jar}"/> 139 </exec> 140 </target> 141 142 <!-- 143 ** commits the plugin.jar 144 --> 145 <target name="commit-dist"> 146 <echo> 147 ***** Properties of published ${plugin.jar} ***** 148 Commit message : '${commit.message}' 149 Plugin-Mainversion: ${plugin.main.version} 150 JOSM build version: ${coreversion.info.entry.revision} 151 Plugin-Version : ${version.entry.commit.revision} 152 ***** / Properties of published ${plugin.jar} ***** 153 154 Now commiting ${plugin.jar} ... 155 </echo> 156 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 157 <env key="LANG" value="C"/> 158 <arg value="-m '${commit.message}'"/> 159 <arg value="commit"/> 160 <arg value="${plugin.jar}"/> 161 </exec> 162 </target> 163 164 <!-- ** make sure svn is present as a command line tool ** --> 165 <target name="ensure-svn-present"> 166 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code"> 167 <env key="LANG" value="C" /> 168 <arg value="--version" /> 169 </exec> 170 <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system."> 171 <!-- return code not set at all? Most likely svn isn't installed --> 172 <condition> 173 <not> 174 <isset property="svn.exit.code" /> 175 </not> 176 </condition> 177 </fail> 178 <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system."> 179 <!-- error code from SVN? Most likely svn is not what we are looking on this system --> 180 <condition> 181 <isfailure code="${svn.exit.code}" /> 182 </condition> 183 </fail> 184 </target> 185 186 <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist"> 187 </target> 57 188 </project> -
applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java
r19011 r19056 20 20 import org.openstreetmap.josm.gui.MainMenu; 21 21 import org.openstreetmap.josm.gui.MapFrame; 22 import org.openstreetmap.josm.gui.MapView; 23 import org.openstreetmap.josm.gui.MapView.LayerChangeListener; 22 24 import org.openstreetmap.josm.gui.layer.Layer; 23 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;24 25 import org.openstreetmap.josm.plugins.Plugin; 25 26 import org.openstreetmap.josm.tools.Shortcut; … … 109 110 lgpscapture.setSelected(false); 110 111 removePropertyChangeListener(lgpslayer); 111 Layer.listeners.remove(this);112 MapView.removeLayerChangeListener(this); 112 113 lgpslayer = null; 113 114 } … … 190 191 lgpslayer = new LiveGpsLayer(data); 191 192 Main.main.addLayer(lgpslayer); 192 Layer.listeners.add(this);193 MapView.addLayerChangeListener(this); 193 194 lgpslayer.setAutoCenter(isAutoCenter()); 194 195 }
Note:
See TracChangeset
for help on using the changeset viewer.
