Changeset c7d68c2


Ignore:
Timestamp:
Nov 19, 2015 5:48:56 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
110a0a1
Parents:
8b14afd
Message:

Require Java 7 for SAM
separate option javac.compilerargs7 for Java 7

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/sam/java/build.xml

    r8b14afd rc7d68c2  
    2222    </target>
    2323
    24     <property name="javac.compilerargs" value="" />
     24    <!-- ignored for now, we require java 7 here -->
     25    <property name="javac.compilerargs7" value="" />
     26    <!-- ignored for now, we require java 7 here -->
    2527    <property name="javac.version" value="1.6" />
    2628
     
    3133        <javac
    3234            srcdir="./src"
    33             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
     35            debug="true" deprecation="on" source="1.7" target="1.7"
    3436            includeAntRuntime="false"
    3537            destdir="./build/obj"
    3638            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
    37             <compilerarg line="${javac.compilerargs}" />
     39            <compilerarg line="${javac.compilerargs7}" />
    3840        </javac>
    3941    </target>
     
    4244        <javac
    4345            srcdir="./test"
    44             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
     46            debug="true" deprecation="on" source="1.7" target="1.7"
    4547            includeAntRuntime="false"
    4648            destdir="./build/obj"
    4749            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
    48             <compilerarg line="${javac.compilerargs}" />
     50            <compilerarg line="${javac.compilerargs7}" />
    4951        </javac>
    5052    </target>
  • build.properties

    r8b14afd rc7d68c2  
    4444
    4545# Optional compiler args
     46# This one is for subsystems requiring Java 6
    4647# This one keeps gcj a lot quieter
    4748#javac.compilerargs=-warn:-unchecked,raw,unused,serial
     49# This one is for subsystems requiring Java 7
     50#javac.compilerargs7=
    4851
    4952#
Note: See TracChangeset for help on using the changeset viewer.