Changeset 14003 in osm for applications/editors/josm/plugins/nearclick

Timestamp:

2009-03-08T12:02:49+01:00 (16 years ago)

Author:

stoecker

Message:

cleanup build scripts and manifests

File:

• applications/editors/josm/plugins/nearclick/build.xml (modified) (2 diffs)

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

@@ -1 +1 @@
 <project name="nearclick" default="dist" basedir=".">
-<!-- compilation properties -->
-    <property name="josm.build.dir"   value="../../core"/>
-    <property name="josm.home.dir"    value="${user.home}/.josm"/>
-    <property name="josm"         location="../../core/dist/josm-custom.jar" />
-    <property name="plugin.build.dir" value="build"/>
-    <property name="plugin.dist.dir"  value="../../dist"/>
-    <property name="plugin.name"      value="${ant.project.name}"/>
-    <property name="plugin.jar"       value="../../dist/${plugin.name}.jar"/>
-<!-- There's no josm.jar in the svn, so point "josm" to a local copy of your JOSM binary -->
-    <property name="josm" location="../../core/dist/josm-custom.jar" />
-<!-- target directory to place the plugin in -->
-<!-- Windows has a different home directory scheme then unix/linux -->
-<!-- I don't know an automatic way to find it with ant :-(, if you know, please fix -->
-<!--<property name="plugins" location="${user.home}/.josm/plugins" ></property>-->
-    <property name="plugins" location="${user.home}/Application Data/JOSM/plugins" ></property>
-<!-- you should not need to modify anything below this! -->
+    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
+    <property name="plugin.dist.dir"        value="../../dist"/>
+    <property name="plugin.build.dir"       value="build"/>
+    <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <property name="ant.build.javac.target" value="1.5"/>
     <target name="init">
-        <mkdir dir="build"></mkdir>
+        <mkdir dir="${plugin.build.dir}"/>
     </target>
     <target name="compile" depends="init">
         <echo message="creating ${plugin.jar}"/>
-        <javac srcdir="src" target="1.5" classpath="${josm}" destdir="build" debug="true">
-            <include name="**/*.java" />
+        <javac srcdir="src" classpath="${josm}" debug="false" destdir="${plugin.build.dir}">
+            <compilerarg value="-Xlint:deprecation"/>
+            <compilerarg value="-Xlint:unchecked"/>
         </javac>
     </target>
-    <target name="dist" depends="compile">
-<!-- define the version of the jar file -->
+    <target name="dist" depends="compile,revision">
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Author" value="Imi, David Earl"/>
+                <attribute name="Plugin-Class" value="nearclick.NearClickPlugin"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Description" value="Simulates a click when you do a small and short drag. This is usefull for tablet pens, when you have problems just clicking the tablet without the mouse moving (general Java - tablet problem)."/>
+                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Nearclick"/>
+                <attribute name="Plugin-Mainversion" value="1465"/>
+                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+            </manifest>
+        </jar>
+    </target>
+    <target name="revision">
         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
             <env key="LANG" value="C"/>
@@ -35 +36 @@
         </exec>
         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-<!-- delete intermediate file -->
         <delete file="REVISION"/>
-        <jar destfile="${plugin.jar}" basedir="build">
-            <manifest>
-                <attribute name="Plugin-Class" value="nearclick.NearClickPlugin" />
-                <attribute name="Plugin-Description" value="Simulates a click when you do a small and short drag. This is usefull for tablet pens, when you have problems just clicking the tablet without the mouse moving (general Java - tablet problem)." />
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Mainversion" value="1180" />
-            </manifest>
-        </jar>
     </target>
     <target name="clean">
-        <delete dir="${plugin.build.dir}" />
-        <delete file="${plugin.jar}" />
-    </target>
-    <target name="clean_install">
-        <delete file="${plugins}/nearclick.jar" />
+        <delete dir="${plugin.build.dir}"/>
+        <delete file="${plugin.jar}"/>
     </target>
     <target name="install" depends="dist">
-        <copy file="${plugin.jar}" todir="${plugins}"/>
+        <property environment="env"/>
+        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+            <and>
+                <os family="windows"/>
+            </and>
+        </condition>
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
 </project>