Changeset 27377 in osm for applications/editors

Timestamp:

2012-01-01T15:34:54+01:00 (13 years ago)

Author:

malcolmh

Message:

'New release'

File:

• applications/editors/josm/plugins/smed/build.xml (modified) (8 diffs)

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

@@ -28 +28 @@
 **
 -->
-<project name="smed" basedir=".">
+<project name="SeaMapEditor" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="some new internationalized messages"/>
+    <property name="commit.message" value="New release"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="4549"/>
-    <!--
-      ************************************************
-      ** should not be necessary to change the following properties
-     -->
+    <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
-    <property name="plugin.build.dir" value="build/"/>
-    <property name="plugin.src.dir" value="src/"/>
-    <property name="smed.dist.dir" value="dist/"/>
+    <property name="plugin.build.dir" value="build"/>
+    <property name="plugin.src.dir" value="src"/>
     <!-- this is the directory where the plugin jar is copied to -->
-    <property name="plugin.dist.dir" value="../../dist/"/>
-    <property name="smed_core.dist.dir" value="core/dist/"/>
+    <property name="plugin.dist.dir" value="../../dist"/>
     <property name="ant.build.javac.target" value="1.5"/>
-    <property name="plugin.jar" value="${plugin.dist.dir}${ant.project.name}.jar"/>
+    <property name="plugin.dist.dir" value="../../dist"/>
+    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <!--
     **********************************************************
@@ -73 +69 @@
     **********************************************************
     -->
-    <target name="dist" depends="compile, revision">
+    <target name="dist" depends="compile,revision">
         <echo message="creating ${ant.project.name}.jar ... "/>
         <copy todir="${plugin.build.dir}/images">
@@ -94 +90 @@
         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
             <!--
-        ************************************************
-        ** configure these properties. Most of them will be copied to the plugins
-        ** manifest file. Property values will also show up in the list available
-        ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
-        **
-        ************************************************
-    -->
+            ************************************************
+            ** configure these properties. Most of them will be copied to the plugins
+            ** manifest file. Property values will also show up in the list available
+            ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
+            **
+            ************************************************
+            -->
             <manifest>
                 <attribute name="Author" value="Werner, Malcolm"/>
@@ -107 +103 @@
                 <attribute name="Plugin-Description" value="Create and edit seamaps for OpenSeaMap"/>
                 <attribute name="Plugin-Icon" value="images/Smed.png"/>
-                <attribute name="Plugin-Link" value="http://openseamap.org/"/>
+                <attribute name="Plugin-Link" value="http://openseamap.org"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <!--
-                <attribute name="Plugin-Version" value="23456"/>
-                -->
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
         </jar>
-        <!-- install interface -->
-        <copy file="${plugin.jar}" todir="${smed_core.dist.dir}"/>
     </target>
     <!--
@@ -133 +124 @@
         </exec>
         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-        <!--
         <delete file="REVISION"/>
-        -->
     </target>
     <!--
@@ -158 +147 @@
             </and>
         </condition>
-        <delete dir="${josm.plugins.dir}/splug"/>
         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
     <!--
-        ** commits the source tree for this plugin
-        -->
+    ************************** Publishing the plugin *********************************** 
+    -->
+    <!--
+    ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+    ** property ${coreversion.info.entry.revision}
+    -->
+    <target name="core-info">
+        <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="info"/>
+            <arg value="--xml"/>
+            <arg value="../../core"/>
+        </exec>
+        <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+        <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
+        <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+        <delete file="core.info.xml"/>
+    </target>
+    <!-- commits the source tree for this plugin -->
     <target name="commit-current">
         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
@@ -173 +178 @@
         </exec>
     </target>
-    <!--
-        ** updates (svn up) the source tree for this plugin
-        -->
+    <!-- updates (svn up) the source tree for this plugin -->
     <target name="update-current">
         <echo>Updating plugin source ...</echo>
@@ -190 +193 @@
         </exec>
     </target>
+    <!-- commits the plugin.jar -->
+    <target name="commit-dist">
+        <echo>
+    ***** Properties of published ${plugin.jar} *****
+    Commit message    : '${commit.message}'                    
+    Plugin-Mainversion: ${plugin.main.version}
+    JOSM build version: ${coreversion.info.entry.revision}
+    Plugin-Version    : ${version.entry.commit.revision}
+    ***** / Properties of published ${plugin.jar} *****                    
+                        
+    Now commiting ${plugin.jar} ...
+    </echo>
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+            <env key="LANG" value="C"/>
+            <arg value="-m '${commit.message}'"/>
+            <arg value="commit"/>
+            <arg value="${plugin.jar}"/>
+        </exec>
+    </target>
+    <!-- make sure svn is present as a command line tool -->
+    <target name="ensure-svn-present">
+        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
+            <env key="LANG" value="C"/>
+            <arg value="--version"/>
+        </exec>
+        <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+            <!-- return code not set at all? Most likely svn isn't installed -->
+            <condition>
+                <not>
+                    <isset property="svn.exit.code"/>
+                </not>
+            </condition>
+        </fail>
+        <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+            <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
+            <condition>
+                <isfailure code="${svn.exit.code}"/>
+            </condition>
+        </fail>
+    </target>
+    <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
+    </target>
 </project>