diff options
| author | Sven Gothel <[email protected]> | 2019-08-18 03:38:25 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-08-18 03:38:25 +0200 |
| commit | 189f8ede61afea66ea14f7402dac10381a98c9ca (patch) | |
| tree | 4ac64e1f9112d7ce9acf453192f41ea767e58f4a /make/jogamp-env.xml | |
| parent | 0577701f4d92c414dbfe6875f4319fd311e0106c (diff) | |
Bug 1363: Java 11: Fix javadoc invocation, drop -source <release> for compile time javac
Also prepare the 'target.releaselevel' property to be set by 'RELEASE_LEVEL' environment,
however - we do not use it at this point.
For now, we build gluegen-rt using '-source 1.8' '-target 1.8'
and the bootclasspath of openjdk8 rt.jar to ensure java8 compatibility.
Alternatively one could use '--release 8' instead using the java11
distributed modules. However, I think the above method is more safe,
only allowing java8 rt.jar to be used for compilation.
Further, gluegen.jar is build using '-target 1.8' only,
since it musty use java11 sources at least for the javadoc taglet.
Diffstat (limited to 'make/jogamp-env.xml')
| -rwxr-xr-x | make/jogamp-env.xml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index 5a2396c..6eb2e86 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -161,6 +161,12 @@ </not> </condition> + <condition property="target.releaselevel" value="${env.RELEASE_LEVEL}"> + <not> + <equals arg1="${env.RELEASE_LEVEL}" arg2="$${env.RELEASE_LEVEL}" casesensitive="true" /> + </not> + </condition> + <condition property="target.rt.jar" value="${env.TARGET_RT_JAR}"> <not> <equals arg1="${env.TARGET_RT_JAR}" arg2="$${env.TARGET_RT_JAR}" casesensitive="true" /> @@ -171,12 +177,14 @@ <and> <isset property="target.sourcelevel"/> <isset property="target.targetlevel"/> + <!-- isset property="target.releaselevel"/ --> <isset property="target.rt.jar"/> </and> </condition> <echo message="target.user.set ${target.user.set}"/> <echo message="target.sourcelevel ${target.sourcelevel}"/> <echo message="target.targetlevel ${target.targetlevel}"/> + <echo message="target.releaselevel ${target.releaselevel}"/> <echo message="target.rt.jar ${target.rt.jar}"/> <fail message="You need to specify all properties 'target.sourcelevel', 'target.targetlevel' and 'target.rt.jar'."> @@ -192,6 +200,7 @@ <not> <or> <contains string="${target.sourcelevel}" substring="1.8" casesensitive="false" /> + <contains string="${target.sourcelevel}" substring="8" casesensitive="false" /> </or> </not> </condition> @@ -201,10 +210,20 @@ <not> <or> <contains string="${target.targetlevel}" substring="1.8" casesensitive="false" /> + <contains string="${target.targetlevel}" substring="8" casesensitive="false" /> </or> </not> </condition> </fail> + <!-- fail message="Unsupported Target Java releaselevel: ${target.releaselevel}. Make sure that the releaselevel is set to 8."> + <condition> + <not> + <or> + <contains string="${target.releaselevel}" substring="8" casesensitive="false" /> + </or> + </not> + </condition> + </fail --> <property name="javacdebug" value="true" /> <property name="javacdebuglevel" value="source,lines" /> |