[gluegen2] 03/10: Merge tag 'upstream/2.3.1'
Tony Mancill
tmancill at moszumanska.debian.org
Fri Oct 9 03:22:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository gluegen2.
commit d97bfa4ecc5814c3024b881f9592edae1750f9d3
Merge: 443c266 1124bee
Author: tony mancill <tmancill at debian.org>
Date: Tue Jul 14 21:58:32 2015 -0700
Merge tag 'upstream/2.3.1'
Upstream version 2.3.1
.classpath | 2 +
.gitmodules | 3 +
LICENSE.txt | 51 +-
doc/HowToBuild.html | 269 +++
doc/licenses/Apache.LICENSE-2.0 | 202 ++
jcpp/.gitignore | 4 +
jcpp/LICENSE | 201 ++
jcpp/README.md | 31 +
.../java/com/jogamp/gluegen/jcpp/Argument.java | 75 +
.../com/jogamp/gluegen/jcpp/ChrootFileSystem.java | 84 +
.../java/com/jogamp/gluegen/jcpp/CppReader.java | 149 ++
.../main/java/com/jogamp/gluegen/jcpp/CppTask.java | 215 ++
.../gluegen/jcpp/DefaultPreprocessorListener.java | 99 +
.../main/java/com/jogamp/gluegen/jcpp/Feature.java | 42 +
.../com/jogamp/gluegen/jcpp/FileLexerSource.java | 89 +
.../com/jogamp/gluegen/jcpp/FixedTokenSource.java | 59 +
.../com/jogamp/gluegen/jcpp/InputLexerSource.java | 64 +
.../com/jogamp/gluegen/jcpp/InternalException.java | 31 +
.../main/java/com/jogamp/gluegen/jcpp/JCPP.java | 189 ++
.../com/jogamp/gluegen/jcpp/JavaFileSystem.java | 84 +
.../java/com/jogamp/gluegen/jcpp/JoinReader.java | 218 ++
.../com/jogamp/gluegen/jcpp/LexerException.java | 33 +
.../java/com/jogamp/gluegen/jcpp/LexerSource.java | 987 ++++++++
.../main/java/com/jogamp/gluegen/jcpp/Macro.java | 212 ++
.../com/jogamp/gluegen/jcpp/MacroTokenSource.java | 209 ++
.../java/com/jogamp/gluegen/jcpp/NumericValue.java | 215 ++
.../java/com/jogamp/gluegen/jcpp/Preprocessor.java | 2177 +++++++++++++++++
.../jogamp/gluegen/jcpp/PreprocessorCommand.java | 44 +
.../jogamp/gluegen/jcpp/PreprocessorListener.java | 59 +
.../jogamp/gluegen/jcpp/ResourceFileSystem.java | 81 +
.../main/java/com/jogamp/gluegen/jcpp/Source.java | 298 +++
.../com/jogamp/gluegen/jcpp/SourceIterator.java | 88 +
.../main/java/com/jogamp/gluegen/jcpp/State.java | 68 +
.../com/jogamp/gluegen/jcpp/StringLexerSource.java | 53 +
.../main/java/com/jogamp/gluegen/jcpp/Token.java | 193 ++
.../jogamp/gluegen/jcpp/TokenSnifferSource.java | 46 +
.../java/com/jogamp/gluegen/jcpp/TokenType.java | 130 +
.../java/com/jogamp/gluegen/jcpp/VirtualFile.java | 45 +
.../com/jogamp/gluegen/jcpp/VirtualFileSystem.java | 31 +
.../main/java/com/jogamp/gluegen/jcpp/Warning.java | 32 +
.../com/jogamp/gluegen/jcpp/CppReaderTest.java | 77 +
.../java/com/jogamp/gluegen/jcpp/ErrorTest.java | 72 +
.../jogamp/gluegen/jcpp/IncludeAbsoluteTest.java | 55 +
.../jogamp/gluegen/jcpp/JavaFileSystemTest.java | 46 +
.../com/jogamp/gluegen/jcpp/JoinReaderTest.java | 48 +
.../com/jogamp/gluegen/jcpp/LexerSourceTest.java | 147 ++
.../com/jogamp/gluegen/jcpp/NumericValueTest.java | 102 +
.../com/jogamp/gluegen/jcpp/PreprocessorTest.java | 376 +++
.../gluegen/jcpp/TokenPastingWhitespaceTest.java | 59 +
jcpp/src/test/resources/absolute.h | 1 +
jcpp/src/test/resources/once.c | 2 +
jcpp/src/test/resources/once.h | 2 +
jcpp/src/test/resources/test0.c | 61 +
jcpp/src/test/resources/test0.h | 7 +
jcpp/src/test/resources/test1.c | 2 +
jcpp/src/test/resources/test1.h | 7 +
jcpp/src/test/resources/trigraph.c | 1 +
jcpp/src/test/resources/varargs.c | 8 +
make/build-test.xml | 30 +-
make/build.xml | 27 +-
make/elf-header.cfg | 56 +-
make/gluegen-cpptasks-base.xml | 78 +-
make/jogamp-androidtasks.xml | 65 +-
make/jogamp-env.xml | 31 +-
make/scripts/adb-install-all-aarch64.sh | 2 +
make/scripts/adb-install-all-armv6.sh | 2 +-
make/scripts/adb-install-all-armv7.sh | 2 -
...l-all-armv7.sh => adb-reinstall-all-aarch64.sh} | 2 +-
make/scripts/crosstest-junit-android-armv7-rel.sh | 69 -
make/scripts/java-win32.bat | 17 +-
make/scripts/java-win64.bat | 19 +-
.../make.gluegen.all.android-aarch64-cross.sh | 62 +
.../make.gluegen.all.android-armv6-cross.sh | 59 +-
.../make.gluegen.all.android-armv7-cross.sh | 101 -
...x-java7.sh => make.gluegen.all.macosx-java6.sh} | 13 +-
make/scripts/make.gluegen.all.macosx.sh | 5 +-
make/scripts/make.gluegen.all.win32.bat | 4 +-
make/scripts/make.gluegen.all.win64.bat | 4 +-
make/scripts/runtest-x32.bat | 11 +-
make/scripts/runtest-x64.bat | 19 +-
make/scripts/runtest.sh | 45 +-
make/scripts/setenv-android-tools.sh | 79 +
make/scripts/setenv-build-jogl-x86_64.sh | 7 -
make/scripts/test-win32-smb_share.bat | 6 +-
make/stub_includes/gluegen/stdio.h | 7 +
make/stub_includes/jni/jawt.h | 106 +
make/stub_includes/jni/jni.h | 1934 +++++++++++++++
make/stub_includes/jni/macosx/jawt_md.h | 7 +-
make/stub_includes/jni/macosx/jni_md.h | 29 +-
.../jni/{macosx/jni_md.h => win32/jawt_md.h} | 43 +-
make/stub_includes/jni/{macosx => win32}/jni_md.h | 31 +-
.../jni/{macosx/jni_md.h => x11/jawt_md.h} | 45 +-
make/stub_includes/jni/{macosx => x11}/jni_md.h | 21 +-
make/stub_includes/os/elf_header.h | 5 +-
make/stub_includes/platform/glibc-compat-symbols.h | 8 +-
make/stub_includes/platform/gluegen_stddef.h | 2 +-
make/stub_includes/platform/gluegen_stdint.h | 2 +-
src/antlr/com/jogamp/gluegen/cgram/GnuCParser.g | 3 +-
src/antlr/com/jogamp/gluegen/cgram/HeaderParser.g | 531 +++--
src/antlr/com/jogamp/gluegen/cgram/StdCParser.g | 15 +-
src/antlr/com/jogamp/gluegen/jgram/JavaParser.g | 1509 ++++++------
src/java/com/jogamp/common/ExceptionUtils.java | 78 +
.../com/jogamp/common/jvm/JNILibLoaderBase.java | 36 +-
.../com/jogamp/common/net/AssetURLContext.java | 2 +-
src/java/com/jogamp/common/net/Uri.java | 2516 ++++++++++++++++++++
.../net/{URIQueryProps.java => UriQueryProps.java} | 31 +-
src/java/com/jogamp/common/nio/Buffers.java | 40 +-
.../jogamp/common/nio/ByteBufferInputStream.java | 186 ++
.../common/nio/MappedByteBufferInputStream.java | 958 ++++++++
.../common/nio/MappedByteBufferOutputStream.java | 351 +++
src/java/com/jogamp/common/nio/StructAccessor.java | 23 +
src/java/com/jogamp/common/os/AndroidVersion.java | 82 +-
.../com/jogamp/common/os/DynamicLibraryBundle.java | 61 +-
src/java/com/jogamp/common/os/DynamicLinker.java | 17 +-
.../com/jogamp/common/os/DynamicLookupHelper.java | 15 +-
...achineDescription.java => MachineDataInfo.java} | 208 +-
src/java/com/jogamp/common/os/NativeLibrary.java | 122 +-
src/java/com/jogamp/common/os/Platform.java | 312 ++-
src/java/com/jogamp/common/util/Bitstream.java | 555 +++--
src/java/com/jogamp/common/util/IOUtil.java | 482 ++--
src/java/com/jogamp/common/util/JarUtil.java | 301 +--
.../com/jogamp/common/util/ReflectionUtil.java | 3 +-
src/java/com/jogamp/common/util/VersionUtil.java | 12 +-
.../common/util/bin/exe-windows-i586-268b.bin | Bin 0 -> 268 bytes
.../jogamp/common/util/cache/TempFileCache.java | 5 +-
.../com/jogamp/common/util/cache/TempJarCache.java | 160 +-
src/java/com/jogamp/gluegen/ASTLocusTag.java | 99 +
.../com/jogamp/gluegen/CMethodBindingEmitter.java | 261 +-
.../com/jogamp/gluegen/ConstantDefinition.java | 295 ++-
src/java/com/jogamp/gluegen/DebugEmitter.java | 25 +-
src/java/com/jogamp/gluegen/FunctionEmitter.java | 40 +-
...unctionAddressResolver.java => GenericCPP.java} | 40 +-
src/java/com/jogamp/gluegen/GlueEmitter.java | 7 +-
src/java/com/jogamp/gluegen/GlueGen.java | 205 +-
src/java/com/jogamp/gluegen/GlueGenException.java | 92 +
src/java/com/jogamp/gluegen/JavaConfiguration.java | 647 +++--
src/java/com/jogamp/gluegen/JavaEmitter.java | 962 +++++---
.../jogamp/gluegen/JavaMethodBindingEmitter.java | 128 +-
src/java/com/jogamp/gluegen/JavaType.java | 79 +-
src/java/com/jogamp/gluegen/Logging.java | 349 ++-
src/java/com/jogamp/gluegen/MethodBinding.java | 98 +-
src/java/com/jogamp/gluegen/ReferencedStructs.java | 56 +-
...unctionAddressResolver.java => TypeConfig.java} | 31 +-
src/java/com/jogamp/gluegen/TypeInfo.java | 2 +-
src/java/com/jogamp/gluegen/ant/GlueGenTask.java | 23 +-
src/java/com/jogamp/gluegen/cgram/Define.java | 16 +-
src/java/com/jogamp/gluegen/cgram/TNode.java | 24 +-
.../jogamp/gluegen/cgram/types/AliasedSymbol.java | 185 ++
.../com/jogamp/gluegen/cgram/types/ArrayType.java | 86 +-
.../com/jogamp/gluegen/cgram/types/BitType.java | 65 +-
.../jogamp/gluegen/cgram/types/CompoundType.java | 161 +-
.../com/jogamp/gluegen/cgram/types/DoubleType.java | 39 +-
.../com/jogamp/gluegen/cgram/types/EnumType.java | 130 +-
src/java/com/jogamp/gluegen/cgram/types/Field.java | 39 +-
.../com/jogamp/gluegen/cgram/types/FloatType.java | 39 +-
.../jogamp/gluegen/cgram/types/FunctionSymbol.java | 82 +-
.../jogamp/gluegen/cgram/types/FunctionType.java | 89 +-
.../com/jogamp/gluegen/cgram/types/IntType.java | 111 +-
.../gluegen/cgram/types/MemoryLayoutType.java | 14 +-
.../jogamp/gluegen/cgram/types/PointerType.java | 130 +-
.../jogamp/gluegen/cgram/types/PrimitiveType.java | 10 +-
.../com/jogamp/gluegen/cgram/types/SizeThunk.java | 232 +-
.../jogamp/gluegen/cgram/types/StructLayout.java | 6 +-
.../com/jogamp/gluegen/cgram/types/StructType.java | 25 +-
src/java/com/jogamp/gluegen/cgram/types/Type.java | 510 ++--
.../jogamp/gluegen/cgram/types/TypeComparator.java | 143 ++
.../jogamp/gluegen/cgram/types/TypeDictionary.java | 35 +
.../jogamp/gluegen/cgram/types/TypeVisitor.java | 6 +
.../com/jogamp/gluegen/cgram/types/UnionType.java | 25 +-
.../com/jogamp/gluegen/cgram/types/VoidType.java | 38 +-
src/java/com/jogamp/gluegen/package.html | 18 +-
src/java/com/jogamp/gluegen/pcpp/PCPP.java | 158 +-
.../ProcAddressCMethodBindingEmitter.java | 90 +-
.../procaddress/ProcAddressConfiguration.java | 51 +-
.../gluegen/procaddress/ProcAddressEmitter.java | 121 +-
.../ProcAddressJavaMethodBindingEmitter.java | 13 +-
.../gluegen/runtime/FunctionAddressResolver.java | 10 +-
.../jogamp/gluegen/runtime/ProcAddressTable.java | 23 +-
.../structgen/CStructAnnotationProcessor.java | 9 +-
.../jogamp/android/launcher/ClassLoaderUtil.java | 48 +
...Impl.java => BionicDynamicLinker32bitImpl.java} | 26 +-
...Impl.java => BionicDynamicLinker64BitImpl.java} | 30 +-
src/java/jogamp/common/os/DynamicLinkerImpl.java | 182 +-
.../jogamp/common/os/MacOSXDynamicLinkerImpl.java | 12 +-
...ionRuntime.java => MachineDataInfoRuntime.java} | 151 +-
src/java/jogamp/common/os/PlatformPropsImpl.java | 476 ++--
.../jogamp/common/os/PosixDynamicLinkerImpl.java | 12 +-
.../jogamp/common/os/UnixDynamicLinkerImpl.java | 41 +-
.../jogamp/common/os/WindowsDynamicLinkerImpl.java | 47 +-
src/java/jogamp/common/os/elf/Ehdr.java | 175 --
src/java/jogamp/common/os/elf/Ehdr_p1.java | 118 +
src/java/jogamp/common/os/elf/Ehdr_p2.java | 176 ++
.../os/elf/{ElfHeader.java => ElfHeaderPart1.java} | 414 ++--
src/java/jogamp/common/os/elf/ElfHeaderPart2.java | 375 +++
src/java/jogamp/common/os/elf/IOUtils.java | 10 +-
.../jogamp/common/os/elf/SectionArmAttributes.java | 45 +-
src/java/jogamp/common/os/elf/SectionHeader.java | 40 +-
src/java/jogamp/common/os/elf/Shdr.java | 145 +-
.../jogamp/common/net/AssetURLConnectionBase.java | 10 +-
.../net/AssetURLConnectionRegisteredTest.java | 9 +-
.../net/AssetURLConnectionUnregisteredTest.java | 7 +-
src/junit/com/jogamp/common/net/TestUri01.java | 433 ++++
.../TestUri02Composing.java} | 58 +-
.../com/jogamp/common/net/TestUri03Resolving.java | 430 ++++
...> TestUri99LaunchOnReservedCharPathBug908.java} | 32 +-
...stURIQueryProps.java => TestUriQueryProps.java} | 23 +-
.../common/net/TestUrisWithAssetHandler.java | 4 +-
src/junit/com/jogamp/common/net/URIDumpUtil.java | 53 +
src/junit/com/jogamp/common/nio/BuffersTest.java | 4 +-
.../jogamp/common/nio/CachedBufferFactoryTest.java | 4 +-
.../nio/TestBuffersFloatDoubleConversion.java | 4 +-
.../common/nio/TestByteBufferCopyStream.java | 244 ++
.../common/nio/TestByteBufferInputStream.java | 363 +++
.../common/nio/TestByteBufferOutputStream.java | 298 +++
.../jogamp/common/nio/TestPointerBufferEndian.java | 6 +-
.../common/nio/TestStructAccessorEndian.java | 8 +-
.../com/jogamp/common/os/TestElfReader01.java | 76 +-
.../com/jogamp/common/util/IntIntHashMapTest.java | 6 +-
.../jogamp/common/util/IntObjectHashMapTest.java | 6 +-
.../com/jogamp/common/util/LongIntHashMapTest.java | 4 +-
.../com/jogamp/common/util/TestArrayHashSet01.java | 4 +-
.../com/jogamp/common/util/TestBitstream00.java | 136 +-
.../com/jogamp/common/util/TestBitstream01.java | 168 +-
.../com/jogamp/common/util/TestBitstream02.java | 18 +-
.../com/jogamp/common/util/TestBitstream03.java | 25 +-
.../com/jogamp/common/util/TestBitstream04.java | 24 +-
.../com/jogamp/common/util/TestFloatStack01.java | 4 +-
src/junit/com/jogamp/common/util/TestIOUtil01.java | 45 +-
.../jogamp/common/util/TestIOUtilURIHandling.java | 393 ---
.../jogamp/common/util/TestIteratorIndexCORE.java | 4 +-
src/junit/com/jogamp/common/util/TestJarUtil.java | 44 +-
.../com/jogamp/common/util/TestPlatform01.java | 10 +-
.../com/jogamp/common/util/TestRunnableTask01.java | 4 +-
.../jogamp/common/util/TestSystemPropsAndEnvs.java | 4 +-
.../com/jogamp/common/util/TestTempJarCache.java | 35 +-
.../com/jogamp/common/util/TestVersionInfo.java | 4 +-
.../com/jogamp/common/util/TestVersionNumber.java | 4 +-
.../jogamp/common/util/TestVersionSemantics.java | 45 +-
.../common/util/locks/TestRecursiveLock01.java | 4 +-
.../util/locks/TestRecursiveThreadGroupLock01.java | 4 +-
.../util/locks/TestSingletonServerSocket00.java | 22 +-
.../util/locks/TestSingletonServerSocket01.java | 11 +-
.../util/locks/TestSingletonServerSocket02.java | 29 +-
.../gluegen/test/junit/generation/BaseClass.java | 202 +-
.../gluegen/test/junit/generation/PCPPTest.java | 4 +-
.../test/junit/generation/test1-CustomJavaCode.cfg | 7 +
.../gluegen/test/junit/generation/test1-common.cfg | 17 +
.../jogamp/gluegen/test/junit/generation/test1.c | 57 +
.../jogamp/gluegen/test/junit/generation/test1.h | 120 +-
.../test/junit/generation/test1p1-gluegen.cfg | 2 +
.../test/junit/generation/test1p2-gluegen.cfg | 2 +
.../gluegen/test/junit/internals/TestType.java | 85 +
.../test/junit/structgen/TestStructGen01.java | 4 +-
.../test/junit/structgen/TestStructGen02.java | 4 +-
src/junit/com/jogamp/junit/sec/Applet01.java | 108 +-
.../com/jogamp/junit/sec/TestSecIOUtil01.java | 106 +-
src/junit/com/jogamp/junit/util/JunitTracer.java | 28 +-
.../com/jogamp/junit/util/SingletonJunitCase.java | 79 +
.../jogamp/junit/util/VersionSemanticsUtil.java | 9 +-
src/native/common/JVMUtil.c | 5 +
...scriptionRuntime.c => MachineDataInfoRuntime.c} | 36 +-
src/native/tinype-corkami/consts.inc | 675 ++++++
src/native/tinype-corkami/make.bat | 13 +
src/native/tinype-corkami/readme.txt | 25 +
src/native/tinype-corkami/tiny-simple.asm | 102 +
src/native/tinype-corkami/tiny.asm | 117 +
src/native/unix/UnixDynamicLinkerImpl_JNI.c | 78 +-
src/native/windows/WindowsDynamicLinkerImpl_JNI.c | 8 +-
268 files changed, 27424 insertions(+), 6191 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gluegen2.git
More information about the pkg-java-commits
mailing list