Changeset 08d1ea8


Ignore:
Timestamp:
Oct 26, 2016 4:56:13 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
78acf70
Parents:
2b6fd49
Message:

Build: Set Java 7 build target for all jars;
embedders (esp. Android) targetting 1.6 must
set javac.version=1.6 in override.properties and set
both bootclasspath variables.

Files:
21 edited

Legend:

Unmodified
Added
Removed
  • apps/BOB/nbproject/project.properties

    r2b6fd49 r08d1ea8  
    4949javac.compilerargs=
    5050javac.deprecation=false
    51 javac.source=1.5
    52 javac.target=1.5
     51javac.version=1.7
     52javac.source=${javac.version}
     53javac.target=${javac.version}
    5354javac.test.classpath=\
    5455    ${javac.classpath}:\
  • apps/addressbook/build.xml

    r2b6fd49 r08d1ea8  
    88        <property name="war" value="addressbook.war"/>
    99        <property name="javac.compilerargs" value="" />
    10         <property name="javac.version" value="1.6" />
     10        <property name="javac.version" value="1.7" />
    1111       
    1212        <target name="init">
  • apps/desktopgui/build.xml

    r2b6fd49 r08d1ea8  
    88        <property name="javadoc" value="javadoc"/>
    99        <property name="javac.compilerargs" value=""/>
    10         <property name="javac.version" value="1.6" />
     10        <property name="javac.version" value="1.7" />
    1111        <property name="require.gettext" value="true" />
    1212
  • apps/i2psnark/java/build.xml

    r2b6fd49 r08d1ea8  
    2727
    2828    <property name="javac.compilerargs" value="" />
    29     <property name="javac.version" value="1.6" />
     29    <property name="javac.version" value="1.7" />
    3030    <property name="require.gettext" value="true" />
    3131
  • apps/i2ptunnel/java/build.xml

    r2b6fd49 r08d1ea8  
    2929    <!-- only used if not set by a higher build.xml -->
    3030    <property name="javac.compilerargs" value="" />
    31     <property name="javac.version" value="1.6" />
     31    <property name="javac.version" value="1.7" />
    3232    <property name="require.gettext" value="true" />
    3333
  • apps/imagegen/identicon/build.xml

    r2b6fd49 r08d1ea8  
    1919    <!-- only used if not set by a higher build.xml -->
    2020    <property name="javac.compilerargs" value="" />
    21     <property name="javac.version" value="1.6" />
     21    <property name="javac.version" value="1.7" />
    2222
    2323    <target name="compile" depends="depend">
  • apps/imagegen/imagegen/build.xml

    r2b6fd49 r08d1ea8  
    2929    <!-- only used if not set by a higher build.xml -->
    3030    <property name="javac.compilerargs" value="" />
    31     <property name="javac.version" value="1.6" />
     31    <property name="javac.version" value="1.7" />
    3232
    3333    <target name="compile" depends="depend">
  • apps/imagegen/zxing/build.xml

    r2b6fd49 r08d1ea8  
    2323        <mkdir dir="./build" />
    2424        <mkdir dir="./build/obj" />
    25         <javac srcdir="./core/src/main/java" debug="true" deprecation="on" source="1.7" target="1.7"
     25        <javac srcdir="./core/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    2626               includeAntRuntime="false"
    2727               destdir="./build/obj" >
    2828            <compilerarg line="${javac.compilerargs7}" />
    2929        </javac>
    30         <javac srcdir="./javase/src/main/java" debug="true" deprecation="on" source="1.7" target="1.7"
     30        <javac srcdir="./javase/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    3131               includeAntRuntime="false"
    3232               destdir="./build/obj" classpath="./build/obj" >
  • apps/jetty/build.xml

    r2b6fd49 r08d1ea8  
    2121    <property name="verified.filename" value="verified.txt" />
    2222    <property name="javac.compilerargs" value="" />
    23     <property name="javac.version" value="1.6" />
     23    <property name="javac.version" value="1.7" />
    2424    <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
    2525    <property name="tomcat.ver" value="6.0.47" />
  • apps/ministreaming/java/build.xml

    r2b6fd49 r08d1ea8  
    2323    <!-- only used if not set by a higher build.xml -->
    2424    <property name="javac.compilerargs" value="" />
    25     <property name="javac.version" value="1.6" />
     25    <property name="javac.version" value="1.7" />
    2626    <property name="require.gettext" value="true" />
    2727
  • apps/routerconsole/java/build.xml

    r2b6fd49 r08d1ea8  
    4848
    4949    <property name="javac.compilerargs" value="" />
    50     <property name="javac.version" value="1.6" />
     50    <property name="javac.version" value="1.7" />
    5151
    5252    <target name="compile" depends="prepare, depend, dependVersion">
  • apps/sam/java/build.xml

    r2b6fd49 r08d1ea8  
    2323    </target>
    2424
    25     <!-- ignored for now, we require java 7 here -->
    2625    <property name="javac.compilerargs7" value="" />
    27     <!-- ignored for now, we require java 7 here -->
    28     <property name="javac.version" value="1.6" />
     26    <property name="javac.version" value="1.7" />
    2927
    3028    <!-- compile everything including client classes -->
     
    3432        <javac
    3533            srcdir="./src"
    36             debug="true" deprecation="on" source="1.7" target="1.7"
     34            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    3735            includeAntRuntime="false"
    3836            destdir="./build/obj"
  • apps/streaming/java/build.xml

    r2b6fd49 r08d1ea8  
    2424    <!-- only used if not set by a higher build.xml -->
    2525    <property name="javac.compilerargs" value="" />
    26     <property name="javac.version" value="1.6" />
     26    <property name="javac.version" value="1.7" />
    2727
    2828    <target name="compile" depends="depend">
  • apps/susidns/src/build.xml

    r2b6fd49 r08d1ea8  
    3434
    3535        <property name="javac.compilerargs" value="" />
    36         <property name="javac.version" value="1.6" />
     36        <property name="javac.version" value="1.7" />
    3737        <property name="require.gettext" value="true" />
    3838
  • apps/susimail/build.xml

    r2b6fd49 r08d1ea8  
    88
    99    <property name="javac.compilerargs" value="" />
    10     <property name="javac.version" value="1.6" />
     10    <property name="javac.version" value="1.7" />
    1111    <property name="require.gettext" value="true" />
    1212
  • apps/systray/java/build.xml

    r2b6fd49 r08d1ea8  
    2222
    2323    <property name="javac.compilerargs" value="" />
    24     <property name="javac.version" value="1.6" />
     24    <property name="javac.version" value="1.7" />
    2525
    2626    <target name="compile" depends="depend">
  • build.properties

    r2b6fd49 r08d1ea8  
    4141
    4242# Compile for this version of Java
    43 javac.version=1.6
     43javac.version=1.7
    4444
    4545# Additional classpath if required
     
    4747
    4848# Optional compiler args
    49 # This one is for subsystems requiring Java 6
    5049# This one keeps gcj a lot quieter
    5150#javac.compilerargs=-warn:-unchecked,raw,unused,serial
    52 # This one is for subsystems requiring Java 7
    53 #javac.compilerargs7=
    5451
    5552#
     
    5754#
    5855# Strictly speaking, you must either use the compiler for the minimum Java version you are
    59 # targeting (default 1.6, see above), or specify a bootclasspath, which means you need
     56# targeting (default 1.7, see above), or specify a bootclasspath, which means you need
    6057# the JRE for the target version installed as well.
    6158#
     
    7168#    https://gist.github.com/AlainODea/1375759b8720a3f9f094
    7269#
     70# You must set both.
     71#
     72# For embedded use only, and for a limited time,
     73# the following subsystems ONLY may be built with Java 6 by setting javac.version=1.6 in override.properties,
     74# and setting javac.compilerargs to use java 6 jars:
     75# core, router, ministreaming, streaming, addressbook, i2ptunnel, BOB
     76# Use the buildX ant targets to build these (see build.xml).
     77# We may start using Java 7 features in these subsystems at any time and without notice.
    7378#javac.compilerargs=-bootclasspath /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-6-openjdk-amd64/jre/lib/jce.jar
     79#
     80# For standard builds, set both of the following in override.properties:
     81#
     82#javac.compilerargs=-bootclasspath /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar
     83#javac.compilerargs7=-bootclasspath /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar
    7484
    7585
  • core/java/build.xml

    r2b6fd49 r08d1ea8  
    2020    <property name="javac.compilerargs" value="" />
    2121    <property name="javac.classpath" value="" />
    22     <property name="javac.version" value="1.6" />
     22    <property name="javac.version" value="1.7" />
    2323
    2424    <!-- fixups if we're using libintl.jar for GettextResource.java -->
  • installer/java/build.xml

    r2b6fd49 r08d1ea8  
    2020    <property name="javac.compilerargs" value="" />
    2121    <property name="javac.classpath" value="" />
    22     <property name="javac.version" value="1.6" />
     22    <property name="javac.version" value="1.7" />
    2323
    2424    <target name="compile" depends="depend">
  • installer/tools/java/build.xml

    r2b6fd49 r08d1ea8  
    2020    <property name="javac.compilerargs" value="" />
    2121    <property name="javac.classpath" value="" />
    22     <property name="javac.version" value="1.6" />
     22    <property name="javac.version" value="1.7" />
    2323
    2424    <target name="compile" depends="depend">
  • router/java/build.xml

    r2b6fd49 r08d1ea8  
    3434    <!-- only used if not set by a higher build.xml -->
    3535    <property name="javac.compilerargs" value="" />
    36     <property name="javac.version" value="1.6" />
     36    <property name="javac.version" value="1.7" />
    3737
    3838    <target name="compile" depends="depend, dependVersion">
Note: See TracChangeset for help on using the changeset viewer.