Changeset 7001 in josm for trunk/build.xml


Ignore:
Timestamp:
2014-04-26T03:53:35+02:00 (5 years ago)
Author:
Don-vip
Message:

see #8465 - switch core to Java 7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r6955 r7001  
    131131        </jar>
    132132    </target>
    133     <!-- Compatibility Mac OS X target for Java 6 (incompatible with new on for Java 7, see #8654, #9035) -->
    134     <target name="distmac" depends="dist">
    135         <!-- modify MacOS X Info.plist file to hold the SVN version number -->
    136         <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
    137         <replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
    138         <!-- create ZIP file with MacOS X application bundle -->
    139         <zip destfile="dist/josm-custom-macosx.zip" update="true">
    140             <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
    141             <zipfileset dir="macosx" includes="JOSM.app/Contents JOSM.app/Contents/MacOS JOSM.app/Contents/Resources JOSM.app/Contents/Resources/Java JOSM.app/Contents/PkgInfo JOSM.app/Contents/Resources/JOSM.icns"/>
    142             <zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
    143             <zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
    144             <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
    145         </zip>
    146     </target>
    147     <!-- New Mac OS X target for Java 7 -->
    148     <target name="mac7">
     133    <!-- Mac OS X target -->
     134    <target name="mac">
    149135        <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
    150136        <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="tools/appbundler-1.0ea.jar"/>
     
    187173       
    188174        <!-- create ZIP file with MacOS X application bundle -->
    189         <zip destfile="${bundle.outdir}/josm-custom-macosx-java7.zip" update="true">
     175        <zip destfile="${bundle.outdir}/josm-custom-macosx.zip" update="true">
    190176            <zipfileset dir="." includes="CONTRIBUTION README LICENSE"/>
    191177            <zipfileset dir="${bundle.outdir}" includes="JOSM.app/**/*" filemode="755" />
    192178        </zip>
    193179    </target>
    194     <target name="distmac7" depends="dist">
    195         <antcall target="mac7">
     180    <target name="distmac" depends="dist">
     181        <antcall target="mac">
    196182            <param name="bundle.outdir" value="dist"/>
    197183            <param name="bundle.jar" value="dist/josm-custom.jar"/>
     
    204190            <arg value="${javacc.home}/javacc.jar"/>
    205191            <arg value="javacc"/>
    206             <arg value="-JDK_VERSION=1.6"/>
     192            <arg value="-JDK_VERSION=1.7"/>
    207193            <arg value="-GRAMMAR_ENCODING=UTF-8"/>
    208194            <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
     
    211197    </target>
    212198    <target name="compile" depends="init,javacc">
    213         <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="iso-8859-1"/>
    214         <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
     199        <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="iso-8859-1"/>
     200        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
    215201            <compilerarg value="-Xlint:deprecation"/>
    216202            <compilerarg value="-Xlint:unchecked"/>
     
    237223                linksource="true"
    238224                author="false">
    239             <link href="http://docs.oracle.com/javase/6/docs/api"/>
     225            <link href="http://docs.oracle.com/javase/7/docs/api"/>
    240226            <doctitle><![CDATA[<h2>JOSM - Javadoc</h2>]]></doctitle>
    241227            <bottom><![CDATA[<a href="https://josm.openstreetmap.de/">JOSM</a>]]></bottom>
     
    266252    </target>
    267253    <target name="test-compile" depends="test-init,dist">
    268         <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
     254        <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
    269255            <compilerarg value="-Xlint:deprecation"/>
    270256            <compilerarg value="-Xlint:unchecked"/>
    271257        </javac>
    272         <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
     258        <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
    273259            <compilerarg value="-Xlint:deprecation"/>
    274260            <compilerarg value="-Xlint:unchecked"/>
Note: See TracChangeset for help on using the changeset viewer.