aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* jogamp-fat.jar Main-Class VersionApplet -> GLWindowSven Gothel2020-01-011-1/+1
| | | | | | As we can no more rely on having AWT headful system, use JOGL/NEWT GLWindow to simply dump the version. Hence 'java -jar jogamp-fat.jar' behaves similar to 'etc/test.sh'.
* make/lib/gluegen-cpptasks* set 'is64Bit' where appropriate (no impact, but ↵Sven Gothel2020-01-013-0/+3
| | | | added for correctness)
* add optional make/lib/gluegen/cpptasks* for iOS aarch64 and amd64Sven Gothel2020-01-012-0/+29
|
* update make-all scriptSven Gothel2020-01-011-6/+16
|
* Bug 1417: Update ant-cpptasks to commit c45a19eadc4c697b7cc1b095692b04deb73da5ceSven Gothel2019-12-311-0/+0
|
* WeakIdentityHashMap: Always null check on weakRef.get(); ↵Sven Gothel2019-12-311-18/+23
| | | | IdentityWeakReference: hash is final.
* WeakIdentityHashMap: Refine capacity computation; Bitfield.Util add ↵Sven Gothel2019-12-312-2/+105
| | | | 'PowerOf2' functions
* WeakIdentityHashMap: Cleanup; Implement putAll(..); Make ↵Sven Gothel2019-12-311-30/+61
| | | | IdentityWeakReference static
* Add WeakIdentityHashMap implementation (from Apache Avro)Sven Gothel2019-12-302-2/+250
| | | | | | | | | | Origin <https://github.com/apache/avro/blob/master/lang/java/avro/src/main/java/org/apache/avro/util/WeakIdentityHashMap.java> from their commit 70260919426f89825ca148f5ee815f3b2cf4764d. Apache License Version 2.0 until. Using our JogAmp 'New BSD 2-Clause License' for changes after this initial commit. Related to Bug 1312, where we like to utilize a WeakIdentityHashMap, allowing to have cached shared GLContext to disappear .. a compromise.
* Bug 1417 - Android: Use d8 for dex'ing w/ implicit Java8 desugaring (macro: ↵Sven Gothel2019-12-262-5/+31
| | | | | | | | | | | | | | | aapt.signed) The new SDK d8 dex'ing tool performs Java8 desugaring, hence allows using Java8 code style. We use d8 instead of dx in the 'aapt.signed' macro of 'jogamp-androidtasks.xml'. For the proper desugaring, we pass 'android-min.jar and 'target.rt.jar' Android and Java8 system runtime jar-files to d8's classpath. Macro 'aapt.signed' also receives the new optional element 'd8-classpaths' to allows caller to pass further required jar-files to the d8 classpath. See build-test.xml.
* Bug 1417 - Android: Context.MODE_WORLD_READABLE causes SecurityException on ↵Sven Gothel2019-12-262-2/+2
| | | | API >= 24, use Context.MODE_PRIVATE for temp cache
* Bug 1417 - Android: jogamp-env.xml: Elaborate on Android SDK API versions ↵Sven Gothel2019-12-264-6/+30
| | | | required [min=21, target=28], javac w/ 24, some NDK's clang with 22.
* Bug 1417 - Android: Add adb scripts to force-stop and clear all jogamp tasks ↵Sven Gothel2019-12-262-0/+28
| | | | and packages
* Bug 1417 - Android: Add ANDROID_TOOLCHAIN_SYSROOT1_INC_STL for LLVM's C++ ↵Sven Gothel2019-12-244-34/+57
| | | | | | | | | | | | | | | | | | | STL headers (default since NDK r18) Using LLVM's c++_shared as of NDK r18: https://developer.android.com/ndk/guides/cpp-support.html LLVM's c++ headers must come before other system header! Also see https://github.com/android/ndk/issues/452 and https://gitlab.kitware.com/cmake/cmake/issues/17059 Also adapt make/lib/gluegen-cpptask-android* files: - Compiler -- align for potential C++ usage, i.e.: -- don't use '-sysroot' not '-isysroot' -- IF using C++ STL, prepend ANDROID_TOOLCHAIN_SYSROOT1_INC_STL -- just add normal sysroot headers via '-isystem' - Linker -- Use ANDROID_TOOLCHAIN_SYSROOT1_LIB1 and ANDROID_TOOLCHAIN_SYSROOT1_LIB2 for '-L' search path -- where ANDROID_TOOLCHAIN_SYSROOT1_LIB2 is for 'libc++' -> 'c++_shared'
* Bug 1417 - Android: Add ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH for arch ↵Sven Gothel2019-12-244-0/+37
| | | | | | | | | specific includes like asm/types.h Also adapt make/lib/gluegen-cpptask-android* files: - Set C++ stdlib = libstdc++ - Set isysroot (same as sysroot) - Add isystem: *_SYSROOT1_INC, *_SYSROOT1_INC_ARCH and *_SYSROOT1_INC/c++/v1
* Bug 1417 - Android: Classify SYSROOTs in NDK for native libraries (link) and ↵Sven Gothel2019-12-234-43/+54
| | | | | | | | | | | | | | | | | | | headers (compile) Utilizing '-sysroot' with the linker, we require standard FS layout. '~/Android/Sdk/ndk/20.1.5948944/platforms/android-24/arch-arm64' contains the proper std FS layout for libraries under usr/lib, but lacks the header files. We call this 'ANDROID_TOOLCHAIN_SYSROOT0' and shall be used for linking. '~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot' native libraries are not under std FS layout, but headers are under std FS layout for compilation under usr/include. We call this 'ANDROID_TOOLCHAIN_SYSROOT1' and shall be used for compilation. Identified while working on openal-soft Android compilation, where we need to pass ANDROID_TOOLCHAIN_SYSROOT0
* Bug 1417 - Android: Update cpptask, using implicit 'soname' setup, which ↵Sven Gothel2019-12-122-3/+2
| | | | | | | | scales better for all platforms. http://jogamp.org/git/?p=ant-cpptasks.git commit 8353e0cc85705ca8f81f8563ad975026978b6745
* Bug 1417 - Android: Resulting dynamic libraries require the 'soname' to be ↵Sven Gothel2019-12-101-1/+4
| | | | | | set since API level 23 TODO: Do this for all JogAmp modules!
* Bug 1417 - Android: Manifest*-android* can no more have 'Name: <folder>' ↵Sven Gothel2019-12-102-9/+0
| | | | | | | | | directives for apk The 'Name <folder>' leads new apk to claim the missing resources (the folder actually) and fails to install the apk. Hence removed tagging the folders sealed.
* Bug 1417 - Android: Add new x86 MachineDataInfo, differs due to smaller ↵Sven Gothel2019-12-101-0/+3
| | | | 'long double' than regular x86_32_unix
* Bug 1417 - Android: Update cpptasks.jarSven Gothel2019-12-101-0/+0
| | | | | | | http://jogamp.org/git/?p=ant-cpptasks.git commit e1933c74b9c256332cd12c9a1094e4687b535112 Bug 1417 Android clang support: Introduce clangLinkerOption '-target <abi>'
* Bug 1417 - Android: Complete 1st round: ↵Sven Gothel2019-12-107-197/+199
| | | | | | | | | make/lib/gluegen-cpptask-android-<abi>.xml and scripts All aligned now - gluegen-cpptasks-android-aarch64.xml - gluegen-cpptasks-android-armv6.xml (this has ld flag --no-undefined disabled, due to internal missing symbols) - gluegen-cpptasks-android-x86.xml
* Bug 1417 - Android: Support building using current SDK and NDK v20 as of ↵Sven Gothel2019-12-106-145/+375
| | | | | | | | | | | | | | | 2019-12-10 (GlueGen w/ android-aarch64 patched) Default Platform: Android 7.0 Nougat, API level 24 supports Java 1.8 Reworked gluegen/make/scripts/setenv-android-tools.sh, following canonical environment variables and sets all required variables for cross-compilation. See file's comments! ant files: - android.version -> android.api.level (default 24) - android.jar defaults to ${gluegen.root}/make/lib/android-sdk/24/android.jar (provided)
* Bug 1412 - JNI: GlueGen JavaEmitter: Check & Handle Exception after calling ↵Sven Gothel2019-12-061-0/+7
| | | | | | | back into Java The generated JNI code JVMUtil_NewDirectByteBufferCopy(..) calls Buffers.newDirectByteBuffer(..) and potential exceptions should be checked.
* Scripts: Macos /opt-share -> /usr/local (Catalina Read-Only)Sven Gothel2019-12-023-9/+9
|
* Fix gluegen-cpptasks-base.xml for crosscompilation, failed due to unset ↵Sven Gothel2019-11-291-64/+69
| | | | | | | | | | | | supposedly detected mandatory new properties Move new detected build properties build.dynamiclibs, build.staticlibs and output.lib.type from gluegen.cpptasks.detect.os.1 to gluegen.cpptasks.detect.os. This enables setting these mandatory properties always, as gluegen.cpptasks.detect.os.1 gets overriden by custom cross-compilation configurations. Also moving the property dump from gluegen.cpptasks.detect.os.1 to gluegen.cpptasks.detect.os for same reasons.
* minor autocleanup (final removed from static)Sven Gothel2019-11-281-1/+1
|
* Bug 1363: Java 11: Extract and extend sun.misc.Unsafe functionality to ↵java11iosSven Gothel2019-09-042-28/+234
| | | | | | | | | | | | | | | UnsafeUtil UnsafeUtil centralizes the workarounds (hack) of certain Java>=9 modularization encapsulation pitfalls, where no exports have been defined. The last resort. 1) Buffers utilizes UnsafeUtil for Java>=9 invokeCleaner. 2) To gain access for certain methods + fields w/o 'illegal access warnings', we have to temporarily disable the IllegalAccessLogger. Hence we provide a method 'T doWithoutIllegalAccessLogger(..<T> action)' for our essential module access under Java >= 9.
* Fix JogAmp Next Release Number: 2.4.0Sven Gothel2019-09-041-1/+1
|
* Bug 1363: Java 11: Use new Android SDK 24 for Eclipse Android .classpathSven Gothel2019-09-041-1/+1
|
* Bug 1363: Java 11: Revert CStructAnnotationProcessor's ↵Sven Gothel2019-08-191-1/+1
| | | | | | | | | | | | | | | | | @SupportedSourceVersion back to 11 Behold, the issue as documented at commit 2d89df89453c099d4e357aa17eae88efcf1d1b70, one build machine failing to compile SourceVersion.RELEASE_11 was due to an incomplete installation of openjdk-11-jdk on Debian GNU/Linux. Wow. I have re-installed the openjdk-11-jre and openjdk-11-jdk packages on said machine, ensured they are being used .. and it works. Another note here regarding usage of OpenJDK11 compile time environment and Java8 target. If using Eclipse, I had to set the system runtime JDK to JDK 8. Otherwise the 'editor clean-up' jobs would run against the JDK 11 classes and wrongly so change certain type castings etc, incompatible with Java 8. If anybody knows a solution here .. shoot.
* Bug 1363: Java 11: Document Java8 target constraints; Fix one odd compile issueSven Gothel2019-08-193-1/+8
| | | | | | | | | | | | | | Document Java8 target constraints, i.e. where we need to set source, target and bootclasspath to ensure target runtime Java8 compliance. Fix one odd compile issue! Using two theorethical identical GNU/Linux Debian 10 machines with same set of installed software, one passes (like MacOS, Windows) and one fails. The failure was due to the CStructAnnotationProcessor's @SupportedSourceVersion tag. This downgrades the SourceVersion's previous bump from 6->11 (commit 610493b1724b5d91327f478338ff5d029bdcc032) down to 8. Interesting times ..
* Windows Regression: Mingw64 8.1.0 using statical linked tool lib ↵Sven Gothel2019-08-196-16/+293
| | | | | | | | | | | | | | | | | | | Test1p1Test1p1JavaEmitter 'com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter' exposes a regression using MingW64 8.1.0: System.loadLibrary() gives a "Can't find dependent libraries". Here, 'Bindingtest1p1' is linked against 'test1' and fails to load due to its wrong dependent library name within 'Bindingtest1p1'. MingW64 8.1.0 dropped 'libtest1.so' into 'Bindingtest1p1.dll', which is surely wrong. Even passing '-Wl,-soname=test1.dll' didn't help. Note: Such constellation would only work with adding the lib-path to PATH on Windows. Since we don't utilize the method in any of our projects, but use the dynamic library lookup method - this is not a blocker, but wasted some good time.
* Bug 1363: Java 11: Refine Build and Runtime requirements. Fix Java compiler ↵Sven Gothel2019-08-191-9/+16
| | | | | | | test. We allow java [8-10] to pass even thought we require java 11 or greater. This gives us the opportunity to run the junit tests on a java 8 VM (tested).
* Bug 1363: Java 11: Resolve Buffers.Cleaner implementationSven Gothel2019-08-194-13/+68
| | | | | | | | | | | As of Java9, sun.misc.Cleaner has moved to jdk.internal.ref.Cleaner. However, access has been made (under the table) via sun.misc.Unsafe, which we are using for now as we cannot set the jdk.internal.ref.Cleaner method accessible. In this regard, we had to change our Cleaner.clean(..) method using a ByteBuffer instead of a Buffer object paramter. All tests have passed, no more illegal access case running on Java11 has been exposed.
* Build Update: CMake 2.8.10.2 -> 3.15.2 (Windows + MacOS), Mingw64 4.8.1 -> 8.1.0Sven Gothel2019-08-187-31/+39
|
* Bug 1363: Java 11: Complete renaming JEP 178 compatible native lib basename ↵Sven Gothel2019-08-187-9/+9
| | | | | | | | | | gluegen-rt -> gluegen_rt - Fix finding native library for Elf parsing - Fix one unit test - Fix comments Completes commit 330dad069dee5a0cc0480cf5cd9052000004223a
* Bug 1363: Java 11: Adopt java.lib.dir.platform changes to ↵Sven Gothel2019-08-184-4/+20
| | | | make/lib/gluegen-cpptasks-*
* Bug 1363: Java 11: Java version must be 11 or greater; Fix HowToBuild: Give ↵Sven Gothel2019-08-182-16/+27
| | | | detailed build commandline.
* Bug 1363: Java 11: Fix javadoc invocation, drop -source <release> for ↵Sven Gothel2019-08-183-6/+29
| | | | | | | | | | | | | | | | | compile time javac Also prepare the 'target.releaselevel' property to be set by 'RELEASE_LEVEL' environment, however - we do not use it at this point. For now, we build gluegen-rt using '-source 1.8' '-target 1.8' and the bootclasspath of openjdk8 rt.jar to ensure java8 compatibility. Alternatively one could use '--release 8' instead using the java11 distributed modules. However, I think the above method is more safe, only allowing java8 rt.jar to be used for compilation. Further, gluegen.jar is build using '-target 1.8' only, since it musty use java11 sources at least for the javadoc taglet.
* Update HowToBuild (gawk) and windows test scriptsSven Gothel2019-08-183-9/+20
|
* build.xml: Explicitly issue 'clean-temp' at start and in the end of default ↵Sven Gothel2019-08-181-7/+20
| | | | | | | 'all*' targets. This shall ensure that build-temp gets deleted before and after build, removing the transitionary previous build state.
* MacOS shall only scan for .dylib, dropping .jnilib search in NativeLibrarySven Gothel2019-08-181-5/+0
|
* iOS: Fix native symbol generation for WindowsSven Gothel2019-08-181-1/+2
| | | | Regression from commit 8ce56955f989f0d8ac21335ea563f9c7eb111154
* Bug 1363: Java 11: Align gluegen-cpptask-custom.xml template to commit ↵Sven Gothel2019-08-181-1/+5
| | | | f54e4fbaebfec36bd3b523dc4e23f744e8e6a4ef
* Bug 1363: Java 11: Refine 'java.home.dir' and 'java.lib.dir.platform' setup ↵Sven Gothel2019-08-181-37/+117
| | | | | | | | | | | | | | | | | | | | for traditional layout and JEP 220(Java 9+) JEP 220 states it is now optional to use the <arch> subfolder in 'lib' to store native libraries, i.e. 'lib/<arch>/libjava.so' can be flattened to 'lib/libjava.so'. Further the jre subfolder is no more used according to the JEP 220, however, it can be used. Therefor we scan for 'java.home.dir' in the following order: - if '<java.home>/../jre' exists, i.e. we are within the 'jre' folder, use '<java.home>/..'. - otherwise assume <java.home> reflect the flattened actual base folder and use it as is. We scan for 'java.lib.dir.platform' in the following order: - if exists <java.home>/jre/lib/i386/libjava.so -> <java.home>/jre/lib/i386 - if exists <java.home>/lib/i386/libjava.so -> <java.home>/lib/i386 - defaults to flattened <java.home>/lib This way we keep the historical arch information for each platform and stay most flexible for any SDK build layout.
* Fixed JRE path for Linux AMD64 to work for Java 11Wade Walker2019-08-171-1/+1
|
* Fixed minor Ant buildfile consistency issuesWade Walker2019-08-172-1/+2
| | | | These were flagged as errors by Eclipse, and appear legitimate, but didn't make the command line build fail.
* Fixed java.home directory and removed obsolete tools.jarWade Walker2019-08-165-33/+21
| | | | | | In Java 9+, there's no longer a "jre" directory in the installation, so removed references to it. The tools.jar file also no longer exists in Java installations (it's now stored in a secret non-JAR format), so removed that as well.
* Fixed CStruct annotation processor to not use dummy Java variable typesWade Walker2019-08-162-2/+2
| | | | | | | | | When annotations were placed on dummy Java variables, the annotation processor was emitting a RenameJavaType directive into the gluegen config file that caused the emitted file to be named boolean.java instead of RenderingConfig.java or Pixel.java. Turned off this behavior when jname is given in the @CStruct annotation. I'm uncertain how much this processor is even used, since I can't find any occurrences of @CStruct outside the test code for it in gluegen.