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

Timestamp:

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

Author:

stoecker

Message:

cleanup build scripts and manifests

File:

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

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

@@ -1 +1 @@
 <project name="openstreetbugs" default="dist" basedir=".">
-<!-- the path to JOSM source code (project directory) -->
-    <property name="josm.base.dir" value="../../core" />
-    <property name="josm.dist.dir" value="../../dist" />
-<!--a osm file, which will be loaded, when running the test target -->
-    <property name="osmfile" value="/tmp/hoe.osm" />
-<!-- compilation properties -->
-    <property name="josm.build.dir" value="${josm.base.dir}/build" />
-    <property name="josm.home.dir" value="${user.home}/.josm" />
-    <property name="josm" location="${josm.base.dir}/dist/josm-custom.jar" />
-    <property name="lib.dir" value="lib" />
-    <property name="plugin.build.dir" value="build" />
-    <property name="plugin.name" value="${ant.project.name}" />
-    <property name="plugin.jar" value="${plugin.build.dir}/${plugin.name}.jar" />
-    <property name="ant.build.javac.target" value="1.5" />
+    <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="${plugin.build.dir}" />
+        <mkdir dir="${plugin.build.dir}"/>
     </target>
     <target name="compile" depends="init">
-        <echo message="creating ${plugin.jar}" />
-        <javac srcdir="src" classpath="${josm}" destdir="${plugin.build.dir}" debug="true">
-            <include name="**/*.java" />
+        <echo message="creating ${plugin.jar}"/>
+        <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="clean, compile">
-<!-- copy images to jar -->
+    <target name="dist" depends="compile,revision">
         <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images" />
+            <fileset dir="images"/>
         </copy>
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+            <manifest>
+                <attribute name="Author" value="Henrik Niehaus"/>
+                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.osb.OsbPlugin"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                <attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs"/>
+                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/OpenStreetBugs"/>
+                <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"/>
@@ -36 +40 @@
         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
         <delete file="REVISION"/>
-<!-- create the jar file -->
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-            <manifest>
-                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.osb.OsbPlugin" />
-                <attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs" />
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}" />
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}" />
-                <attribute name="Plugin-Mainversion" value="1180"/>
-                <attribute name="Author" value="Henrik Niehaus" />
-            </manifest>
-        </jar>
-        <copy todir="${josm.dist.dir}" file="${plugin.jar}" />
     </target>
-<!-- clean target -->
     <target name="clean">
-        <delete dir="build" />
+        <delete dir="${plugin.build.dir}"/>
+        <delete file="${plugin.jar}"/>
     </target>
     <target name="install" depends="dist">
-        <condition property="isWindows">
-            <os family="windows" />
+        <property environment="env"/>
+        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+            <and>
+                <os family="windows"/>
+            </and>
         </condition>
-        <condition property="isUnix">
-            <os family="unix" />
-        </condition>
-        <antcall target="install_win" />
-        <antcall target="install_linux" />
-    </target>
-    <target name="install_win" if="isWindows">
-        <property environment="env"/>
-        <copy file="${plugin.jar}" todir="${env.APPDATA}/JOSM/plugins" />
-    </target>
-    <target name="install_linux" if="isUnix">
-        <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins" />
-    </target>
-    <target name="test" depends="install">
-        <java jar="${josm}" fork="true">
-            <arg value="${osmfile}" />
-            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7777" />
-        </java>
+        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
 </project>