summaryrefslogtreecommitdiffstats
path: root/make/gluegen-cpptasks-base.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-06-13 07:42:58 +0200
committerSven Gothel <[email protected]>2019-06-13 07:42:58 +0200
commit5f9c1435ab06c7b620befa8677fc23080dac0ce2 (patch)
treef2b1e9f0bd8b28daf4777d0bb45ecaa2b43c0827 /make/gluegen-cpptasks-base.xml
parent2a8c4d1cfa45794bc27358f3379f8c5bece74537 (diff)
Bug 1363: Java 11: Initial Host/Target Compiler Selection: Java8
Current requirements are: - Java 1.8 (Level 8.0) - Android SDK API level 24 (Version 7.0 Nougat, released August 2016) Official production builds are performed w/ Java 1.8. - Java 1.8 (Level 8.0) - Android SDK API level 24 (Version 7.0 Nougat, released August 2016) Android 7 API level 24 supports Java 1.8, see https://developer.android.com/studio/write/java8-support Java 8 is chosen today, June 2019, since OpenJDK 1.8 is well supported on desktop, mobile support is given w/ OpenJDK 9 and Android also support these language features for almost 3 years. ++++ Current patch does require one to set the target.sourcelevel, target.targetlevel and target.rt.jar properties or their equivalent capital case environment variables. Only allowed value is currently 1.8.
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
-rwxr-xr-xmake/gluegen-cpptasks-base.xml10
1 files changed, 1 insertions, 9 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index adf8ab6..e31707a 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -206,15 +206,7 @@
<!-- NOTE: the values of the macos<arch> attributes will not be overridden if already set externally -->
<property name="macosppc" value="false" />
<property name="macosx64" value="true" />
- <!-- No 32bit binaries on OSX since Java7 -->
- <condition property="macosx32" value="false" else="true">
- <or>
- <contains string="${ant.java.version}" substring="1.7" casesensitive="false" />
- <contains string="${ant.java.version}" substring="1.8" casesensitive="false" />
- <contains string="${ant.java.version}" substring="1.9" casesensitive="false" />
- <contains string="${ant.java.version}" substring="2.0" casesensitive="false" />
- </or>
- </condition>
+ <property name="macosx32" value="false" /> <!-- we disable 32bit on OSX for good now -->
<!-- Need a way to be able to disable the macosx64 property specification in a build.xml -->
<condition property="use.macosppc">