Changeset 23206 in osm for applications/editors/josm

Timestamp:

2010-09-16T00:58:49+02:00 (14 years ago)

Author:

postfix

Message:

changes in ant-file to keep the dependencies between smed and plugins

Location:

applications/editors/josm/plugins/smed_ex

Files:

• build.xml (modified) (5 diffs)
• src/smed_ex/SmedEx.java (modified) (2 diffs)

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

@@ -43 +43 @@
         <property name="smed"                                   location="../../dist/smed.jar/"/>
         <property name="plugin.build.dir"       value="build"/>
+        <property name="smed.build.dir"         value="../smed/build"/>
+        <property name="smed.src.dir"           value="../smed/src"/>
         <property name="plugin.src.dir"         value="src"/>
         <!-- this is the directory where the plugin jar is copied to -->
@@ -49 +51 @@
         <property name="plugin.dist.dir"        value="../../dist"/>
         <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+        <property name="smed.jar"               value="${plugin.dist.dir}/smed.jar"/>
+
 
         <!--
@@ -61 +65 @@
         <!--
     **********************************************************
-    ** compile - complies the source tree
-    **********************************************************
-    -->
-        <target name="compile" depends="init">
+    ** init_smed - initializes the build of smed
+    **********************************************************
+    -->
+        <target name="init_smed">
+                <mkdir dir="${smed.build.dir}"/>
+        </target>
+
+        <!--
+    **********************************************************
+    ** compile_smed - compiles the source tree of smed
+    **********************************************************
+    -->
+        <target name="compile_smed" depends="init_smed">
+                <echo message="compiling sources for  ${smed.jar} ... "/>
+                <javac srcdir="${smed.src.dir}" classpath="${josm}" debug="true" destdir="${smed.build.dir}">
+                        <compilerarg value="-Xlint:deprecation"/>
+                        <compilerarg value="-Xlint:unchecked"/>
+                </javac>
+        </target>
+        
+        <!--
+    **********************************************************
+    ** compile - compiles the source tree
+    **********************************************************
+    -->
+        <target name="compile" depends="init,dist_smed">
                 <echo message="compiling sources for  ${plugin.jar} ... "/>
                 <javac srcdir="src" classpath="${josm}:${smed}" debug="true" destdir="${plugin.build.dir}">
@@ -70 +96 @@
                         <compilerarg value="-Xlint:unchecked"/>
                 </javac>
+        </target>
+
+        <!--
+    **********************************************************
+    ** dist_smed - creates smed.jar
+    **********************************************************
+    -->
+        <target name="dist_smed" depends="compile_smed">
+                <echo message="creating smed.jar ... "/>
+
+                <copy todir="${smed.build.dir}/images">
+                        <fileset dir="${smed.src.dir}/images"/>
+                </copy>
+                
+                <copy todir="${smed.build.dir}/images">
+                        <fileset dir="../smed/images"/>
+                </copy>
+
+                <copy todir="${smed.build.dir}/smed/msg">
+                        <fileset dir="${smed.src.dir}/smed/msg"/>
+                </copy>
+
+                <copy todir="${smed.build.dir}">
+                        <fileset dir="../smed">
+                <include name="copyright.txt" />
+                <include name="LICENSE.txt" />
+                        </fileset>
+                </copy>
+
+                <jar destfile="${smed.jar}" basedir="${smed.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.
+        **
+        ************************************************
+    -->
+                        <manifest>
+                                <attribute name="Author" value="Werner, Malcolm"/>
+                                <attribute name="Plugin-Class" value="smed.Smed"/>
+                                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+                                <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-Mainversion" value="${plugin.main.version}"/>
+                                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                        </manifest>
+                </jar>
         </target>
 
@@ -127 +202 @@
                 <delete dir="${plugin.build.dir}"/>
                 <delete file="${plugin.jar}"/>
+                <delete dir="${smed.build.dir}"/>
+                <delete file="${smed.jar}"/>
         </target>
 

applications/editors/josm/plugins/smed_ex/src/smed_ex/SmedEx.java

@@ -18 +18 @@
         private JPanel jPanel = null;  //  @jve:decl-index=0:visual-constraint="78,30"
         private JButton jButton = null;
-        @Override
-        public boolean start() {
-                // TODO Auto-generated method stub
-                return false;
-        }
 
         @Override
@@ -92 +87 @@
         }
 
+        @Override
+        public boolean start() {
+                // TODO Auto-generated method stub
+                return false;
+        }
+
 }