The Jenkins Controller is preparing for shutdown. No new builds can be started.
Commit
c4f4ec8b7be3c73b0d416ea82030b3fb8aa99efa
by Sven Gothel Fix PCPP 'elif' case; Adding PCPP #error/#warning; Adding debug mode. Fix PCPP 'elif' case ---------------------- Use the evaluated expression after the 'elif' statement as well. This was always true for 'if'. Otherwise the file obviously won't get parsed correctly, ie it was always assuming 'true'. Adding PCPP #error/#warning ---------------------------- LOG all occurence of #error and #warning CPP directives Adding debug mode. ---------------------- Add '--debug' commandline flag and 'debug' property for ant task, which enables debug mode of PCPP. The file was modified src/java/com/sun/gluegen/GlueGen.java (diff) The file was modified src/java/com/sun/gluegen/ant/GlueGenTask.java (diff) The file was modified src/java/com/sun/gluegen/pcpp/PCPP.java (diff) The file was modified src/java/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java (diff) The file was modified make/gluegen-cpptasks-base.xml (diff) The file was modified src/java/com/jogamp/common/util/ArrayHashSet.java (diff) The file was modified make/build.xml (diff)
Commit
6b6b9b3b81cdc85b7260664ebec547756a6be5d7
by Sven Gothel Fix native type representation; Retain typedef declName in resulting Type for variables; Misc Fix native type representation ---------------------------------- The following custom types were previously build-in: __int32, __int64 Adding the following native build-in types (necessary): ptrdiff_t, size_t These compiler/platform specific types shall not be typedef'ed via header files. Hence we provide proper typing for such, as the compiler would do. Adding the following native build-in types (convenience): int32_t, uint32_t, int64_t, uint64_t These are provided due to their lack of support on certain platforms, and probable source of bugs, when defined by the user. Retain typedef declName in resulting Type for variables. -------------------------------------------------------- Adding Clonable to all cgram Type derivations. Assume use case: typedef khronos_ssize_t GLsizeiptr typedef size_t khronos_ssize_t The previous code picked a one level depth type in the dictionary if exists. Hence it made khronos_ssize_t visible in the javadoc and native code. It is our believe that the generated native code, as well as the javadoc comments shall reflect the original GlueGen'ed API and it's types. Also, aliasing or reducing native types via GlueGen could result in plattorm dependencies and in worst cases, incompatible native types. This patch clones the 1 level depth Type (typedef), clones it and sets the declName, so it's visible to the GlueGen layers. Misc ------- GlueGen's debug flag is passed to HeaderParser, where it traces misc information. The file was modified src/java/com/sun/gluegen/GlueGen.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/CompoundType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/EnumType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/ArrayType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/FloatType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/PointerType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/SizeThunk.java (diff) The file was modified src/java/com/sun/gluegen/JavaConfiguration.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/Type.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/DoubleType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/FunctionType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/IntType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/BitType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/VoidType.java (diff) The file was modified src/java/com/sun/gluegen/TypeInfo.java (diff) The file was modified src/java/com/sun/gluegen/JavaType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/PrimitiveType.java (diff) The file was modified src/java/com/sun/gluegen/JavaEmitter.java (diff) The file was modified src/java/com/sun/gluegen/cgram/HeaderParser.g (diff) The file was modified src/java/com/sun/gluegen/cgram/GnuCParser.g (diff) The file was removed src/java/com/sun/gluegen/opengl/ConvertFromGL4Java.java (diff)
Commit
4c808ec572808a221d0ce08785dad2d18f77ea5f
by Sven Gothel Fixed benchmarking bugs in primitive HashMap test. Both IntIntHashMapTest and LongIntHashMapTest failed to reset test start time. The time values for intmapGetTime,mapGetTime,intmapRemoveTime,and mapRemoveTime all used the start time value from mapPutTime. This caused the following to be always/guarenteed to be true: mapPutTime < intmapGetTime < mapGetTime < intmapRemoveTime < mapRemoveTime thus not actually testing the following asserts: assertTrue("'get' too slow", intmapGetTime <= mapGetTime); assertTrue("'remove' too slow", intmapRemoveTime <= mapRemoveTime); In addition the results of the test were being printed before the actual test ran. Changed code to reset time to System.nanoTime() prior to each for loop, and moved time calculation and result output to below the test for loop. I also improved the output of the test info, by including the warmup status on benchmark start. The file was modified src/junit/com/jogamp/common/util/IntIntHashMapTest.java (diff) The file was modified src/junit/com/jogamp/common/util/LongIntHashMapTest.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/CompoundType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/EnumType.java (diff) The file was modified src/java/com/sun/gluegen/cgram/types/FunctionType.java (diff) The file was removed src/java/com/jogamp/gluegen/runtime/opengl/GLExtensionNames.java (diff) The file was removed src/java/com/sun/gluegen/opengl/GLEmitter.java (diff) The file was removed src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java (diff) The file was removed src/java/com/sun/gluegen/opengl/GLConfiguration.java (diff) The file was removed src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java (diff) The file was removed src/java/com/jogamp/gluegen/runtime/opengl/GLProcAddressResolver.java (diff) The file was removed src/java/com/sun/gluegen/opengl/GLJavaMethodBindingEmitter.java (diff) The file was removed src/java/com/sun/gluegen/cgram/GnuCParser.g (diff) The file was added src/java/com/jogamp/gluegen/pcpp/PCPP.java (diff) The file was added src/java/com/jogamp/gluegen/TypeInfo.java (diff) The file was removed src/java/com/sun/gluegen/FunctionEmitter.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/SizeThunk.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/DoubleType.java (diff) The file was modified test/junit/com/sun/gluegen/StructAccessorTest.java (diff) The file was removed src/java/com/sun/gluegen/MethodBinding.java (diff) The file was removed src/java/com/sun/gluegen/procaddress/ProcAddressEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/ConstantDefinition.java (diff) The file was removed src/java/com/sun/gluegen/nativesig/NativeSignatureJavaMethodBindingEmitter.java (diff) The file was removed src/java/com/sun/gluegen/GlueEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/JavaConfiguration.java (diff) The file was removed src/java/com/sun/gluegen/Logging.java (diff) The file was added src/java/com/jogamp/gluegen/ArrayTypes.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/MachineDescription64Bit.java (diff) The file was added src/java/com/jogamp/gluegen/jgram/Test.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/BitType.java (diff) The file was modified test/junit/com/sun/gluegen/build.xml (diff) The file was added src/java/com/jogamp/gluegen/CodeGenUtils.java (diff) The file was added src/java/com/jogamp/gluegen/GlueGen.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/GnuCParser.g (diff) The file was added src/java/com/jogamp/gluegen/StructLayout.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/CompoundTypeKind.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/TNode.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/CVAttributes.java (diff) The file was removed src/java/com/sun/gluegen/cgram/PreprocessorInfoChannel.java (diff) The file was removed src/java/com/sun/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java (diff) The file was removed src/java/com/sun/gluegen/DebugEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/StdCParser.g (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/MachineDescription.java (diff) The file was removed src/java/com/sun/gluegen/ArrayTypes.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/PrimitiveType.java (diff) The file was removed src/java/com/sun/gluegen/ant/GlueGenTask.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/FunctionType.java (diff) The file was added src/java/com/jogamp/gluegen/DebugEmitter.java (diff) The file was removed src/java/com/sun/gluegen/SymbolFilter.java (diff) The file was removed src/java/com/sun/gluegen/cgram/CToken.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/MachineDescription32Bit.java (diff) The file was modified test/junit/com/sun/gluegen/BasicTest.java (diff) The file was added src/java/com/jogamp/gluegen/CMethodBindingEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/MachineDescription32Bit.java (diff) The file was removed src/java/com/sun/gluegen/cgram/Define.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/FunctionSymbol.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/Field.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/FloatType.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/GnuCTreeParser.g (diff) The file was removed src/java/com/sun/gluegen/cgram/TNode.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/MachineDescription.java (diff) The file was removed src/java/com/sun/gluegen/cgram/GnuCTreeParser.g (diff) The file was removed src/java/com/sun/gluegen/JavaType.java (diff) The file was removed src/java/com/sun/gluegen/CodeGenUtils.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/TypeDictionary.java (diff) The file was removed src/java/com/sun/gluegen/CommentEmitter.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/IntType.java (diff) The file was added src/java/com/jogamp/gluegen/pcpp/ConcatenatingReader.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/CSymbolTable.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/HeaderParser.g (diff) The file was added src/java/com/jogamp/gluegen/JavaEmitter.java (diff) The file was removed src/java/com/sun/gluegen/CMethodBindingEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/CompoundTypeKind.java (diff) The file was modified test/junit/com/sun/gluegen/StructValidator.java (diff) The file was modified make/build.xml (diff) The file was modified test/junit/com/sun/gluegen/BuildUtil.java (diff) The file was removed src/java/com/sun/gluegen/ant/StaticGLGenTask.java (diff) The file was modified test/junit/com/sun/gluegen/BasicProcAddressEmitterTest.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/FloatType.java (diff) The file was removed src/java/com/sun/gluegen/procaddress/ProcAddressJavaMethodBindingEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/CVAttributes.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/CompoundType.java (diff) The file was removed src/java/com/sun/gluegen/TypeInfo.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/ArrayType.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/VoidType.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/BitType.java (diff) The file was removed src/java/com/sun/gluegen/StructLayout.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/LineObject.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/EnumType.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/FunctionType.java (diff) The file was added src/java/com/jogamp/gluegen/nativesig/NativeSignatureEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/JavaMethodBindingEmitter.java (diff) The file was removed src/java/com/sun/gluegen/GlueEmitterControls.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/SizeThunk.java (diff) The file was removed src/java/com/sun/gluegen/procaddress/ProcAddressConfiguration.java (diff) The file was modified make/validate-properties.xml (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/Type.java (diff) The file was added src/java/com/jogamp/gluegen/GlueEmitterControls.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/FunctionSymbol.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/PointerType.java (diff) The file was added src/java/com/jogamp/gluegen/procaddress/ProcAddressConfiguration.java (diff) The file was added src/java/com/jogamp/gluegen/nativesig/NativeSignatureJavaMethodBindingEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/PointerType.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/IntType.java (diff) The file was modified make/Manifest (diff) The file was added src/java/com/jogamp/gluegen/CommentEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/MachineDescription64Bit.java (diff) The file was removed src/java/com/sun/gluegen/cgram/TNodeFactory.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/PrimitiveType.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/GnuCEmitter.g (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/TypeVisitor.java (diff) The file was added src/java/com/jogamp/gluegen/FunctionEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/ReferencedStructs.java (diff) The file was removed src/java/com/sun/gluegen/pcpp/PCPP.java (diff) The file was added src/java/com/jogamp/gluegen/jgram/JavaParser.g (diff) The file was removed src/java/com/sun/gluegen/nativesig/NativeSignatureEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/ArrayType.java (diff) The file was removed src/java/com/sun/gluegen/JavaMethodBindingEmitter.java (diff) The file was modified test/junit/com/sun/gluegen/PCPPTest.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/TNodeFactory.java (diff) The file was added src/java/com/jogamp/gluegen/Logging.java (diff) The file was removed src/java/com/sun/gluegen/pcpp/ConcatenatingReader.java (diff) The file was removed src/java/com/sun/gluegen/cgram/CSymbolTable.java (diff) The file was removed src/java/com/sun/gluegen/GlueGen.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/DoubleType.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/Type.java (diff) The file was removed src/java/com/sun/gluegen/jgram/Test.java (diff) The file was added src/java/com/jogamp/gluegen/ant/GlueGenTask.java (diff) The file was added src/java/com/jogamp/gluegen/ant/StaticGLGenTask.java (diff) The file was added src/java/com/jogamp/gluegen/MethodBinding.java (diff) The file was removed src/java/com/sun/gluegen/cgram/StdCParser.g (diff) The file was added src/java/com/jogamp/gluegen/cgram/Define.java (diff) The file was removed src/java/com/sun/gluegen/ConstantDefinition.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/Field.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/TypeVisitor.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/CompoundType.java (diff) The file was removed src/java/com/sun/gluegen/cgram/types/TypeDictionary.java (diff) The file was removed src/java/com/sun/gluegen/cgram/GnuCEmitter.g (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/EnumType.java (diff) The file was added src/java/com/jogamp/gluegen/procaddress/ProcAddressEmitter.java (diff) The file was removed src/java/com/sun/gluegen/cgram/LineObject.java (diff) The file was removed src/java/com/sun/gluegen/jgram/JavaParser.g (diff) The file was removed src/java/com/sun/gluegen/JavaEmitter.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/CToken.java (diff) The file was added src/java/com/jogamp/gluegen/SymbolFilter.java (diff) The file was added src/java/com/jogamp/gluegen/JavaType.java (diff) The file was removed src/java/com/sun/gluegen/ReferencedStructs.java (diff) The file was modified make/build-junit.xml (diff) The file was removed src/java/com/sun/gluegen/cgram/HeaderParser.g (diff) The file was added src/java/com/jogamp/gluegen/cgram/types/VoidType.java (diff) The file was added src/java/com/jogamp/gluegen/GlueEmitter.java (diff) The file was removed src/java/com/sun/gluegen/JavaConfiguration.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/PreprocessorInfoChannel.java (diff) The file was added src/java/com/jogamp/gluegen/procaddress/ProcAddressJavaMethodBindingEmitter.java (diff) The file was removed src/java/com/jogamp/gluegen/nativesig/NativeSignatureEmitter.java (diff) The file was removed src/java/com/jogamp/gluegen/ant/StaticGLGenTask.java (diff) The file was removed src/java/com/jogamp/gluegen/nativesig/NativeSignatureJavaMethodBindingEmitter.java (diff) The file was modified make/build-junit.xml (diff) The file was removed make/Manifest-rt-cdc (diff) The file was modified make/build.xml (diff) The file was added make/Manifest-rt.cdc (diff) The file was added test/junit/com/jogamp/gluegen/BasicProcAddressEmitterTest.java (diff) The file was removed test/junit/com/sun/gluegen/dyntest.cfg (diff) The file was removed test/junit/com/sun/gluegen/test.cfg (diff) The file was added test/junit/com/jogamp/gluegen/PCPPTest.java (diff) The file was added test/junit/com/jogamp/gluegen/test.c (diff) The file was removed test/junit/com/sun/gluegen/struct.cfg (diff) The file was added test/junit/com/jogamp/gluegen/struct.h (diff) The file was removed test/junit/com/sun/gluegen/test.c (diff) The file was removed test/junit/com/sun/gluegen/test.h (diff) The file was added test/junit/com/jogamp/gluegen/BasicTest.java (diff) The file was added test/junit/com/jogamp/gluegen/dyntest.cfg (diff) The file was added test/junit/com/jogamp/gluegen/StructAccessorTest.java (diff) The file was removed test/junit/com/sun/gluegen/struct.h (diff) The file was added test/junit/com/jogamp/gluegen/BuildUtil.java (diff) The file was removed test/junit/com/sun/gluegen/build.xml (diff) The file was removed test/junit/com/sun/gluegen/BuildUtil.java (diff) The file was added test/junit/com/jogamp/gluegen/build.xml (diff) The file was removed test/junit/com/sun/gluegen/StructAccessorTest.java (diff) The file was removed test/junit/com/sun/gluegen/StructValidator.java (diff) The file was added test/junit/com/jogamp/gluegen/pcpptest.h (diff) The file was added test/junit/com/jogamp/gluegen/test.cfg (diff) The file was removed test/junit/com/sun/gluegen/BasicTest.java (diff) The file was removed test/junit/com/sun/gluegen/pcpptest.h (diff) The file was added test/junit/com/jogamp/gluegen/struct.cfg (diff) The file was removed test/junit/com/sun/gluegen/BasicProcAddressEmitterTest.java (diff) The file was added test/junit/com/jogamp/gluegen/StructValidator.java (diff) The file was added test/junit/com/jogamp/gluegen/test.h (diff) The file was removed test/junit/com/sun/gluegen/PCPPTest.java (diff) The file was modified src/java/com/jogamp/gluegen/pcpp/PCPP.java (diff) The file was modified test/junit/com/jogamp/gluegen/PCPPTest.java (diff) The file was modified test/junit/com/jogamp/gluegen/pcpptest.h (diff) The file was modified test/junit/com/jogamp/gluegen/BasicProcAddressEmitterTest.java (diff) The file was modified make/scripts/runtest.sh (diff)
Commit
92379944aa91a78dbebf7fe6537a43fb64f71f9a
by Sven Gothel Tests: Enable all tests ; Remove 'test' target -> 'junit.run' ; Fix junit chained tests; Enable all tests - Remove 'test' target -> 'junit.run' - calls build.xml tests first, then - calls build-junit.xml tests - build.xml unit tests were disabled, enable them via junit.run The file was modified make/build-junit.xml (diff) The file was modified make/build.xml (diff) The file was modified src/java/com/jogamp/gluegen/pcpp/PCPP.java (diff) The file was modified test/junit/com/jogamp/gluegen/PCPPTest.java (diff) The file was modified test/junit/com/jogamp/gluegen/pcpptest.h (diff) The file was modified test/junit/com/jogamp/gluegen/pcpptest.h (diff) The file was modified src/java/com/jogamp/gluegen/pcpp/PCPP.java (diff) The file was modified test/junit/com/jogamp/gluegen/PCPPTest.java (diff) The file was modified src/java/com/jogamp/gluegen/GlueGen.java (diff) The file was modified src/java/com/jogamp/gluegen/pcpp/PCPP.java (diff) The file was modified src/java/com/jogamp/gluegen/ant/GlueGenTask.java (diff) The file was modified test/junit/com/jogamp/gluegen/PCPPTest.java (diff) The file was modified nbproject/project.xml (diff) The file was modified src/java/com/jogamp/gluegen/pcpp/PCPP.java (diff)
Commit
e024d6cab3b07ac2033630aac54e94d6494d8c5e
by Sven Gothel Fix PCPP 'define' case; Keep PCPP output file if 'debug' ; GlueGen uses PCPP in same thread via File. Fix PCPP 'define' case ------------------------ A recursive define like: #define LALA ((int)1 ) #define LILI LALA was streamed out of PCPP, even though such 'macro defines' like #define LILI ((int)1 ) are disabled due to the parsers inability to digg those. Added test on macro definition for replaced values. GlueGen uses PCPP in same thread via File ------------------------------------------ To ease debugging we call PCPP from the same thread and use normal temp files as i/o. Keep PCPP output file if 'debug' --------------------------------- Keep temp outfile if debug is enabled The file was modified src/java/com/jogamp/gluegen/GlueGen.java (diff) The file was modified make/build-junit.xml (diff) The file was modified make/build.xml (diff) The file was modified src/junit/com/jogamp/gluegen/test/junit/generation/test1.h (diff) The file was modified src/java/com/jogamp/gluegen/pcpp/PCPP.java (diff) The file was modified src/java/com/jogamp/gluegen/pcpp/PCPP.java (diff) The file was modified test/junit/com/jogamp/gluegen/pcpptest.h (diff) The file was modified test/junit/com/jogamp/gluegen/PCPPTest.java (diff) The file was added src/java/com/jogamp/gluegen/cgram/license.txt (diff) The file was modified LICENSE.txt (diff) The file was modified src/java/com/jogamp/gluegen/ant/GlueGenTask.java (diff) The file was modified src/java/com/jogamp/common/os/UnixDynamicLinkerImpl.java (diff) The file was modified make/stub_includes/unix/dynamic-linker.h (diff) The file was modified make/build.xml (diff) The file was modified nbproject/project.xml (diff)