Changeset 29007 in osm


Ignore:
Timestamp:
2012-11-27T22:37:57+01:00 (12 years ago)
Author:
donvip
Message:

[josm_geotools] Fix build.xml

Location:
applications/editors/josm/plugins
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r29006 r29007  
    7373    </target>
    7474    <target name="setup-dist">
    75         <antcall target="setup-dist-default" />
     75        <antcall target="setup-dist-default" />
    7676    </target>
    7777    <!--
    … …  
    8282    <target name="dist" depends="compile,revision">
    8383        <echo message="creating ${ant.project.name}.jar ... "/>
    84         <antcall target="setup-dist" />
     84        <antcall target="setup-dist" />
    8585        <delete file="MANIFEST" failonerror="no"/>
    8686        <manifest file="MANIFEST" mode="update">
    … …  
    121121        </jar>
    122122        <delete file="MANIFEST" failonerror="no"/>
     123        <antcall target="post-dist" />
     124    </target>
     125    <target name="post-dist">
     126        <!-- to be overidden by plugins that need to perform additional tasks on resulting jar -->
    123127    </target>
    124128    <target name="add-manifest-attribute" depends="check-manifest-attribute" if="have-${propery.name}">

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

    r29005 r29007  
    2424    -->
    2525    <target name="setup-dist">
    26         <unjar dest="${plugin.build.dir}">
    27             <fileset dir="lib" includes="*.jar" />
    28         </unjar>
    29         <delete includeemptydirs="true">
    30                 <fileset dir="${plugin.build.dir}" >
    31                         <include name="*.class" />
    32                 <include name="*.html" />
    33                 </fileset>
    34             <fileset dir="${plugin.build.dir}/META-INF" includes="**/*" excludes="**/*.jai" />
    35         </delete>
    3626        <copy todir="${plugin.build.dir}/META-INF">
    37             <fileset dir="resources/META-INF"/>
     27            <fileset dir="META-INF"/>
    3828        </copy>
    3929        <antcall target="setup-dist-default" />
    4030    </target>
     31       
     32    <!--
     33    **********************************************************
     34    ** post-dist - removes files from the generated jar
     35    **********************************************************
     36    -->
     37    <target name="post-dist">
     38        <move file="${plugin.jar}" todir="${plugin.build.dir}" />
     39        <jar destfile="${plugin.jar}">
     40                <zipfileset src="${plugin.build.dir}/${ant.project.name}.jar">
     41                <exclude name="*.class"/>
     42                        <exclude name="*.html"/>
     43                <exclude name="META-INF/*.txt"/>
     44                <exclude name="META-INF/*.xml"/>
     45                <exclude name="META-INF/maven/**/*" />
     46                <exclude name="javax/*.txt"/>
     47                </zipfileset>
     48        </jar>
     49        <delete file="${plugin.build.dir}/${ant.project.name}.jar" />
     50    </target>
    4151</project>
Note: See TracChangeset for help on using the changeset viewer.