Changeset 7367 in josm for trunk/build.xml


Ignore:
Timestamp:
2014-08-05T04:33:39+02:00 (9 years ago)
Author:
Don-vip
Message:

fix encoding problems in tests + tools update:

  • Groovy 2.3.6
  • Jacoco 0.7.1
  • Animal Sniffer Ant Tasks 1.11
  • Findbugs 3.0
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r7351 r7367  
    169169       
    170170        <xmltask source="${bundle.outdir}/JOSM.app/Contents/Info.plist" dest="${bundle.outdir}/JOSM.app/Contents/Info.plist" indent="false">
    171                 <!-- remove empty CFBundleDocumentTypes definition -->
    172                 <remove path="/plist/dict/key[text()='CFBundleDocumentTypes']|/plist/dict/key[text()='CFBundleDocumentTypes']/following-sibling::array[1]"/>
     171            <!-- remove empty CFBundleDocumentTypes definition -->
     172            <remove path="/plist/dict/key[text()='CFBundleDocumentTypes']|/plist/dict/key[text()='CFBundleDocumentTypes']/following-sibling::array[1]"/>
    173173            <!-- insert our own keys -->
    174174            <insert position="before" path="/plist/dict/key[1]" file="macosx/JOSM.app/Contents/Info.plist_template.xml" />
    … …  
    237237            <compilerarg value="-Xlint:try"/>
    238238            <compilerarg value="-Xlint:unchecked"/>
    239                 <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
     239            <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
    240240            <compilerarg value="-XDignore.symbol.file"/>
    241241        </javac>
    … …  
    283283        </fileset>
    284284        <pathelement path="dist/josm-custom.jar"/>
    285         <pathelement path="tools/groovy-all-2.3.4.jar"/>
     285        <pathelement path="tools/groovy-all-2.3.6.jar"/>
    286286    </path>
    287287    <macrodef name="init-test-preferences">
    … …  
    322322                    <cp-elements/>
    323323                </classpath>
    324                 <javac target="1.7" source="1.7" debug="on">
     324                <javac target="1.7" source="1.7" debug="on" encoding="UTF-8">
    325325                    <compilerarg value="-Xlint:all"/>
    326326                    <compilerarg value="-Xlint:-serial"/>
    … …  
    330330    </macrodef>
    331331    <target name="test-compile" depends="test-init,dist">
    332         <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.3.4.jar"/>
     332        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.3.6.jar"/>
    333333        <call-groovyc testfamily="unit">
    334334            <cp-elements>
    … …  
    355355            <jacoco:coverage destfile="${test.dir}/jacoco.exec">
    356356                <junit printsummary="yes" fork="true" forkmode="once">
     357                    <jvmarg value="-Dfile.encoding=UTF-8"/>
    357358                    <sysproperty key="josm.home" value="${test.dir}/config/@{testfamily}-josm.home"/>
    358359                    <sysproperty key="josm.test.data" value="${test.dir}/data"/>
    … …  
    407408        <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar"/>
    408409        <proguard>
    409                 -injars dist/josm-custom.jar
    410                 -outjars dist/josm-custom-optimized.jar
    411 
    412                 -libraryjars ${java.home}/lib/rt.jar
    413                 -libraryjars ${java.home}/lib/jce.jar
    414 
    415                 -dontoptimize
    416                 -dontobfuscate
    417 
    418                 # These options probably are not necessary (and make processing a bit slower)
    419                 -dontskipnonpubliclibraryclasses
    420                 -dontskipnonpubliclibraryclassmembers
    421 
    422                 -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
    423                     public static void main(java.lang.String[]);
    424                 }
    425                 -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplet
    426 
    427                 -keep class JOSM
    428                 -keep class * extends org.openstreetmap.josm.io.FileImporter
    429                 -keep class * extends org.openstreetmap.josm.io.FileExporter
    430                 -keep class org.w3._2001.xmlschema.Adapter1
    431                 -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
    432 
    433                 -keepclassmembers enum  * {
    434                     public static **[] values();
    435                     public static ** valueOf(java.lang.String);
    436                 }
    437 
    438                 # Keep unused public methods (can be useful for plugins)
    439                 -keepclassmembers class * {
    440                     public protected *;
    441                 }
    442 
    443                 # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'.
    444                 # This note should not be a problem as we don't use obfuscation
    445                 -dontnote
     410        -injars dist/josm-custom.jar
     411        -outjars dist/josm-custom-optimized.jar
     412
     413        -libraryjars ${java.home}/lib/rt.jar
     414        -libraryjars ${java.home}/lib/jce.jar
     415
     416        -dontoptimize
     417        -dontobfuscate
     418
     419        # These options probably are not necessary (and make processing a bit slower)
     420        -dontskipnonpubliclibraryclasses
     421        -dontskipnonpubliclibraryclassmembers
     422
     423        -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
     424            public static void main(java.lang.String[]);
     425        }
     426        -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplet
     427
     428        -keep class JOSM
     429        -keep class * extends org.openstreetmap.josm.io.FileImporter
     430        -keep class * extends org.openstreetmap.josm.io.FileExporter
     431        -keep class org.w3._2001.xmlschema.Adapter1
     432        -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
     433
     434        -keepclassmembers enum  * {
     435            public static **[] values();
     436            public static ** valueOf(java.lang.String);
     437        }
     438
     439        # Keep unused public methods (can be useful for plugins)
     440        -keepclassmembers class * {
     441            public protected *;
     442        }
     443
     444        # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'.
     445        # This note should not be a problem as we don't use obfuscation
     446        -dontnote
    446447        </proguard>
    447448    </target>
    … …  
    452453        <property name="dir" value="plugin-check"/>
    453454        <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
    454             <classpath path="tools/animal-sniffer-ant-tasks-1.8.jar"/>
     455            <classpath path="tools/animal-sniffer-ant-tasks-1.11.jar"/>
    455456        </typedef>
    456457        <mkdir dir="${dir}"/>
    … …  
    521522        </as:build-signatures>
    522523        <as:check-signature signature="${dir}/api.sig">
     524            <ignore classname="au.edu.*"/>
     525            <ignore classname="au.com.*"/>
     526            <ignore classname="com.*"/>
     527            <ignore classname="javax.*"/>
     528            <ignore classname="jogamp.*"/>
     529            <ignore classname="junit.*"/>
     530            <ignore classname="net.sf.*"/>
     531            <ignore classname="nu.xom.*"/>
     532            <ignore classname="org.apache.*"/>
     533            <ignore classname="org.codehaus.*"/>
     534            <ignore classname="org.dom4j.*"/>
     535            <ignore classname="org.hsqldb.*"/>
     536            <ignore classname="org.ibex.*"/>
     537            <ignore classname="org.jaitools.*"/>
     538            <ignore classname="org.jaxen.*"/>
     539            <ignore classname="org.jdom2.*"/>
    523540            <ignore classname="org.jgraph.*"/>
    524             <ignore classname="com.touchgraph.*"/>
    525             <ignore classname="com.sun.xml.fastinfoset.*"/>
    526             <ignore classname="javax.jms.*"/>
     541            <ignore classname="org.joda.time.*"/>
    527542            <ignore classname="org.jvnet.staxex.*"/>
    528             <ignore classname="javax.mail.*"/>
    529             <ignore classname="com.sun.jdmk.*"/>
    530             <ignore classname="org.apache.avalon.framework.logger.Logger"/>
    531             <ignore classname="org.apache.log.*"/>
    532             <ignore classname="junit.*"/>
     543            <ignore classname="org.kxml2.*"/>
     544            <ignore classname="org.python.*"/>
     545            <ignore classname="org.slf4j.*"/>
    533546            <path path="${dir}"/>
    534547        </as:check-signature>
Note: See TracChangeset for help on using the changeset viewer.