diff options
Diffstat (limited to 'make/lib')
52 files changed, 602 insertions, 440 deletions
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/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/15/android-java-src.txt b/make/lib/android-sdk/24/android-java-src.txt index d3d6103..f4a9033 100644 --- a/make/lib/android-sdk/15/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-15 +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/15/android.jar b/make/lib/android-sdk/24/android-java-src.zip Binary files differindex efbb7a3..a8d38e9 100644 --- a/make/lib/android-sdk/15/android.jar +++ b/make/lib/android-sdk/24/android-java-src.zip diff --git a/make/lib/android-sdk/24/android.jar b/make/lib/android-sdk/24/android.jar Binary files differnew file mode 100644 index 0000000..05855c9 --- /dev/null +++ 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/lib/cpptasks-version.txt b/make/lib/cpptasks-version.txt index 339d395..231d444 100755 --- a/make/lib/cpptasks-version.txt +++ b/make/lib/cpptasks-version.txt @@ -1,5 +1,6 @@ Current cpptasks is from <http://jogamp.org/git/?p=ant-cpptasks.git;a=summary> +commit 19c854265956942497dc89444a9ee84f18383671 Original cpptasks is from <http://ant-contrib.sourceforge.net/cpptasks/index.html> diff --git a/make/lib/cpptasks.jar b/make/lib/cpptasks.jar Binary files differindex 44a82ed..bd29273 100644 --- a/make/lib/cpptasks.jar +++ b/make/lib/cpptasks.jar diff --git a/make/lib/gluegen-cpptasks-android-aarch64.xml b/make/lib/gluegen-cpptasks-android-aarch64.xml new file mode 100644 index 0000000..37ba226 --- /dev/null +++ b/make/lib/gluegen-cpptasks-android-aarch64.xml @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + This is an example of how to add custom compiler/linker + arguments for a crosscompiler. + + You can use such files with setting the property 'gluegen-cpptasks.file', ie: + + -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml + + In case you want to compile for 32bit on a 64bit machine, + you might also need to set the 'os.arch' to 'x86'. + Example: gluegen/make/make.gluegen.all.linux-x86.sh + --> + +<project name="GlueGen-cpptasks-android-aarch64" basedir="." > + +<!-- Set OS and ARCH for crosscompilation compiler configuration --> +<target name="gluegen.cpptasks.detect.os.custom"> + <property name="gluegen.cpptasks.detected.os" value="true" /> + <property name="is64Bit" value="true" /> + <property name="isUnix" value="true" /> + <property name="isAndroid" value="true" /> + <property name="isAndroidARM64" value="true" /> + <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> + <property name="isCrosscompilation" value="true" /> + <property name="android.abi" value="${env.ANDROID_ABI}" /> <!-- arm64-v8a --> + <property name="isAbiEabiGnuArmel" value="true" /> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-android-aarch64' done"/> +</target> + +<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> + +<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android"> + <echo message="Custom forced compiler Android NDK, linker.cfg.android" /> + <compiler id="compiler.cfg.android" name="clang"> + <!-- compilerarg value="-isystem"/> LLVM's C++ STL + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC_STL}" / --> + <compilerarg value="-isystem"/> + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC}" /> + <compilerarg value="-isystem"/> + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH}" /> + + <compilerarg value="-v" /> + + <compilerarg value="-fpic" /> + + <!-- from sdk cmake start --> + <compilerarg value="-fdata-sections" /> + <compilerarg value="-ffunction-sections" /> + <compilerarg value="-funwind-tables" /> + <compilerarg value="-fstack-protector-strong" /> + <compilerarg value="-no-canonical-prefixes" /> + <compilerarg value="-nostdinc++" /> + <!-- from sdk cmake end --> + + <compilerarg value="-Wa,--noexecstack" /> + + <compilerarg value="-target" /> + <compilerarg value="${env.ANDROID_LLVM_TRIPLE}" /> <!-- aarch64-none-linux-android --> + <!-- compilerarg value="-mabi=lp64" /> + <compilerarg value="-mlittle-endian" /> + <compilerarg value="-march=armv8-a" / --> + <!-- compilerarg value="-mfloat-abi=softfp" / --> + + <!-- Generic ARM Flags --> + <compilerarg value="-fno-strict-aliasing"/> <!-- be safe --> + + <compilerarg value="-O2" unless="c.compiler.use-debug" /> + <!-- compilerarg value="-g" unless="c.compiler.use-debug" / --> + <compilerarg value="-fomit-frame-pointer" unless="c.compiler.use-debug"/> + <!-- compilerarg value="-funswitch-loops" unless="c.compiler.use-debug"/ not supported --> + <!-- compilerarg value="-finline-limit=300" unless="c.compiler.use-debug"/ not supported --> + + <compilerarg value="-O0" if="c.compiler.use-debug" /> + <compilerarg value="-g" if="c.compiler.use-debug" /> + <compilerarg value="-fno-omit-frame-pointer" if="c.compiler.use-debug" /> + + <!-- includepath path="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC}" / --> + <defineset> + <define name="__unix__" /> + <define name="__LP64__" /> <!-- default pre-defined macro for 64bit unix --> + <define name="__aarch64__" /> <!-- default pre-defined macro for armv8-a, 64bit --> + + <define name="ANDROID" /> + <define name="_DEBUG" if="c.compiler.use-debug"/> + <define name="DEBUG" if="c.compiler.use-debug"/> + <define name="NDEBUG" unless="c.compiler.use-debug"/> + </defineset> + </compiler> + + <linker id="linker.cfg.android" name="clang"> + <linkerarg value="--sysroot=${env.ANDROID_TOOLCHAIN_SYSROOT0}" /> <!-- libs in std FS layout, but no include files --> + <linkerarg value="-L${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB1}" /> + <linkerarg value="-Wl,-rpath-link=${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB1}" /> + <linkerarg value="-L${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB2}" /> + + <linkerarg value="-v" /> + + <linkerarg value="-fpic" /> + + <!-- from sdk cmake start --> + <linkerarg value="-Wl,--build-id" /> + <!-- linkerarg value="-Wl,- -no-warn-shared-textrel" / unrecognized option --> + <linkerarg value="-Wl,--fatal-warnings" /> + <linkerarg value="-nostdlib" /> + <linkerarg value="-nostdlib++" /> + <!-- from sdk cmake end --> + + <linkerarg value="-fno-use-linker-plugin" /> + + <linkerarg value="-target" /> + <linkerarg value="${env.ANDROID_LLVM_TRIPLE}" /> <!-- aarch64-none-linux-android --> + <!-- linkerarg value="-mabi=lp64" /> + <linkerarg value="-mlittle-endian" /> + <linkerarg value="-march=armv8-a" / --> + <!-- linkerarg value="-mfloat-abi=softfp" / --> + + <linkerarg value="-Bdynamic" /> + <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> + <linkerarg value="-Wl,-z,nocopyreloc" /> + + <linkerarg value="--no-undefined" /> + + <!-- libset libs="c,m,dl,log" / --> + <libset libs="c,m,dl" /> + </linker> + +</target> + +<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir"> + <echo message="Custom forced Linux.x86 cross compile android" /> + <property name="compiler.cfg.id.base" value="compiler.cfg.android" /> + <property name="linker.cfg.id.base" value="linker.cfg.android" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> + <available property="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" + file="${java.home.dir}/jre/lib/i386/libjava.so"/> + <available property="java.lib.dir.platform" value="${java.home.dir}/lib/i386" + file="${java.home.dir}/lib/i386/libjava.so"/> + <property name="java.lib.dir.platform" value="${java.home.dir}/lib"/> <!-- new default --> +</target> + +<target name="declare.linux.android"> + <echo message="android.${env.ANDROID_ABI}" /> + <property name="compiler.cfg.id" value="compiler.cfg.android" /> + <property name="linker.cfg.id" value="linker.cfg.android" /> +</target> + +</project> + + diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml index 733f623..ca95a96 100644 --- a/make/lib/gluegen-cpptasks-android-armv6.xml +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -23,7 +23,7 @@ <property name="isAndroidARMv6" value="true" /> <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> <property name="isCrosscompilation" value="true" /> - <property name="android.abi" value="armeabi" /> + <property name="android.abi" value="${env.ANDROID_ABI}" /> <!-- armeabi-v7a --> <property name="isAbiEabiGnuArmel" value="true" /> <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-android-armv6' done"/> </target> @@ -32,39 +32,57 @@ <target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android"> <echo message="Custom forced compiler Android NDK, linker.cfg.android" /> - <compiler id="compiler.cfg.android" name="gcc"> - <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> - <!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin will not find - subprograms properly (see gcc -print-search-dirs). Not sure if this is a bug in the NDK - or not. Need to explicitly indicate where subprograms are with -B. - NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN_ROOT/bin. --> - <compilerarg value="-B${env.NDK_TOOLCHAIN_ROOT}/libexec/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" /> + <compiler id="compiler.cfg.android" name="clang"> + <!-- compilerarg value="-isystem"/> LLVM's C++ STL + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC_STL}" / --> + <compilerarg value="-isystem"/> + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC}" /> + <compilerarg value="-isystem"/> + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH}" /> + <compilerarg value="-v" /> + + <compilerarg value="-fpic" /> + + <!-- from sdk cmake start --> + <compilerarg value="-fdata-sections" /> <compilerarg value="-ffunction-sections" /> <compilerarg value="-funwind-tables" /> - <compilerarg value="-fstack-protector" /> - <compilerarg value="-fpic" /> + <compilerarg value="-fstack-protector-strong" /> + <compilerarg value="-no-canonical-prefixes" /> + <compilerarg value="-nostdinc++" /> + <!-- from sdk cmake end --> - <compilerarg value="-march=armv6" /> + <compilerarg value="-Wa,--noexecstack" /> + + <compilerarg value="-target" /> + <compilerarg value="${env.ANDROID_LLVM_TRIPLE}" /> <!-- armv7-none-linux-androideabi --> + <compilerarg value="-mfpu=neon" /> <!-- with NEON by default since NDK r21 --> + <!-- compilerarg value="-march=armv6" /> <compilerarg value="-mfloat-abi=softfp" /> - <compilerarg value="-marm" /> + <compilerarg value="-marm" / --> - <compilerarg value="-g" if="c.compiler.use-debug" /> - <compilerarg value="-O0" if="c.compiler.use-debug" /> - <compilerarg value="-Os" unless="c.compiler.use-debug" /> - <!--<compilerarg value="-O2" /> --> + <!-- Generic ARM Flags --> + <compilerarg value="-fno-strict-aliasing"/> <!-- be safe --> - <compilerarg value="-fomit-frame-pointer" /> - <compilerarg value="-fno-strict-aliasing" /> - <compilerarg value="-finline-limit=64" /> - <compilerarg value="-Wa,--noexecstack" /> - <includepath path="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}/include" /> <!-- for stdarg.h --> + <compilerarg value="-O2" unless="c.compiler.use-debug" /> + <!-- compilerarg value="-g" unless="c.compiler.use-debug" /--> + <compilerarg value="-fomit-frame-pointer" unless="c.compiler.use-debug"/> + <!-- compilerarg value="-funswitch-loops" unless="c.compiler.use-debug"/ not supported --> + <!-- compilerarg value="-finline-limit=300" unless="c.compiler.use-debug"/ not supported --> + + <compilerarg value="-O0" if="c.compiler.use-debug" /> + <compilerarg value="-g" if="c.compiler.use-debug" /> + <compilerarg value="-fno-omit-frame-pointer" if="c.compiler.use-debug" /> + + <!-- includepath path="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC}" / --> <defineset> <define name="__unix__" /> <define name="__ARM_ARCH_5__" /> <define name="__ARM_ARCH_5T__" /> <define name="__ARM_ARCH_5E__" /> <define name="__ARM_ARCH_5TE__" /> + <define name="HAVE_NEON" /> <define name="ANDROID" /> <define name="_DEBUG" if="c.compiler.use-debug"/> <define name="DEBUG" if="c.compiler.use-debug"/> @@ -72,31 +90,42 @@ </defineset> </compiler> - <linker id="linker.cfg.android" name="gcc"> - <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> - <linkerarg value="-fpic" /> - <linkerarg value="-fno-use-linker-plugin" /> - - <linkerarg value="-march=armv6" /> - <linkerarg value="-mfloat-abi=softfp" /> - <linkerarg value="-marm" /> - - <linkerarg value="-nostdlib" /> - <linkerarg value="-Bdynamic" /> - <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> - <linkerarg value="-Wl,-z,nocopyreloc" /> - - <linkerarg value="--demangle" /> - <linkerarg value="--gc-sections" /> - <linkerarg value="--no-undefined" /> - <linkerarg value="-static-libgcc"/> - <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told - where to find libgcc as the default location (gcc -print-search-dirs) - is not correct. Not sure if this is a bug in the NDK or not. We also - enforce that libgcc is linked after source files but before other shared - libraries. --> - <libset dir="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" libs="gcc" /> - <libset libs="c,m,dl" /> + <linker id="linker.cfg.android" name="clang"> + <linkerarg value="--sysroot=${env.ANDROID_TOOLCHAIN_SYSROOT0}" /> <!-- libs in std FS layout, but no include files --> + <linkerarg value="-L${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB1}" /> + <linkerarg value="-Wl,-rpath-link=${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB1}" /> + <linkerarg value="-L${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB2}" /> + + <linkerarg value="-v" /> + + <linkerarg value="-fpic" /> + + <!-- from sdk cmake start --> + <linkerarg value="-Wl,--build-id" /> + <linkerarg value="-Wl,--no-warn-shared-textrel" /> + <linkerarg value="-Wl,--fatal-warnings" /> + <linkerarg value="-nostdlib" /> + <linkerarg value="-nostdlib++" /> + <!-- from sdk cmake end --> + + <linkerarg value="-fno-use-linker-plugin" /> + + <linkerarg value="-target" /> + <linkerarg value="${env.ANDROID_LLVM_TRIPLE}" /> <!-- armv7-none-linux-androideabi --> + <linkerarg value="-mfpu=neon" /> <!-- with NEON by default since NDK r21 --> + <!-- + <linkerarg value="-march=armv6" /> + <linkerarg value="-mfloat-abi=softfp" /> + <linkerarg value="-marm" /> --> + + <linkerarg value="-Bdynamic" /> + <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> + <linkerarg value="-Wl,-z,nocopyreloc" /> + + <!-- linkerarg value="- -no-undefined" / --> + + <!-- libset libs="c,m,dl,log" / --> + <libset libs="c,m,dl" /> </linker> </target> @@ -105,14 +134,18 @@ <echo message="Custom forced Linux.x86 cross compile android" /> <property name="compiler.cfg.id.base" value="compiler.cfg.android" /> <property name="linker.cfg.id.base" value="linker.cfg.android" /> - <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> + <available property="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" + file="${java.home.dir}/jre/lib/i386/libjava.so"/> + <available property="java.lib.dir.platform" value="${java.home.dir}/lib/i386" + file="${java.home.dir}/lib/i386/libjava.so"/> + <property name="java.lib.dir.platform" value="${java.home.dir}/lib"/> <!-- new default --> </target> <target name="declare.linux.android"> - <echo message="android.arm" /> - <property name="compiler.cfg.id" value="compiler.cfg.android" /> - <property name="linker.cfg.id" value="linker.cfg.android" /> + <echo message="android.${env.ANDROID_ABI}" /> + <property name="compiler.cfg.id" value="compiler.cfg.android" /> + <property name="linker.cfg.id" value="linker.cfg.android" /> </target> </project> diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml deleted file mode 100644 index d854d4f..0000000 --- a/make/lib/gluegen-cpptasks-android-armv7.xml +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - This is an example of how to add custom compiler/linker - arguments for a crosscompiler. - - You can use such files with setting the property 'gluegen-cpptasks.file', ie: - - -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml - - In case you want to compile for 32bit on a 64bit machine, - you might also need to set the 'os.arch' to 'x86'. - Example: gluegen/make/make.gluegen.all.linux-x86.sh - --> - -<project name="GlueGen-cpptasks-android-armv7" basedir="." > - -<!-- Set OS and ARCH for crosscompilation compiler configuration --> -<target name="gluegen.cpptasks.detect.os.custom"> - <property name="gluegen.cpptasks.detected.os" value="true" /> - <property name="isUnix" value="true" /> - <property name="isAndroid" value="true" /> - <property name="isAndroidARMv6" value="true" /> - <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> - <property name="isCrosscompilation" value="true" /> - <property name="android.abi" value="armeabi-v7a" /> - <property name="isAbiEabiGnuArmel" value="true" /> - <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-android-armv7' done"/> -</target> - -<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> - -<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android"> - <echo message="Custom forced compiler Android NDK, linker.cfg.android" /> - <compiler id="compiler.cfg.android" name="gcc"> - <compilerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> - <!-- The default search dirs for 'gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin will not find - subprograms properly (see gcc -print-search-dirs). Not sure if this is a bug in the NDK - or not. Need to explicitly indicate where subprograms are with -B. - NOTE: This is not necessary if using '$TARGET_TRIPLE-gcc' from $NDK_TOOLCHAIN_ROOT/bin. --> - <compilerarg value="-B${env.NDK_TOOLCHAIN_ROOT}/libexec/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}" /> - - <compilerarg value="-ffunction-sections" /> - <compilerarg value="-funwind-tables" /> - <compilerarg value="-fstack-protector" /> - <compilerarg value="-fpic" /> - - <compilerarg value="-march=armv7-a" /> - <compilerarg value="-mfloat-abi=softfp" /> - <compilerarg value="-marm" /> - - <compilerarg value="-g" if="c.compiler.use-debug" /> - <compilerarg value="-O0" if="c.compiler.use-debug" /> - <compilerarg value="-Os" unless="c.compiler.use-debug" /> - <!--<compilerarg value="-O2" /> --> - - <compilerarg value="-fomit-frame-pointer" /> - <compilerarg value="-fno-strict-aliasing" /> - <compilerarg value="-finline-limit=64" /> - <compilerarg value="-Wa,--noexecstack" /> - <includepath path="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}/include" /> <!-- for stdarg.h --> - <defineset> - <define name="__unix__" /> - <define name="__ARM_ARCH_5__" /> - <define name="__ARM_ARCH_5T__" /> - <define name="__ARM_ARCH_5E__" /> - <define name="__ARM_ARCH_5TE__" /> - <define name="ANDROID" /> - <define name="_DEBUG" if="c.compiler.use-debug"/> - <define name="DEBUG" if="c.compiler.use-debug"/> - <define name="NDEBUG" unless="c.compiler.use-debug"/> - </defineset> - </compiler> - - <linker id="linker.cfg.android" name="gcc"> - <linkerarg value="--sysroot=${env.TARGET_PLATFORM_ROOT}" /> - <linkerarg value="-fpic" /> - <linkerarg value="-fno-use-linker-plugin" /> - - <linkerarg value="-march=armv7-a" /> - <linkerarg value="-mfloat-abi=softfp" /> - <linkerarg value="-marm" /> - - <linkerarg value="-nostdlib" /> - <linkerarg value="-Bdynamic" /> - <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> - <linkerarg value="-Wl,-z,nocopyreloc" /> - - <linkerarg value="--demangle" /> - <linkerarg value="--gc-sections" /> - <linkerarg value="--no-undefined" /> - <linkerarg value="-static-libgcc"/> - <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin needs to be told - where to find libgcc as the default location (gcc -print-search-dirs) - is not correct. Not sure if this is a bug in the NDK or not. We also - enforce that libgcc is linked after source files but before other shared - libraries. --> - <libset dir="${env.NDK_TOOLCHAIN_ROOT}/lib/gcc/${env.TARGET_TRIPLE}/${env.GCC_VERSION}/armv7-a" libs="gcc" /> - <libset libs="c,m,dl" /> - </linker> - -</target> - -<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir"> - <echo message="Custom forced Linux.x86 cross compile android" /> - <property name="compiler.cfg.id.base" value="compiler.cfg.android" /> - <property name="linker.cfg.id.base" value="linker.cfg.android" /> - <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> -</target> - -<target name="declare.linux.android"> - <echo message="android.arm" /> - <property name="compiler.cfg.id" value="compiler.cfg.android" /> - <property name="linker.cfg.id" value="linker.cfg.android" /> -</target> - -</project> - - diff --git a/make/lib/gluegen-cpptasks-android-x86.xml b/make/lib/gluegen-cpptasks-android-x86.xml new file mode 100644 index 0000000..8b53635 --- /dev/null +++ b/make/lib/gluegen-cpptasks-android-x86.xml @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + This is an example of how to add custom compiler/linker + arguments for a crosscompiler. + + You can use such files with setting the property 'gluegen-cpptasks.file', ie: + + -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml + + In case you want to compile for 32bit on a 64bit machine, + you might also need to set the 'os.arch' to 'x86'. + Example: gluegen/make/make.gluegen.all.linux-x86.sh + --> + +<project name="GlueGen-cpptasks-android-x86" basedir="." > + +<!-- Set OS and ARCH for crosscompilation compiler configuration --> +<target name="gluegen.cpptasks.detect.os.custom"> + <property name="gluegen.cpptasks.detected.os" value="true" /> + <property name="isUnix" value="true" /> + <property name="isAndroid" value="true" /> + <property name="isAndroidX86" value="true" /> + <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> + <property name="isCrosscompilation" value="true" /> + <property name="android.abi" value="${env.ANDROID_ABI}" /> <!-- x86 --> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-android-x86' done"/> +</target> + +<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> + +<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir,declare.linux.android"> + <echo message="Custom forced compiler Android NDK, linker.cfg.android" /> + <compiler id="compiler.cfg.android" name="clang"> + <!-- compilerarg value="-isystem"/> LLVM's C++ STL + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC_STL}" / --> + <compilerarg value="-isystem"/> + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC}" /> + <compilerarg value="-isystem"/> + <compilerarg value="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH}" /> + + <compilerarg value="-v" /> + + <compilerarg value="-fpic" /> + + <!-- from sdk cmake start --> + <compilerarg value="-fdata-sections" /> + <compilerarg value="-ffunction-sections" /> + <compilerarg value="-funwind-tables" /> + <compilerarg value="-fstack-protector-strong" /> + <compilerarg value="-no-canonical-prefixes" /> + <compilerarg value="-nostdinc++" /> + <!-- from sdk cmake end --> + + <compilerarg value="-Wa,--noexecstack" /> + + <compilerarg value="-target" /> + <compilerarg value="${env.ANDROID_LLVM_TRIPLE}" /> <!-- i686-none-linux-android --> + <!-- compilerarg value="-mtune=atom" /> + <compilerarg value="-mssse3" /> + <compilerarg value="-mfpmath=sse" /> + <compilerarg value="-mlong-double-80" / --> + + <!-- Generic Flags --> + <compilerarg value="-fno-strict-aliasing"/> <!-- be safe --> + + <compilerarg value="-O2" unless="c.compiler.use-debug" /> + <!-- compilerarg value="-g" unless="c.compiler.use-debug" / --> + <compilerarg value="-fomit-frame-pointer" unless="c.compiler.use-debug"/> + <!-- compilerarg value="-funswitch-loops" unless="c.compiler.use-debug"/ not supported --> + <!-- compilerarg value="-finline-limit=300" unless="c.compiler.use-debug"/ not supported --> + + <compilerarg value="-O0" if="c.compiler.use-debug" /> + <compilerarg value="-g" if="c.compiler.use-debug" /> + <compilerarg value="-fno-omit-frame-pointer" if="c.compiler.use-debug" /> + + <!-- includepath path="${env.ANDROID_TOOLCHAIN_SYSROOT1_INC}" / --> + <defineset> + <define name="__unix__" /> + + <define name="ANDROID" /> + <define name="_DEBUG" if="c.compiler.use-debug"/> + <define name="DEBUG" if="c.compiler.use-debug"/> + <define name="NDEBUG" unless="c.compiler.use-debug"/> + </defineset> + </compiler> + + <linker id="linker.cfg.android" name="clang"> + <linkerarg value="--sysroot=${env.ANDROID_TOOLCHAIN_SYSROOT0}" /> <!-- libs in std FS layout, but no include files --> + <linkerarg value="-L${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB1}" /> + <linkerarg value="-Wl,-rpath-link=${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB1}" /> + <linkerarg value="-L${env.ANDROID_TOOLCHAIN_SYSROOT1_LIB2}" /> + + <linkerarg value="-v" /> + + <linkerarg value="-fpic" /> + + <!-- from sdk cmake start --> + <linkerarg value="-Wl,--build-id" /> + <linkerarg value="-Wl,--no-warn-shared-textrel" /> + <linkerarg value="-Wl,--fatal-warnings" /> + <linkerarg value="-nostdlib" /> + <linkerarg value="-nostdlib++" /> + <!-- from sdk cmake end --> + + <linkerarg value="-fno-use-linker-plugin" /> + + <linkerarg value="-target" /> + <linkerarg value="${env.ANDROID_LLVM_TRIPLE}" /> <!-- i686-none-linux-android --> + <!-- linkerarg value="-mtune=atom" /> + <linkerarg value="-mssse3" /> + <linkerarg value="-mfpmath=sse" /> + <linkerarg value="-mlong-double-80" / --> + + <linkerarg value="-Bdynamic" /> + <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> + <linkerarg value="-Wl,-z,nocopyreloc" /> + + <linkerarg value="--no-undefined" /> + + <!-- libset libs="c,m,dl,log" / --> + <libset libs="c,m,dl" /> + </linker> + +</target> + +<target name="gluegen.cpptasks.declare.compiler" depends="setup.java.home.dir"> + <echo message="Custom forced Linux.x86 cross compile android" /> + <property name="compiler.cfg.id.base" value="compiler.cfg.android" /> + <property name="linker.cfg.id.base" value="linker.cfg.android" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> + <available property="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" + file="${java.home.dir}/jre/lib/i386/libjava.so"/> + <available property="java.lib.dir.platform" value="${java.home.dir}/lib/i386" + file="${java.home.dir}/lib/i386/libjava.so"/> + <property name="java.lib.dir.platform" value="${java.home.dir}/lib"/> <!-- new default --> +</target> + +<target name="declare.linux.android"> + <echo message="android.${env.ANDROID_ABI}" /> + <property name="compiler.cfg.id" value="compiler.cfg.android" /> + <property name="linker.cfg.id" value="linker.cfg.android" /> +</target> + +</project> + + diff --git a/make/lib/gluegen-cpptasks-ios-aarch64.xml b/make/lib/gluegen-cpptasks-ios-aarch64.xml new file mode 100644 index 0000000..fc6aa6a --- /dev/null +++ b/make/lib/gluegen-cpptasks-ios-aarch64.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="GlueGen-cpptasks-ios-aarch64" basedir="." > + +<!-- Only set 'isIOSArm64' then continue via default task 'gluegen.cpptasks.detect.os.1' etc --> +<target name="gluegen.cpptasks.detect.os.custom"> + <property name="isIOSArm64" value="true" /> + <property name="junit.is.disabled" value="true" /> + <property name="junit.compile.skip" value="true" /> + <property name="test.compile.skip" value="true" /> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-ios-aarch64' done"/> +</target> + +<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> + +</project> + + diff --git a/make/lib/gluegen-cpptasks-ios-amd64.xml b/make/lib/gluegen-cpptasks-ios-amd64.xml new file mode 100644 index 0000000..3f7f802 --- /dev/null +++ b/make/lib/gluegen-cpptasks-ios-amd64.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="GlueGen-cpptasks-ios-amd64" basedir="." > + +<!-- Only set 'isIOSAmd64' then continue via default task 'gluegen.cpptasks.detect.os.1' etc --> +<target name="gluegen.cpptasks.detect.os.custom"> + <property name="isIOSAmd64" value="true" /> + <property name="junit.is.disabled" value="true" /> + <property name="junit.compile.skip" value="true" /> + <property name="test.compile.skip" value="true" /> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-ios-amd64' done"/> +</target> + +<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> + +</project> + diff --git a/make/lib/gluegen-cpptasks-linux-32bit.xml b/make/lib/gluegen-cpptasks-linux-32bit.xml index 69afca8..ad79c25 100644 --- a/make/lib/gluegen-cpptasks-linux-32bit.xml +++ b/make/lib/gluegen-cpptasks-linux-32bit.xml @@ -43,8 +43,12 @@ --> <property name="compiler.cfg.id.base" value="compiler.cfg.linux" /> <property name="linker.cfg.id.base" value="linker.cfg.linux" /> - <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> + <available property="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" + file="${java.home.dir}/jre/lib/i386/libjava.so"/> + <available property="java.lib.dir.platform" value="${java.home.dir}/lib/i386" + file="${java.home.dir}/lib/i386/libjava.so"/> + <property name="java.lib.dir.platform" value="${java.home.dir}/lib"/> <!-- new default --> </target> </project> diff --git a/make/lib/gluegen-cpptasks-linux-aarch64-ontarget.xml b/make/lib/gluegen-cpptasks-linux-aarch64-ontarget.xml new file mode 100644 index 0000000..e2e52fd --- /dev/null +++ b/make/lib/gluegen-cpptasks-linux-aarch64-ontarget.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + This is an example of how to add custom compiler/linker + arguments for a crosscompiler. + + You can use such files with setting the property 'gluegen-cpptasks.file', ie: + + -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-aarch64.xml + + In case you want to compile for 32bit on a 64bit machine, + you might also need to set the 'os.arch' to 'x86'. + Example: gluegen/make/make.gluegen.all.linux-x86.sh + --> + +<project name="GlueGen-cpptasks-linux-aarch64" basedir="." > + +<!-- Set OS and ARCH for crosscompilation compiler configuration --> +<target name="gluegen.cpptasks.detect.os.custom"> + <property name="gluegen.cpptasks.detected.os" value="true" /> + <property name="is64Bit" value="true" /> + <property name="isUnix" value="true" /> + <property name="isLinux" value="true" /> + <property name="isLinuxARM64" value="true" /> + <property name="isX11" value="true" /> + <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> + <property name="isAbiEabiGnuArmhf" value="true" /> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-aarch64' done"/> +</target> + +<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> + +<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir"> + <echo message="Custom forced compiler Linux aarch64 hard float" /> + + <compiler id="compiler.cfg.linux.aarch64" name="gcc"> + <defineset> + <define name="__unix__"/> + <define name="__X11__" if="isX11"/> + <define name="_DEBUG" if="c.compiler.use-debug"/> + <define name="DEBUG" if="c.compiler.use-debug"/> + <define name="NDEBUG" unless="c.compiler.use-debug"/> + </defineset> + <compilerarg value="-fpic" /> + <compilerarg value="-march=armv8-a" /> + <compilerarg value="-include"/> + <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" /> + </compiler> + + <linker id="linker.cfg.linux.aarch64" name="gcc"> + <linkerarg value="-fpic" /> + <linkerarg value="-march=armv8-a" /> + <linkerarg value="-nostdlib" /> + <linkerarg value="-Bdynamic" /> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> + </linker> + +</target> + +</project> diff --git a/make/lib/gluegen-cpptasks-linux-aarch64.xml b/make/lib/gluegen-cpptasks-linux-aarch64.xml new file mode 100644 index 0000000..410589d --- /dev/null +++ b/make/lib/gluegen-cpptasks-linux-aarch64.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + This is an example of how to add custom compiler/linker + arguments for a crosscompiler. + + You can use such files with setting the property 'gluegen-cpptasks.file', ie: + + -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-aarch64.xml + + In case you want to compile for 32bit on a 64bit machine, + you might also need to set the 'os.arch' to 'x86'. + Example: gluegen/make/make.gluegen.all.linux-x86.sh + --> + +<project name="GlueGen-cpptasks-linux-aarch64" basedir="." > + +<!-- Set OS and ARCH for crosscompilation compiler configuration --> +<target name="gluegen.cpptasks.detect.os.custom"> + <property name="gluegen.cpptasks.detected.os" value="true" /> + <property name="is64Bit" value="true" /> + <property name="isUnix" value="true" /> + <property name="isLinux" value="true" /> + <property name="isLinuxARM64" value="true" /> + <property name="isX11" value="true" /> + <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> + <property name="isCrosscompilation" value="true" /> + <property name="isAbiEabiGnuArmhf" value="true" /> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-aarch64' done"/> +</target> + +<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> + +<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir"> + <echo message="Custom forced compiler Linux aarch64 hard float" /> + + <compiler id="compiler.cfg.linux.aarch64" name="gcc"> + <defineset> + <define name="__unix__"/> + <define name="__X11__" if="isX11"/> + <define name="_DEBUG" if="c.compiler.use-debug"/> + <define name="DEBUG" if="c.compiler.use-debug"/> + <define name="NDEBUG" unless="c.compiler.use-debug"/> + </defineset> + <compilerarg value="-fpic" /> + <compilerarg value="-march=armv8-a" /> + <compilerarg value="-include"/> + <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" /> + </compiler> + + <linker id="linker.cfg.linux.aarch64" name="gcc"> + <linkerarg value="-fpic" /> + <linkerarg value="-march=armv8-a" /> + <linkerarg value="-nostdlib" /> + <linkerarg value="-Bdynamic" /> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> + </linker> + +</target> + +</project> diff --git a/make/lib/gluegen-cpptasks-linux-armv6.xml b/make/lib/gluegen-cpptasks-linux-armv6hf-ontarget.xml index 33f5891..5e03246 100644 --- a/make/lib/gluegen-cpptasks-linux-armv6.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6hf-ontarget.xml @@ -13,7 +13,7 @@ Example: gluegen/make/make.gluegen.all.linux-x86.sh --> -<project name="GlueGen-cpptasks-linux-armv6" basedir="." > +<project name="GlueGen-cpptasks-linux-armv6hf" basedir="." > <!-- Set OS and ARCH for crosscompilation compiler configuration --> <target name="gluegen.cpptasks.detect.os.custom"> @@ -23,15 +23,14 @@ <property name="isLinuxARMv6" value="true" /> <property name="isX11" value="true" /> <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" /> - <property name="isCrosscompilation" value="true" /> - <property name="isAbiEabiGnuArmel" value="true" /> - <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv6' done"/> + <property name="isAbiEabiGnuArmhf" value="true" /> + <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv6hf' done"/> </target> <import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" /> <target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir"> - <echo message="Custom forced compiler Linux ARMv5te soft float" /> + <echo message="Custom forced compiler Linux ARMv6t hard float" /> <compiler id="compiler.cfg.linux.armv6" name="gcc"> <defineset> @@ -42,24 +41,26 @@ <define name="NDEBUG" unless="c.compiler.use-debug"/> </defineset> <compilerarg value="-fpic" /> - <compilerarg value="-march=armv5te" /> + <compilerarg value="-march=armv6" /> + <compilerarg value="-mfpu=vfp" /> + <compilerarg value="-mfloat-abi=hard" /> <compilerarg value="-marm" /> - <compilerarg value="-mfloat-abi=softfp" /> <compilerarg value="-include"/> <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" /> </compiler> <linker id="linker.cfg.linux.armv6" name="gcc"> <linkerarg value="-fpic" /> - <linkerarg value="-march=armv5te" /> + <linkerarg value="-march=armv6" /> + <linkerarg value="-mfpu=vfp" /> + <linkerarg value="-mfloat-abi=hard" /> <linkerarg value="-marm" /> - <linkerarg value="-mfloat-abi=softfp" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> + </target> </project> - - diff --git a/make/lib/gluegen-cpptasks-linux-armv6hf.xml b/make/lib/gluegen-cpptasks-linux-armv6hf.xml index 3e0a95a..a7f15a4 100644 --- a/make/lib/gluegen-cpptasks-linux-armv6hf.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6hf.xml @@ -43,8 +43,9 @@ </defineset> <compilerarg value="-fpic" /> <compilerarg value="-march=armv6" /> - <compilerarg value="-marm" /> + <compilerarg value="-mfpu=vfp" /> <compilerarg value="-mfloat-abi=hard" /> + <compilerarg value="-marm" /> <compilerarg value="-include"/> <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" /> </compiler> @@ -52,11 +53,13 @@ <linker id="linker.cfg.linux.armv6" name="gcc"> <linkerarg value="-fpic" /> <linkerarg value="-march=armv6" /> - <linkerarg value="-marm" /> + <linkerarg value="-mfpu=vfp" /> <linkerarg value="-mfloat-abi=hard" /> + <linkerarg value="-marm" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> </target> diff --git a/make/lib/semantic-versioning/README.md b/make/lib/semantic-versioning/README.md index 26f02a2..fe13cc5 100644 --- a/make/lib/semantic-versioning/README.md +++ b/make/lib/semantic-versioning/README.md @@ -150,7 +150,7 @@ the maven-enforcer-plugin and then configure the maven-enforcer-plugin to run th <dependency> <groupId>org.semver</groupId> <artifactId>enforcer-rule</artifactId> - <version>0.9.27</version> + <version>0.9.29</version> </dependency> ... </dependencies> @@ -220,7 +220,7 @@ the maven-enforcer-plugin and then configure the maven-enforcer-plugin to run th <dependency> <groupId>org.semver</groupId> <artifactId>enforcer-rule</artifactId> - <version>0.9.27</version> + <version>0.9.29</version> </dependency> ... </dependencies> @@ -310,7 +310,7 @@ Both rules allow to filter classes/packages: <dependency> <groupId>org.semver</groupId> <artifactId>enforcer-rule</artifactId> - <version>0.9.27</version> + <version>0.9.29</version> </dependency> ``` diff --git a/make/lib/semantic-versioning/VERSION b/make/lib/semantic-versioning/VERSION index 2bac82c..90e9d66 100644 --- a/make/lib/semantic-versioning/VERSION +++ b/make/lib/semantic-versioning/VERSION @@ -1,13 +1,20 @@ https://github.com/sgothel/semantic-versioning forked from https://github.com/jeluard/semantic-versioning -0.9.27-SNAPSHOT +0.9.33-SNAPSHOT -commit 9cdb6bbf6d3248a65aa78ced08211d609c356f91 -Author: Julien Eluard <[email protected]> -Date: Thu Aug 28 01:19:08 2014 -0300 +commit 4f50b49c955f2bde2bb7eb4c7493206ec6bb1f2f +Author: Sven Gothel <[email protected]> +Date: Wed Oct 7 10:40:40 2015 +0200 - Update README.md - -branch jogamp + Fix JLS Binary Compat: Moving methods and fields upwards for classes _and_ interfaces is OK + + - We shall also travers all interfaces upwards + - All methods and fields found upwards must be tested for compatibility as well! + + Further: + - Add class-name to Field- and MethodInfo via new intermediate AbstractMemberInfo. + The class-name is used to have allow differs to find a class move upwards! + + - Pretty printing of class move binary-compatible change diff --git a/make/lib/semantic-versioning/semver-src.zip b/make/lib/semantic-versioning/semver-src.zip Binary files differindex c0e6b02..8ea60af 100644 --- a/make/lib/semantic-versioning/semver-src.zip +++ b/make/lib/semantic-versioning/semver-src.zip diff --git a/make/lib/semantic-versioning/semver.jar b/make/lib/semantic-versioning/semver.jar Binary files differindex bce8e75..fbdcd49 100644 --- a/make/lib/semantic-versioning/semver.jar +++ b/make/lib/semantic-versioning/semver.jar diff --git a/make/lib/toolchain/aarch64-linux-gnueabi/bin/c++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/c++ new file mode 120000 index 0000000..c920aa1 --- /dev/null +++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/c++ @@ -0,0 +1 @@ +/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-c++
\ No newline at end of file diff --git a/make/lib/toolchain/aarch64-linux-gnueabi/bin/cc b/make/lib/toolchain/aarch64-linux-gnueabi/bin/cc new file mode 120000 index 0000000..dbba1df --- /dev/null +++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/cc @@ -0,0 +1 @@ +/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-cc
\ No newline at end of file diff --git a/make/lib/toolchain/aarch64-linux-gnueabi/bin/g++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/g++ new file mode 120000 index 0000000..adeda86 --- /dev/null +++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/g++ @@ -0,0 +1 @@ +/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-g++
\ No newline at end of file diff --git a/make/lib/toolchain/aarch64-linux-gnueabi/bin/gcc b/make/lib/toolchain/aarch64-linux-gnueabi/bin/gcc new file mode 120000 index 0000000..655df00 --- /dev/null +++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/gcc @@ -0,0 +1 @@ +/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-gcc
\ No newline at end of file diff --git a/make/lib/toolchain/aarch64-linux-gnueabi/bin/ld b/make/lib/toolchain/aarch64-linux-gnueabi/bin/ld new file mode 120000 index 0000000..1931f6b --- /dev/null +++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/ld @@ -0,0 +1 @@ +/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-ld.bfd
\ No newline at end of file diff --git a/make/lib/toolchain/aarch64-linux-gnueabi/bin/objdump b/make/lib/toolchain/aarch64-linux-gnueabi/bin/objdump new file mode 120000 index 0000000..26f2062 --- /dev/null +++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/objdump @@ -0,0 +1 @@ +/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-objdump
\ No newline at end of file diff --git a/make/lib/toolchain/aarch64-linux-gnueabi/bin/strip b/make/lib/toolchain/aarch64-linux-gnueabi/bin/strip new file mode 120000 index 0000000..2ecfa61 --- /dev/null +++ b/make/lib/toolchain/aarch64-linux-gnueabi/bin/strip @@ -0,0 +1 @@ +/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-strip
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/c++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/c++ index b625efa..1c36608 120000 --- a/make/lib/toolchain/armhf-linux-gnueabi/bin/c++ +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/c++ @@ -1 +1 @@ -/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-c++
\ No newline at end of file +/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-c++
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/cc b/make/lib/toolchain/armhf-linux-gnueabi/bin/cc index 6b785db..5bd6938 120000 --- a/make/lib/toolchain/armhf-linux-gnueabi/bin/cc +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/cc @@ -1 +1 @@ -/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-cc
\ No newline at end of file +/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-cc
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/g++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/g++ index 29bf2d3..08ee1e8 120000 --- a/make/lib/toolchain/armhf-linux-gnueabi/bin/g++ +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/g++ @@ -1 +1 @@ -/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-g++
\ No newline at end of file +/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-g++
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/gcc b/make/lib/toolchain/armhf-linux-gnueabi/bin/gcc index ad74056..1bc2286 120000 --- a/make/lib/toolchain/armhf-linux-gnueabi/bin/gcc +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/gcc @@ -1 +1 @@ -/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-gcc
\ No newline at end of file +/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-gcc
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/ld b/make/lib/toolchain/armhf-linux-gnueabi/bin/ld index 6d1bd13..2b4985e 120000 --- a/make/lib/toolchain/armhf-linux-gnueabi/bin/ld +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/ld @@ -1 +1 @@ -/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-ld
\ No newline at end of file +/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-ld.bfd
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/objdump b/make/lib/toolchain/armhf-linux-gnueabi/bin/objdump index 9502840..dd058e0 120000 --- a/make/lib/toolchain/armhf-linux-gnueabi/bin/objdump +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/objdump @@ -1 +1 @@ -/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-objdump
\ No newline at end of file +/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-objdump
\ No newline at end of file diff --git a/make/lib/toolchain/armhf-linux-gnueabi/bin/strip b/make/lib/toolchain/armhf-linux-gnueabi/bin/strip index a4ce508..e366f85 120000 --- a/make/lib/toolchain/armhf-linux-gnueabi/bin/strip +++ b/make/lib/toolchain/armhf-linux-gnueabi/bin/strip @@ -1 +1 @@ -/usr/local/x-tools/armhf-unknown-linux-gnueabi/bin/armhf-unknown-linux-gnueabi-strip
\ No newline at end of file +/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-strip
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/c++ b/make/lib/toolchain/armsf-linux-gnueabi/bin/c++ deleted file mode 120000 index b13ecea..0000000 --- a/make/lib/toolchain/armsf-linux-gnueabi/bin/c++ +++ /dev/null @@ -1 +0,0 @@ -/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-c++
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/cc b/make/lib/toolchain/armsf-linux-gnueabi/bin/cc deleted file mode 120000 index 9701ec5..0000000 --- a/make/lib/toolchain/armsf-linux-gnueabi/bin/cc +++ /dev/null @@ -1 +0,0 @@ -/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-cc
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/g++ b/make/lib/toolchain/armsf-linux-gnueabi/bin/g++ deleted file mode 120000 index 5869038..0000000 --- a/make/lib/toolchain/armsf-linux-gnueabi/bin/g++ +++ /dev/null @@ -1 +0,0 @@ -/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-g++
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/gcc b/make/lib/toolchain/armsf-linux-gnueabi/bin/gcc deleted file mode 120000 index 171bfb6..0000000 --- a/make/lib/toolchain/armsf-linux-gnueabi/bin/gcc +++ /dev/null @@ -1 +0,0 @@ -/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-gcc
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/ld b/make/lib/toolchain/armsf-linux-gnueabi/bin/ld deleted file mode 120000 index f10f5b8..0000000 --- a/make/lib/toolchain/armsf-linux-gnueabi/bin/ld +++ /dev/null @@ -1 +0,0 @@ -/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-ld
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/objdump b/make/lib/toolchain/armsf-linux-gnueabi/bin/objdump deleted file mode 120000 index 8e28b95..0000000 --- a/make/lib/toolchain/armsf-linux-gnueabi/bin/objdump +++ /dev/null @@ -1 +0,0 @@ -/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-objdump
\ No newline at end of file diff --git a/make/lib/toolchain/armsf-linux-gnueabi/bin/strip b/make/lib/toolchain/armsf-linux-gnueabi/bin/strip deleted file mode 120000 index 1e5fe91..0000000 --- a/make/lib/toolchain/armsf-linux-gnueabi/bin/strip +++ /dev/null @@ -1 +0,0 @@ -/usr/local/x-tools/armsf-unknown-linux-gnueabi/bin/armsf-unknown-linux-gnueabi-strip
\ No newline at end of file diff --git a/make/lib/v2.2.1/gluegen-rt.jar b/make/lib/v2.2.1/gluegen-rt.jar Binary files differnew file mode 100644 index 0000000..61c5da1 --- /dev/null +++ b/make/lib/v2.2.1/gluegen-rt.jar diff --git a/make/lib/v2.3.0/gluegen-rt.jar b/make/lib/v2.3.0/gluegen-rt.jar Binary files differnew file mode 100644 index 0000000..ed9bacb --- /dev/null +++ b/make/lib/v2.3.0/gluegen-rt.jar diff --git a/make/lib/v2.3.2/gluegen-rt.jar b/make/lib/v2.3.2/gluegen-rt.jar Binary files differnew file mode 100644 index 0000000..742fdb2 --- /dev/null +++ b/make/lib/v2.3.2/gluegen-rt.jar |