Ignore:
Timestamp:
2012-11-18T22:21:44+01:00 (13 years ago)
Author:
donvip
Message:

[josm_importimage] Major refactoring/update of COTS in order to rely on GeoTools plugin

Location:
applications/editors/josm/plugins/ImportImagePlugin
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/ImportImagePlugin

    • Property svn:ignore

      •  

        old new  
        11build
         2bin

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

    r27354 r28954  
    4545        <!-- this is the directory where the plugin jar is copied to -->
    4646        <property name="plugin.dist.dir"        value="../../dist"/>
    47         <property name="ant.build.javac.target" value="1.5"/>
     47        <property name="ant.build.javac.target" value="1.6"/>
    4848        <property name="plugin.dist.dir"        value="../../dist"/>
    4949        <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    … …  
    6565        <target name="compile" depends="init">
    6666                <echo message="compiling sources for  ${plugin.jar} ... "/>
    67                 <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
     67                <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
    6868            <classpath>
    6969                <pathelement location="${josm}"/>
    7070                <fileset dir="lib">
     71                    <include name="**/*.jar"/>
     72                </fileset>
     73                <fileset dir="../jts/lib">
     74                    <include name="**/*.jar"/>
     75                </fileset>
     76                <fileset dir="../geotools/lib">
    7177                    <include name="**/*.jar"/>
    7278                </fileset>
    … …  
    8591                <echo message="creating ${ant.project.name}.jar ... "/>
    8692               
    87                 <copy todir="${plugin.build.dir}/lib">
    88                         <fileset dir="lib">
    89                                   <not>
    90                                     <filename name="log4j-1.2.12.jar"/>
    91                                   </not>
    92                         </fileset>
    93                 </copy>
    94         <unjar src="lib/log4j-1.2.12.jar" dest="${plugin.build.dir}"/>
     93        <unjar src="lib/log4j-1.2.17.jar" dest="${plugin.build.dir}"/>
    9594                <copy todir="${plugin.build.dir}/images">
    9695                        <fileset dir="images"/>
    … …  
    124123                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/ImportImagePlugin"/>
    125124                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
     125                <attribute name="Plugin-Requires" value="geotools"/>
    126126                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    127127                        </manifest>
    … …  
    273273        </target>
    274274       
    275         <target name="unjar-test" >
    276         <!--unjar dest="C:/Workspace_2/geotoolstest/lib/unjartest">
    277             <fileset dir="lib"/>
    278         </unjar-->
    279        
    280                         <jar destfile="C:/Workspace_2/geotoolstest/lib/unjartest/${ant.project.name}.jar" basedir="C:/Workspace_2/geotoolstest/lib/unjartest">
    281 
    282                         <manifest>
    283                 <attribute name="Author" value="Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny"/>
    284                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.CoveragePlugin.CoveragePlugin"/>
    285                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    286                 <attribute name="Plugin-Description" value="Plugin for importing spatial referenced images"/>
    287                 <attribute name="Plugin-Link" value="..."/>
    288                 <attribute name="Plugin-Mainversion" value=".."/>
    289                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    290                 <attribute name="Class-path" value=" . CoveragePlugin/lib/commons-beanutils-1.7.0.jar CoveragePlugin/lib/commons-pool-1.5.3.jar CoveragePlugin/lib/geoapi-2.3-M1.jar CoveragePlugin/lib/geoapi-pending-2.3-M1.jar CoveragePlugin/lib/geoapi.jar CoveragePlugin/lib/gt-api-2.6.0.jar CoveragePlugin/lib/gt-coverage-2.6.0.jar CoveragePlugin/lib/gt-epsg-extension-2.6.0.jar CoveragePlugin/lib/gt-epsg-hsql-2.6.0.jar CoveragePlugin/lib/gt-geotiff-2.6.0.jar CoveragePlugin/lib/gt-main-2.6.0.jar CoveragePlugin/lib/gt-metadata-2.6.0.jar CoveragePlugin/lib/gt-referencing-2.6.0.jar CoveragePlugin/lib/hsqldb-1.8.0.7.jar CoveragePlugin/lib/imageio-ext-tiff-1.0.4.jar CoveragePlugin/lib/imageio-ext-utilities-1.0.4.jar CoveragePlugin/lib/jai_codec-1.1.3.jar CoveragePlugin/lib/jai_core.jar CoveragePlugin/lib/jai_imageio-1.1.jar CoveragePlugin/lib/jdom-1.0.jar CoveragePlugin/lib/jsr-275-1.0-beta-2.jar CoveragePlugin/lib/jts-1.10.jar CoveragePlugin/lib/log4j-1.2.12.jar CoveragePlugin/lib/vecmath-1.3.2.jar" />
    291                         </manifest>
    292                 </jar>
    293         </target>
    294        
    295275</project>
Note: See TracChangeset for help on using the changeset viewer.