Changeset 29013 in osm for applications/editors/josm/plugins/geotools

Timestamp:

2012-12-01T22:39:56+01:00 (12 years ago)

Author:

donvip

Message:

[josm_geotools] Simplify build.xml further

Location:

applications/editors/josm/plugins/geotools

Files:

• build.xml (modified) (2 diffs)
• jar (added)
• jar/META-INF (moved) (moved from applications/editors/josm/plugins/geotools/META-INF )

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

@@ -20 +20 @@
     <!--
     **********************************************************
-    ** setup-dist - copies files for distribution
-    **********************************************************
-    -->
-    <target name="setup-dist">
-        <copy todir="${plugin.build.dir}/META-INF">
-            <fileset dir="META-INF"/>
-        </copy>
-        <antcall target="setup-dist-default" />
-    </target>
-        
-    <!--
-    **********************************************************
-    ** post-dist - removes files from the generated jar
+    ** post-dist - replaces files from the generated jar
     **********************************************************
     -->
@@ -38 +26 @@
         <move file="${plugin.jar}" todir="${plugin.build.dir}" />
         <jar destfile="${plugin.jar}">
+            <fileset dir="jar"/>
                 <zipfileset src="${plugin.build.dir}/${ant.project.name}.jar">
                 <exclude name="*.class"/>
                         <exclude name="*.html"/>
-                <exclude name="META-INF/*.txt"/>
-                <exclude name="META-INF/*.xml"/>
-                <exclude name="META-INF/maven/**/*" />
+                <exclude name="META-INF/**/*"/>
                 <exclude name="javax/*.txt"/>
                 </zipfileset>
+            <zipfileset src="${plugin.build.dir}/${ant.project.name}.jar" includes="META-INF/*.jai" />
         </jar>
         <delete file="${plugin.build.dir}/${ant.project.name}.jar" />