Changeset 30896 in osm for applications/editors/josm/plugins/build-common.xml

Timestamp:

2015-01-03T15:59:06+01:00 (10 years ago)

Author:

donvip

Message:

fix #josm10910 - "ant install" no longer works on OS X and Windows

File:

• applications/editors/josm/plugins/build-common.xml (modified) (1 diff)

applications/editors/josm/plugins/build-common.xml

@@ -267 +267 @@
     <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.LOCALAPPDATA}/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>