Changeset 08d1ea8 for build.properties


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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.