summaryrefslogtreecommitdiffstats
path: root/make/build-test.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-01-22 18:24:23 +0100
committerSven Gothel <[email protected]>2012-01-22 18:24:23 +0100
commit64639b805a32338385421f168e12c1ef7f749d00 (patch)
tree6b027d14cf4b9cfe2a8db72ed8a000d98fca036a /make/build-test.xml
parent36c99b43e09999a560a086be10e392aad915b1f3 (diff)
Fix Bug 516 (Determine Java Version); Minor fixes (jogamp/common/** ..)
Current minimum requirements are: - Java 1.6 (Level 6.0) - Android SDK API Level 9 (Version 2.3 Gingerbread) Official production builds are performed w/ Java 1.6. - Java 1.6 (Level 6.0) - Android SDK API Level 9 (Version 2.3 Gingerbread) Android supports Java language level 6.0. Nevertheless, it cannot be guaranteed whether the Android API supports all classes and methods of Java 1.6. It is required for JogAmp developers to validate Android compatibility by an Android crosscompilation build. Current GlueGen code utilizes some minor Java 1.6 features which could be replaced, however it's not desired at this point since we have no mode hard Java 1.5 constraints. Notes: - On OS X 10.5.8, only the 64bit version of Java6 is available and hence the only supported one on Leopard. +++ Pushing determination of host (compiletime) and target (runtime) Java version to 'jogamp-env.xml'. jogamp-env.xml uses: env: SOURCE_LEVEL -> propery: target.sourcelevel def.: ${ant.java.version} >=1.6 (!) env: TARGET_LEVEL -> propery: target.targetlevel def.: ${ant.java.version} >=1.6 (!) env: TARGET_RT_JAR -> propery: target.rt.jar def.: ${java.home}/lib/rt.jar Either all above values are set, or none at all (default), otherwise a build error is being thrown. Further more we have the compiletime properties: host.sourcelevel def.: ${ant.java.version} >= 1.6 (!) host.targetlevel def.: ${ant.java.version} >= 1.6 (!) host.rt.jar def.: ${java.home}/lib/rt.jar +++ - 'javac.memorymax' defaults to 1024m now.
Diffstat (limited to 'make/build-test.xml')
-rw-r--r--make/build-test.xml13
1 files changed, 4 insertions, 9 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index 6728cd7..00fd396 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -100,14 +100,6 @@
<property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/>
- <property name="target.sourcelevel" value="1.5" />
- <property name="host.sourcelevel" value="1.5" />
- <property name="javacdebug" value="true" />
- <property name="javacdebuglevel" value="source,lines" />
- <!--property name="javacdebuglevel" value="source,lines,vars" /-->
- <!-- property name="javac.memorymax" value="128m" /--> <!-- I ran out of memory with these .. linux x86_64 6u14 -->
- <property name="javac.memorymax" value="512m" />
-
</target>
<target name="java.build" depends="java.generate">
@@ -119,7 +111,10 @@
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
- source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+ bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<classpath refid="junit.compile.classpath"/>
<src path="${test.base.dir}"/>
<src path="${build_t.gen}" />