[josm-plugins] 01/05: Imported Upstream version 0.0.svn30932+ds1

Bas Couwenberg sebastic at xs4all.nl
Sun Feb 1 17:51:57 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm-plugins.

commit 5ab050235578baa9ec2b0170880f1b487273d699
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 1 18:39:20 2015 +0100

    Imported Upstream version 0.0.svn30932+ds1
---
 build-common.xml | 15 +++++++++++++--
 svn-info.xml     | 10 +++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/build-common.xml b/build-common.xml
index 8a1ad80..a9681ca 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -14,7 +14,7 @@
 
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     <property name="josm.test.build.dir"    location="../../core/test/build"/>
-    <property name="groovy.jar"             location="../00_core_tools/groovy-all-2.3.9.jar"/>
+    <property name="groovy.jar"             location="../00_core_tools/groovy-all-2.4.0.jar"/>
     <property name="plugin.build.dir"       location="build"/>
     <property name="plugin.test.dir"        location="test"/>
     <property name="plugin.src.dir"         location="src"/>
@@ -266,11 +266,22 @@
     -->
     <target name="install" depends="dist">
         <property environment="env"/>
-        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
+        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins">
             <and>
                 <os family="windows"/>
             </and>
         </condition>
+        <condition property="josm.plugins.dir" value="${user.home}/Library/JOSM/plugins">
+            <and>
+                <os family="mac"/>
+            </and>
+        </condition>
+        <condition property="josm.plugins.dir" value="${user.home}/.josm/plugins">
+            <and>
+                <not><os family="windows"/></not>
+                <not><os family="mac"/></not>
+            </and>
+        </condition>
         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
     <!--
diff --git a/svn-info.xml b/svn-info.xml
index 15769b8..ff3f8e6 100644
--- a/svn-info.xml
+++ b/svn-info.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <info>
 <entry
+   kind="dir"
    path="plugins"
-   revision="30893"
-   kind="dir">
+   revision="30932">
 <url>http://svn.openstreetmap.org/applications/editors/josm/plugins</url>
 <repository>
 <root>http://svn.openstreetmap.org</root>
 <uuid>b9d5c4c9-76e1-0310-9c85-f3177eceb1e4</uuid>
 </repository>
 <commit
-   revision="30892">
-<author>donvip</author>
-<date>2014-12-31T13:39:42.235220Z</date>
+   revision="30932">
+<author>malcolmh</author>
+<date>2015-02-01T12:06:30.876428Z</date>
 </commit>
 </entry>
 </info>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git



More information about the Pkg-grass-devel mailing list