Changeset 11569 in osm

Timestamp:

2008-10-31T10:25:47+01:00 (16 years ago)

Author:

stotz

Message:

Added install targets for windows and linux plus automatic os detection

Location:

applications/editors/josm/plugins/openstreetbugs

Files:

• build.xml (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java (modified) (1 diff)

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

@@ -1 +1 @@
 <project name="openstreetbugs" default="dist" basedir=".">
 
-        <property file="build.properties"/>
-        
+        <property file="build.properties" />
+
         <!-- compilation properties -->
         <property name="josm.build.dir" value="${josm.base.dir}/build" />
@@ -35 +35 @@
                         <fileset dir="images" />
                 </copy>
-                
+
                 <!-- copy language files -->
                 <copy todir="${plugin.build.dir}">
@@ -53 +53 @@
                         </manifest>
                 </jar>
-                
+
                 <copy todir="${josm.dist.dir}" file="${plugin.jar}" />
         </target>
@@ -63 +63 @@
 
         <target name="install" depends="dist">
+                <condition property="isWindows">
+                        <os family="windows" />
+                </condition>
+                <condition property="isUnix">
+                        <os family="unix" />
+                </condition>
+                <antcall target="install_win" />
+                <antcall target="install_linux" />
+        </target>
+
+        <target name="install_win" if="isWindows">
+                <property environment="env"/>
+                <copy file="${plugin.jar}" todir="${env.APPDATA}/JOSM/plugins" />
+        </target>
+
+        <target name="install_linux" if="isUnix">
                 <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins" />
         </target>
@@ -69 +85 @@
                 <java jar="${josm}" fork="true">
                         <arg value="${osmfile}" />
-                        <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7777"/>
+                        <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7777" />
                 </java>
         </target>

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java

@@ -71 +71 @@
         
         public OsbPlugin() {
+            super();
                 initConfig();
                 dataSet = new DataSet();
                 uploadHook = new OsbUploadHook();
                 dialog = new OsbDialog(this);
-                OsbLayer.listeners.add(dialog);
-                OsbLayer.listeners.add(this);
+        OsbLayer.listeners.add(dialog);
+        OsbLayer.listeners.add(this);
         }