diff options
19 files changed, 53 insertions, 554 deletions
diff --git a/make/build.xml b/make/build.xml index 3fa7c3c..3d247f3 100644 --- a/make/build.xml +++ b/make/build.xml @@ -54,7 +54,8 @@ <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /--> <!-- property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /--> - <property name="javadoc.link" value="http://docs.oracle.com/javase/6/docs/api/" /> + <!-- property name="javadoc.link" value="http://docs.oracle.com/javase/6/docs/api/" /--> + <property name="javadoc.link" value="https://docs.oracle.com/javase/8/docs/api/" /> <!-- The source and build directories. --> <property name="project.root" value=".." /> @@ -795,7 +796,7 @@ <!-- Compile gluegen (compile time). - Uses host.rt.jar, since we require 'com.sun.tools.doclets.Taglet', + Uses target.rt.jar, since we require 'com.sun.tools.doclets.Taglet', w/o it breaks build on OSX w/ Java6 compiler. Surprisingly it works on other platforms, which seems to pick classes outside of the 'bootclasspath'. @@ -807,7 +808,7 @@ encoding="UTF-8" source="${target.sourcelevel}" target="${target.targetlevel}" - bootclasspath="${host.rt.jar}" + bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.jcpp}" /> <src path="${src.java}" /> diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 05f648a..7aee9c9 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -219,15 +219,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"> diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index 9e22cbe..5a2396c 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -1,23 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Current minimum requirements are: - - Java 1.6 (Level 6.0) - - Android SDK API Level 9 (Version 2.3 Gingerbread) +<!-- 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.6. - - Java 1.6 (Level 6.0) - - Android SDK API Level 9 (Version 2.3 Gingerbread) + 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 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. + 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. + For crosscompilation the following shall be set: - TARGET_PLATFORM_SYSROOT Crosscompiler and system specified 'sysroot' (as in gcc \-\-print-sysroot) - TARGET_PLATFORM_USRROOT Additional optional user headers and libraries for target @@ -36,12 +33,12 @@ <property name="jvmJava.exe" value="${java.home}/bin/java" /> <!-- the java jvm executable for unit tests --> <echo message="jvmJava.exe ${jvmJava.exe}"/> - <condition property="jvmJava7.exe" value="${env.JAVA7_EXE}"> + <condition property="jvmJava8.exe" value="${env.JAVA8_EXE}"> <not> - <equals arg1="${env.JAVA7_EXE}" arg2="$${env.JAVA7_EXE}" casesensitive="true" /> + <equals arg1="${env.JAVA8_EXE}" arg2="$${env.JAVA8_EXE}" casesensitive="true" /> </not> </condition> - <echo message="jvmJava7.exe ${jvmJava7.exe}"/> <!-- optional extra Java7 JVM for unit tests --> + <echo message="jvmJava8.exe ${jvmJava8.exe}"/> <!-- optional extra Java8 JVM for unit tests --> <fail message="Please build using Ant 1.8.0 or higher."> <condition> @@ -51,16 +48,23 @@ </condition> </fail> - <fail message="Unsupported Java version: ${ant.java.version}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater."> + <fail message="Unsupported Java version: ${ant.java.version}. Make sure that the version of the Java compiler is 1.8 (8.0) or greater."> <condition> <not> <or> - <equals arg1="${ant.java.version}" arg2="1.6"/> - <equals arg1="${ant.java.version}" arg2="1.7"/> <equals arg1="${ant.java.version}" arg2="1.8"/> <equals arg1="${ant.java.version}" arg2="1.9"/> - <equals arg1="${ant.java.version}" arg2="2.0"/> - <equals arg1="${ant.java.version}" arg2="2.1"/> + <equals arg1="${ant.java.version}" arg2="1.10"/> + <equals arg1="${ant.java.version}" arg2="1.11"/> + <equals arg1="${ant.java.version}" arg2="1.12"/> + <equals arg1="${ant.java.version}" arg2="1.13"/> + <equals arg1="${ant.java.version}" arg2="1.14"/> + <equals arg1="${ant.java.version}" arg2="9"/> + <equals arg1="${ant.java.version}" arg2="10"/> + <equals arg1="${ant.java.version}" arg2="11"/> + <equals arg1="${ant.java.version}" arg2="12"/> + <equals arg1="${ant.java.version}" arg2="13"/> + <equals arg1="${ant.java.version}" arg2="14"/> </or> </not> </condition> @@ -78,9 +82,12 @@ <condition property="javadoc.xarg1" value="-Xdoclint:none" else="-J-Ddummy=val"> <or> <equals arg1="${ant.java.version}" arg2="1.8"/> - <equals arg1="${ant.java.version}" arg2="1.9"/> - <equals arg1="${ant.java.version}" arg2="2.0"/> - <equals arg1="${ant.java.version}" arg2="2.1"/> + <equals arg1="${ant.java.version}" arg2="9"/> + <equals arg1="${ant.java.version}" arg2="10"/> + <equals arg1="${ant.java.version}" arg2="11"/> + <equals arg1="${ant.java.version}" arg2="12"/> + <equals arg1="${ant.java.version}" arg2="13"/> + <equals arg1="${ant.java.version}" arg2="14"/> </or> </condition> <echo message="javadoc.xarg1 ${javadoc.xarg1}"/> @@ -95,7 +102,7 @@ <property name="jogamp.version.major" value="2"/> <property name="jogamp.version.minor" value="4"/> - <property name="jogamp.version.submi" value="0"/> + <property name="jogamp.version.submi" value="1"/> <property name="jogamp.version.devel" value="-rc-${version.timestamp}"/> <!-- Devel RC Tag --> <!-- property name="jogamp.version.devel" value=""/ --> <!-- Release tag --> <property name="jogamp.version.base" value="${jogamp.version.major}.${jogamp.version.minor}"/> @@ -103,7 +110,7 @@ <echo message="jogamp.version ${jogamp.version}"/> <!-- This is the Android version: xxyyzzz, xx=API yy screen-from-to zzz app-version--> - <property name="jogamp.version.int" value="0914019"/> + <property name="jogamp.version.int" value="2414020"/> <echo message="jogamp.version.int ${jogamp.version.int}"/> <!-- only set 'junit.is.disabled' if set in environment as 'true' to disable JUNIT tests --> @@ -136,7 +143,7 @@ </not> </condition> - <condition property="android.version" value="${env.ANDROID_VERSION}" else="9"> + <condition property="android.version" value="${env.ANDROID_VERSION}" else="24"> <not> <equals arg1="${env.ANDROID_VERSION}" arg2="$${env.ANDROID_VERSION}" casesensitive="true" /> </not> @@ -160,25 +167,6 @@ </not> </condition> - <fail message="You need to specify all properties 'target.sourcelevel', 'target.targetlevel' and 'target.rt.jar' or none at all."> - <condition> - <and> - <or> - <isset property="target.sourcelevel"/> - <isset property="target.targetlevel"/> - <isset property="target.rt.jar"/> - </or> - <not> - <and> - <isset property="target.sourcelevel"/> - <isset property="target.targetlevel"/> - <isset property="target.rt.jar"/> - </and> - </not> - </and> - </condition> - </fail> - <condition property="target.user.set" value="true"> <and> <isset property="target.sourcelevel"/> @@ -186,79 +174,33 @@ <isset property="target.rt.jar"/> </and> </condition> - - <property name="target.sourcelevel" value="${ant.java.version}" /> <!-- default fallback values --> - <property name="target.targetlevel" value="${ant.java.version}" /> <!-- default fallback values --> - <!-- Default value for std Java (incl. Java7 on OS X) --> - <condition property="target.rt.jar" - value="${java.home}/lib/rt.jar"> - <available file="${java.home}/lib/rt.jar"/> - </condition> - <!-- Default fallback value for Java6 OS X --> - <condition property="target.rt.jar" - value="${java.home}/../Classes/classes.jar"> - <available file="${java.home}/../Classes/classes.jar"/> - </condition> - <!-- Default fallback value on std Java --> <echo message="target.user.set ${target.user.set}"/> <echo message="target.sourcelevel ${target.sourcelevel}"/> <echo message="target.targetlevel ${target.targetlevel}"/> <echo message="target.rt.jar ${target.rt.jar}"/> - <fail message="No target.rt.jar specified not found."> - <condition> - <not> - <isset property="target.rt.jar"/> - </not> - </condition> - </fail> - <property name="host.sourcelevel" value="${ant.java.version}" /> <!-- default values for compile time components --> - <property name="host.targetlevel" value="${ant.java.version}" /> <!-- default values for compile time components --> - <!-- Default value for std Java (incl. Java7 on OS X) --> - <condition property="host.rt.jar" - value="${java.home}/lib/rt.jar"> - <available file="${java.home}/lib/rt.jar"/> - </condition> - <!-- Default fallback value for Java6 OS X --> - <condition property="host.rt.jar" - value="${java.home}/../Classes/classes.jar"> - <available file="${java.home}/../Classes/classes.jar"/> - </condition> - <echo message="host.sourcelevel ${host.sourcelevel}"/> - <echo message="host.targetlevel ${host.targetlevel}"/> - <echo message="host.rt.jar ${host.rt.jar}"/> - <fail message="No host.rt.jar specified not found."> + <fail message="You need to specify all properties 'target.sourcelevel', 'target.targetlevel' and 'target.rt.jar'."> <condition> <not> - <isset property="host.rt.jar"/> + <istrue value="${target.user.set}"/> </not> </condition> </fail> - <fail message="Unsupported Target Java version (sourcelevel): ${target.sourcelevel}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater."> + <fail message="Unsupported Target Java sourcelevel: ${target.sourcelevel}. Make sure that the sourcelevel is set to 1.8 (8.0)."> <condition> <not> <or> - <contains string="${target.sourcelevel}" substring="1.6" casesensitive="false" /> - <contains string="${target.sourcelevel}" substring="1.7" casesensitive="false" /> <contains string="${target.sourcelevel}" substring="1.8" casesensitive="false" /> - <contains string="${target.sourcelevel}" substring="1.9" casesensitive="false" /> - <contains string="${target.sourcelevel}" substring="2.0" casesensitive="false" /> - <contains string="${target.sourcelevel}" substring="2.1" casesensitive="false" /> </or> </not> </condition> </fail> - <fail message="Unsupported Target Java version (targetlevel): ${target.targetlevel}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater."> + <fail message="Unsupported Target Java targetlevel: ${target.targetlevel}. Make sure that the targetlevel is set to 1.8 (8.0)."> <condition> <not> <or> - <contains string="${target.targetlevel}" substring="1.6" casesensitive="false" /> - <contains string="${target.targetlevel}" substring="1.7" casesensitive="false" /> <contains string="${target.targetlevel}" substring="1.8" casesensitive="false" /> - <contains string="${target.targetlevel}" substring="1.9" casesensitive="false" /> - <contains string="${target.targetlevel}" substring="2.0" casesensitive="false" /> - <contains string="${target.targetlevel}" substring="2.1" casesensitive="false" /> </or> </not> </condition> diff --git a/make/lib/android-sdk/15/android-java-src.txt b/make/lib/android-sdk/15/android-java-src.txt deleted file mode 100644 index d3d6103..0000000 --- a/make/lib/android-sdk/15/android-java-src.txt +++ /dev/null @@ -1,8 +0,0 @@ -Retrieved from public sources as described in script below. - -++++ - -cd /android-sdk-linux_x86/sources/android-15 - -jar cvf android-java-src.zip android com javax/microedition/khronos - diff --git a/make/lib/android-sdk/15/android-java-src.zip b/make/lib/android-sdk/15/android-java-src.zip Binary files differdeleted file mode 100644 index ee37c7a..0000000 --- a/make/lib/android-sdk/15/android-java-src.zip +++ /dev/null diff --git a/make/lib/android-sdk/15/android.jar b/make/lib/android-sdk/15/android.jar Binary files differdeleted file mode 100644 index efbb7a3..0000000 --- a/make/lib/android-sdk/15/android.jar +++ /dev/null diff --git a/make/lib/android-sdk/21/LICENSE.txt b/make/lib/android-sdk/21/LICENSE.txt deleted file mode 100644 index c817537..0000000 --- a/make/lib/android-sdk/21/LICENSE.txt +++ /dev/null @@ -1,10 +0,0 @@ - -http://source.android.com/faqs.html#what-kind-of-open-source-project-is-android - -What kind of open-source project is Android? - -Google oversees the development of the core Android open-source platform, and works to create robust developer and user communities. For the most part the Android source code is licensed under the permissive Apache Software License 2.0, rather than a "copyleft" license. The main reason for this is because our most important goal is widespread adoption of the software, and we believe that the ASL2.0 license best achieves that goal. - -+++ - -See file NOTICE.txt in this folder ! diff --git a/make/lib/android-sdk/21/NOTICE.txt b/make/lib/android-sdk/21/NOTICE.txt deleted file mode 100644 index 1fdb31d..0000000 --- a/make/lib/android-sdk/21/NOTICE.txt +++ /dev/null @@ -1,195 +0,0 @@ -Notice for all the files in this folder. ------------------------------------------------------------- - - - - Copyright (c) 2005-2008, The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - diff --git a/make/lib/android-sdk/15/LICENSE.txt b/make/lib/android-sdk/24/LICENSE.txt index c817537..b227731 100644 --- a/make/lib/android-sdk/15/LICENSE.txt +++ b/make/lib/android-sdk/24/LICENSE.txt @@ -8,3 +8,7 @@ Google oversees the development of the core Android open-source platform, and wo +++ See file NOTICE.txt in this folder ! + ++++ + +Also see https://source.android.com/setup/start/licenses diff --git a/make/lib/android-sdk/15/NOTICE.txt b/make/lib/android-sdk/24/NOTICE.txt index 1fdb31d..1fdb31d 100644 --- a/make/lib/android-sdk/15/NOTICE.txt +++ b/make/lib/android-sdk/24/NOTICE.txt diff --git a/make/lib/android-sdk/21/android-java-src.txt b/make/lib/android-sdk/24/android-java-src.txt index 08885eb..f4a9033 100644 --- a/make/lib/android-sdk/21/android-java-src.txt +++ b/make/lib/android-sdk/24/android-java-src.txt @@ -2,7 +2,7 @@ Retrieved from public sources as described in script below. ++++ -cd /android-sdk-linux_x86/sources/android-21 +cd /android-sdk-linux_x86/sources/android-24 jar cvf android-java-src.zip android com javax/microedition/khronos diff --git a/make/lib/android-sdk/21/android-java-src.zip b/make/lib/android-sdk/24/android-java-src.zip Binary files differindex ea21003..a8d38e9 100644 --- a/make/lib/android-sdk/21/android-java-src.zip +++ b/make/lib/android-sdk/24/android-java-src.zip diff --git a/make/lib/android-sdk/21/android.jar b/make/lib/android-sdk/24/android.jar Binary files differindex 71cf198..05855c9 100644 --- a/make/lib/android-sdk/21/android.jar +++ b/make/lib/android-sdk/24/android.jar diff --git a/make/lib/android-sdk/9/LICENSE.txt b/make/lib/android-sdk/9/LICENSE.txt deleted file mode 100644 index c817537..0000000 --- a/make/lib/android-sdk/9/LICENSE.txt +++ /dev/null @@ -1,10 +0,0 @@ - -http://source.android.com/faqs.html#what-kind-of-open-source-project-is-android - -What kind of open-source project is Android? - -Google oversees the development of the core Android open-source platform, and works to create robust developer and user communities. For the most part the Android source code is licensed under the permissive Apache Software License 2.0, rather than a "copyleft" license. The main reason for this is because our most important goal is widespread adoption of the software, and we believe that the ASL2.0 license best achieves that goal. - -+++ - -See file NOTICE.txt in this folder ! diff --git a/make/lib/android-sdk/9/NOTICE.txt b/make/lib/android-sdk/9/NOTICE.txt deleted file mode 100644 index 1fdb31d..0000000 --- a/make/lib/android-sdk/9/NOTICE.txt +++ /dev/null @@ -1,195 +0,0 @@ -Notice for all the files in this folder. ------------------------------------------------------------- - - - - Copyright (c) 2005-2008, The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - diff --git a/make/lib/android-sdk/9/android-java-src.txt b/make/lib/android-sdk/9/android-java-src.txt deleted file mode 100644 index da7d9fb..0000000 --- a/make/lib/android-sdk/9/android-java-src.txt +++ /dev/null @@ -1,22 +0,0 @@ -Retrieved from public sources as described in script below. - -++++ - -#! bin/sh - -git clone git://git.source.android.com/platform/frameworks/base android-api -cd android-api/ -git checkout gingerbread-release - -zipfile=./android-java-src.zip - -rm -f $zipfile - -jar cvf $zipfile -C core/java . - -for i in `find . -maxdepth 2 -name java` ; do - if [ "$i" != "core/java" ] ; then - jar uvf $zipfile -C $i . - fi -done - diff --git a/make/lib/android-sdk/9/android-java-src.zip b/make/lib/android-sdk/9/android-java-src.zip Binary files differdeleted file mode 100644 index 59e4979..0000000 --- a/make/lib/android-sdk/9/android-java-src.zip +++ /dev/null diff --git a/make/lib/android-sdk/9/android.jar b/make/lib/android-sdk/9/android.jar Binary files differdeleted file mode 100644 index 7729ac2..0000000 --- a/make/lib/android-sdk/9/android.jar +++ /dev/null diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh index 60e35d6..225aa8d 100755 --- a/make/scripts/make.gluegen.all.linux-x86_64.sh +++ b/make/scripts/make.gluegen.all.linux-x86_64.sh @@ -20,9 +20,9 @@ fi # -Dc.compiler.debug=true \ # -Djavacdebuglevel="source,lines,vars" \ -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" |