Changeset 10336 in osm for applications/editors/josm/plugins/surveyor/build.xml

Timestamp:

2008-08-30T17:25:23+02:00 (17 years ago)

Author:

stoecker

Message:

some updates

File:

• applications/editors/josm/plugins/surveyor/build.xml (modified) (3 diffs)

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

@@ -19 +19 @@
 
   <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/>
-  
-  <!-- plugin meta data (enter new version number if anything changed!) -->
-  <property name="plugin.version" value="1.4"/>
-  <property name="plugin.description" value="Allow adding markers/nodes on current gps positions (V${plugin.version})."/>
+
+  <property name="plugin.description" value="Allow adding markers/nodes on current gps positions."/>
   <property name="plugin.stage" value="60"/>
   <property name="plugin.class" value="at.dallermassl.josm.plugin.surveyor.SurveyorPlugin"/>
-  
-  <!-- update site meta data -->
-  <property name="plugin.site.file" value="josm-site.xml"/>
-  <property name="plugin.site.description" value="Josm's Surveyor Update Site"/>
-  <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/surveyor/"/>
-  <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/surveyor/"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
-  
-  
-  <target name="dist" depends="compile,site">
+
+
+  <target name="dist" depends="compile">
+    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+      <env key="LANG" value="C"/>
+      <arg value="info"/>
+      <arg value="--xml"/>
+      <arg value="."/>
+    </exec>
+    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+    <delete file="REVISION"/>
+
     <!-- images -->
     <copy todir="${plugin.build.dir}/">
@@ -49 +50 @@
         <attribute name="Plugin-Class" value="${plugin.class}" />
         <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Version" value="${plugin.version}" />
-        <!--attribute name="Plugin-Dependencies" value="org.eigenheimstrasse.josm" /-->
         <attribute name="Plugin-Stage" value="${plugin.stage}" />
+        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
       </manifest>
     </jar>
@@ -83 +84 @@
   <target name="clean">
     <delete dir="${plugin.build.dir}" />
-    <delete dir="${plugin.site.file}" />
     <delete file="${plugin.jar}" />
   </target>
-
-  <!-- write site description for the given plugin so josm will accept it -->
-  <target name="site">
-    <echo message="creating site description in ${plugin.site.file}"/>
-    <echo file="${plugin.site.file}">&lt;!-- plugins available on this site -->
-  &lt;plugins>
-  &lt;plugin id="${ant.project.name}" version="${plugin.version}">
-  &lt;name>${ant.project.name}&lt;/name>
-  &lt;description>${plugin.description}&lt;/description>
-  &lt;resource>${plugin.site.url}${plugin.jar}&lt;/resource>
-  &lt;/plugin>
-  &lt;/plugins>
-</echo>
-</target>
-
-<!-- write site description for the given plugin (not implemented in JOSM as full version yet!) -->
-<target name="site-full-donotuse">
-  <echo message="creating site description in ${plugin.site.file}"/>
-  <echo file="${plugin.site.file}">&lt;?xml version="1.0"?>
-    &lt;site version="1.0">
-    &lt;!-- meta data of site -->
-&lt;site-info>
-&lt;site-name>${plugin.site.description}&lt;/site-name>
-&lt;site-url>${plugin.site.url}&lt;/site-url>
-&lt;/site-info>
-
-&lt;!-- plugins available on this site -->
-&lt;plugins>
-&lt;plugin id="${ant.project.name}" version="${plugin.version}">
-&lt;name>${ant.project.name}&lt;/name>
-&lt;description>${plugin.description}&lt;/description>
-&lt;resources>
-&lt;resource src="${plugin.site.url}${plugin.jar}"
-target="${josm.home.dir}/plugins/${plugin.jar}"/>
-&lt;/resources>
-&lt;/plugin>
-&lt;/plugins>
-&lt;/site>
-</echo>
-</target>
-
-
-<!-- upload the site description and the jar file via ssh -->
-<target name="upload" depends="dist,site">
-  <echo message="uploading jar and site description to ${plugin.site.upload.target}"/>
-  <exec executable="scp">
-    <arg value="${plugin.jar}"/>
-    <arg value="${plugin.site.file}"/>
-    <arg value="${plugin.site.upload.target}"/>
-  </exec>
-</target>
-
 </project>