Changeset 13585 in osm for applications

Timestamp:

2009-02-08T11:39:04+01:00 (15 years ago)

Author:

stoecker

Message:

some cleanup

Location:

applications/editors/josm/plugins

Files:

• build.xml (modified) (6 diffs)
• cadastre-fr (modified) (1 prop)
• tagging-preset-tester/build.xml (modified) (3 diffs)
• terracer (modified) (1 prop)

applications/editors/josm/plugins/build.xml

@@ -8 +8 @@
         <mkdir dir="../dist"/>
         <ant antfile="build.xml" target="dist" dir="agpifoj"/>
+        <ant antfile="build.xml" target="dist" dir="cadastre-fr"/>
         <ant antfile="build.xml" target="dist" dir="colorscheme"/>
         <ant antfile="build.xml" target="dist" dir="DirectUpload"/>
@@ -16 +17 @@
         <ant antfile="build.xml" target="dist" dir="measurement"/>
         <ant antfile="build.xml" target="dist" dir="nearclick"/>
+        <ant antfile="build.xml" target="dist" dir="openlayers"/>
         <ant antfile="build.xml" target="dist" dir="openstreetbugs"/>
         <ant antfile="build.xml" target="dist" dir="openvisible"/>
@@ -26 +28 @@
         <ant antfile="build.xml" target="dist" dir="tagging-preset-tester"/>
         <ant antfile="build.xml" target="dist" dir="tcxplugin"/>
+        <ant antfile="build.xml" target="dist" dir="terracer"/>
         <ant antfile="build.xml" target="dist" dir="usertools"/>
         <ant antfile="build.xml" target="dist" dir="utilsplugin"/>
@@ -39 +42 @@
     <target name="clean">
         <ant antfile="build.xml" target="clean" dir="agpifoj"/>
+        <ant antfile="build.xml" target="clean" dir="cadastre-fr"/>
         <ant antfile="build.xml" target="clean" dir="colorscheme"/>
         <ant antfile="build.xml" target="clean" dir="duplicateway"/>
@@ -49 +53 @@
         <ant antfile="build.xml" target="clean" dir="navigator"/>
         <ant antfile="build.xml" target="clean" dir="nearclick"/>
+        <ant antfile="build.xml" target="clean" dir="openlayers"/>
         <ant antfile="build.xml" target="clean" dir="openstreetbugs"/>
         <ant antfile="build.xml" target="clean" dir="openvisible"/>
@@ -60 +65 @@
         <ant antfile="build.xml" target="clean" dir="tagging-preset-tester"/>
         <ant antfile="build.xml" target="clean" dir="tcxplugin"/>
+        <ant antfile="build.xml" target="clean" dir="terracer"/>
         <ant antfile="build.xml" target="clean" dir="usertools"/>
         <ant antfile="build.xml" target="clean" dir="utilsplugin"/>

applications/editors/josm/plugins/cadastre-fr

@@ -1 +1 @@
 build.log
 build.err
+build

@@ -1 +1 @@
 build.log
 build.err
+build

applications/editors/josm/plugins/tagging-preset-tester/build.xml

@@ -1 +1 @@
 <project name="tagging-preset-tester" 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"/>
+    <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}"/>
+    </target>
     <target name="compile">
         <echo message="creating ${plugin.jar}"/>
-        <mkdir dir="build"/>
-        <javac srcdir="src" destdir="build" classpath="../../core/dist/josm-custom.jar">
+        <javac srcdir="src" destdir="${plugin.build.dir}" classpath="${josm}">
             <compilerarg value="-Xlint:deprecation"/>
         </javac>
     </target>
     <target name="dist" depends="compile">
+        <copy todir="${plugin.build.dir}/images" >
+            <fileset dir="images" />
+        </copy>
         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
             <env key="LANG" value="C"/>
@@ -25 +26 @@
         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
         <delete file="REVISION"/>
-        <jar destfile="${plugin.jar}" basedir="build">
+        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
             <manifest>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
@@ -32 +33 @@
                 <attribute name="Main-Class" value="org.openstreetmap.josm.plugins.taggingpresettester.TaggingPresetTester" />
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.taggingpresettester.TaggingPresetTesterAction" />
-                <attribute name="Plugin-Mainversion" value="1180" />
+                <attribute name="Plugin-Mainversion" value="1364" />
             </manifest>
-            <fileset dir=".">
-                <include name="images/*"/>
-            </fileset>
         </jar>
     </target>

@@ -1 +1 @@
 build.log
 build.err
+build