diff options
| author | Sven Gothel <[email protected]> | 2015-04-04 00:03:20 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-04-04 00:03:20 +0200 |
| commit | 1744cccaa63fa27b399b032c7767de2115ba2c7a (patch) | |
| tree | ede51e8db26a5916d8fb1080e402502739734cc7 | |
| parent | c781cbd978b0635a49e39d48d5786cc71cf7566b (diff) | |
Use CompatibilityType.BACKWARD_COMPATIBLE_BINARY for 2.3.1 / Add EGL.KHRONOS_BOOLEAN_ENUM_FORCE_SIZE manually to avoid binary incompatibility
| -rw-r--r-- | make/config/jogl/egl.cfg | 5 | ||||
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg index 453987d3e..d1d14db3a 100644 --- a/make/config/jogl/egl.cfg +++ b/make/config/jogl/egl.cfg @@ -28,6 +28,11 @@ AccessControl com.jogamp.opengl.egl.EGLProcAddressTable PACKAGE_PRIVATE Ignore eglGetProcAddress ReturnsString eglQueryString +# Remove w/ next minor version bump, only for backward compatibility +Ignore KHRONOS_BOOLEAN_ENUM_FORCE_SIZE +CustomJavaCode EGL /** Defined as part of enum type "khronos_boolean_enum_t" - CType: int */ +CustomJavaCode EGL public static final long KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = 0x7fffffff; + IncludeAs CustomJavaCode EGL egl-CustomJavaCode.java IncludeAs CustomCCode egl-CustomCCode.c diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java index 47ee750e4..395f6661d 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java @@ -106,8 +106,7 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase { VersionSemanticsUtil.testVersion(diffCriteria, expectedCompatibilityType, previousJar, preVersionNumber, - currentJar, curVersionNumber, - excludes); + currentJar, curVersionNumber, excludes); } @Test @@ -128,7 +127,8 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase { @Test public void testVersionV230V23x_01patch() throws IllegalArgumentException, IOException, URISyntaxException { // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE; - final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER; + // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER; + final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_BINARY; final VersionNumberString preVersionNumber = new VersionNumberString("2.3.0"); final File previousJar = new File("lib/v"+preVersionNumber.getVersionString()+"/"+jarFile); |