Use GlueGen VersionUtil to dump full Manifest version

11 files changed, 29 insertions, 77 deletions

diff --git a/etc/test.bat b/etc/test.bat
index e1bbbbde7..23e4bb560 100755
--- a/etc/test.bat
+++ b/etc/test.bat
@@ -9,6 +9,8 @@ set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"
 

 REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% javax.media.opengl.awt.GLCanvas > java-win64.log 2>&1

 

-java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.newt.opengl.GLWindow > test.log 2>&1

+java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.opengl.util.VersionInfo > test.log 2>&1

+REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.newt.opengl.GLCanvas >> test.log 2>&1

+java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.newt.opengl.GLWindow >> test.log 2>&1

 

 type test.log

diff --git a/etc/test.sh b/etc/test.sh
index d86687316..b03fd8d3a 100755
--- a/etc/test.sh
+++ b/etc/test.sh
@@ -39,6 +39,7 @@ echo
 # D_ARGS="-Djogl.debug=all"
 X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false"
 
+java $X_ARGS $ARGS_AWT  $D_ARGS com.jogamp.opengl.util.VersionInfo 2>&1 | tee -a $logfile
 #java $X_ARGS $ARGS_AWT  $D_ARGS javax.media.opengl.awt.GLCanvas 2>&1 | tee -a $logfile
 java $X_ARGS $ARGS_NEWT $D_ARGS com.jogamp.newt.opengl.GLWindow 2>&1 | tee -a $logfile
 
diff --git a/make/joglversion b/make/joglversion
index 01e3a3699..7dd22861b 100644
--- a/make/joglversion
+++ b/make/joglversion
@@ -1,11 +1,11 @@
 Specification-Title: Java Bindings for OpenGL API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
+Specification-Vendor: JogAmp Community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment
 Implementation-Version: @VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp community
+Implementation-Vendor: JogAmp Community
 Extension-Name: javax.media.opengl
 Implementation-Vendor-Id: com.jogamp
 Trusted-Library: true
diff --git a/make/joglversion-cdc b/make/joglversion-cdc
index b5ec55f4c..df0209acf 100644
--- a/make/joglversion-cdc
+++ b/make/joglversion-cdc
@@ -1,11 +1,11 @@
 Specification-Title: Java Bindings for OpenGL API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
+Specification-Vendor: JogAmp Community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
 Implementation-Version: @VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp community
+Implementation-Vendor: JogAmp Community
 Extension-Name: javax.media.opengl
 Implementation-Vendor-Id: com.jogamp
 Trusted-Library: true
diff --git a/make/nativewindowversion b/make/nativewindowversion
index e9db69c54..30b3f24a6 100644
--- a/make/nativewindowversion
+++ b/make/nativewindowversion
@@ -1,11 +1,11 @@
 Specification-Title: Native Window Interface API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
+Specification-Vendor: JogAmp Community
 Implementation-Title: Native Window Interface Runtime Environment
 Implementation-Version: @VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp community
+Implementation-Vendor: JogAmp Community
 Extension-Name: javax.media.nativewindow
 Implementation-Vendor-Id: com.jogamp
 Trusted-Library: true
diff --git a/make/nativewindowversion-cdc b/make/nativewindowversion-cdc
index 289b6dc72..e6f76865a 100644
--- a/make/nativewindowversion-cdc
+++ b/make/nativewindowversion-cdc
@@ -1,11 +1,11 @@
 Specification-Title: Native Window Interface API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
+Specification-Vendor: JogAmp Community
 Implementation-Title: Native Window Interface Runtime Environment CDC
 Implementation-Version: @VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp community
+Implementation-Vendor: JogAmp Community
 Extension-Name: javax.media.nativewindow
 Implementation-Vendor-Id: com.jogamp
 Trusted-Library: true
diff --git a/make/newtversion b/make/newtversion
index 262eefe22..12090a17c 100644
--- a/make/newtversion
+++ b/make/newtversion
@@ -1,11 +1,11 @@
 Specification-Title: NEWT API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
+Specification-Vendor: JogAmp Community
 Implementation-Title: NEWT Runtime Environment
 Implementation-Version: @VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp community
+Implementation-Vendor: JogAmp Community
 Extension-Name: com.jogamp.newt
 Implementation-Vendor-Id: com.jogamp
 Trusted-Library: true
diff --git a/make/newtversion-cdc b/make/newtversion-cdc
index 5911ff798..d2be6b7fd 100644
--- a/make/newtversion-cdc
+++ b/make/newtversion-cdc
@@ -1,11 +1,11 @@
 Specification-Title: NEWT API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
+Specification-Vendor: JogAmp Community
 Implementation-Title: NEWT Runtime Environment CDC
 Implementation-Version: @VERSION@
 Implementation-Branch: @SCM_BRANCH@
 Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp community
+Implementation-Vendor: JogAmp Community
 Extension-Name: com.jogamp.newt
 Implementation-Vendor-Id: com.jogamp
 Trusted-Library: true
diff --git a/make/versions.xml b/make/versions.xml
index f43a21fdc..66e81d8c6 100644
--- a/make/versions.xml
+++ b/make/versions.xml
@@ -9,7 +9,7 @@
        and a timestamp automatically added to this version number. For
        intermediate release builds, this should be in the form, for
        example, "2.0-beta1" or "2.0-rc1". For large releases, push
-       betas before release candidates to give the community time to
+       betas before release candidates to give the Community time to
        react.-->
   <property name="jogl_base_version" value="2.0" />
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/VersionInfo.java b/src/jogl/classes/com/jogamp/opengl/util/VersionInfo.java
index b7e6b5194..e04b75b6b 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/VersionInfo.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/VersionInfo.java
@@ -30,49 +30,29 @@ package com.jogamp.opengl.util;
 
 import javax.media.opengl.*;
 import com.jogamp.common.os.Platform;
-
-import java.io.IOException;
+import com.jogamp.common.util.VersionUtil;
 
 public class VersionInfo {
 
+    public static StringBuffer getInfo(StringBuffer sb, String prefix) {
+        return VersionUtil.getInfo(VersionInfo.class.getClassLoader(), prefix, "javax.media.opengl", "GL", sb);
+    }
+
     public static StringBuffer getInfo(StringBuffer sb, String prefix, GL gl) {
         if(null==sb) {
             sb = new StringBuffer();
         }
 
-        sb.append(Platform.getNewline());
+        VersionUtil.getInfo(VersionInfo.class.getClassLoader(), prefix, "javax.media.opengl", "GL", sb);
         sb.append("-----------------------------------------------------------------------------------------------------");
         sb.append(Platform.getNewline());
-        getPackageInfo(sb, prefix, "javax.media.opengl", "GL");
-        sb.append(Platform.getNewline());
-        sb.append(Platform.getNewline());
-        getPlatformInfo(sb, prefix);
-        sb.append(Platform.getNewline());
-        sb.append(Platform.getNewline());
         getOpenGLInfo(sb, prefix, gl);
-        sb.append(Platform.getNewline());
-        sb.append(Platform.getNewline());
         sb.append("-----------------------------------------------------------------------------------------------------");
         sb.append(Platform.getNewline());
 
         return sb;
     }
 
-    public static StringBuffer getPlatformInfo(StringBuffer sb, String prefix) {
-        if(null==sb) {
-            sb = new StringBuffer();
-        }
-
-        sb.append(prefix+" Platform: " + Platform.getOS() + " " + Platform.getOSVersion() + " (os), " + Platform.getArch() + " (arch)");
-        sb.append(Platform.getNewline());
-        sb.append(prefix+" Platform: littleEndian " + Platform.isLittleEndian() + ", 32Bit "+Platform.is32Bit() + ", a-ptr bit-size "+Platform.getPointerSizeInBits());
-        sb.append(Platform.getNewline());
-        sb.append(prefix+" Platform: Java " + Platform.getJavaVersion()+", "
-            +Platform.getJavaVendor()+", "+Platform.getJavaVendorURL()+", is JavaSE: "+Platform.isJavaSE());
-
-        return sb;
-    }
-
     public static StringBuffer getOpenGLInfo(StringBuffer sb, String prefix, GL gl) {
         if(null==sb) {
             sb = new StringBuffer();
@@ -93,45 +73,13 @@ public class VersionInfo {
         sb.append(prefix+" GL_EXTENSIONS ");
         sb.append(Platform.getNewline());
         sb.append(prefix+"               " + gl.glGetString(gl.GL_EXTENSIONS));
+        sb.append(Platform.getNewline());
 
         return sb;
     }
 
-    public static StringBuffer getPackageInfo(StringBuffer sb, String prefix,
-                                              String pkgName, String className) {
-        try {
-            ClassLoader classLoader = VersionInfo.class.getClassLoader();
-            classLoader.loadClass(pkgName + "." + className);
-
-            if(null==sb) {
-                sb = new StringBuffer();
-            }
-
-            Package p = Package.getPackage(pkgName);
-            if (p == null) {
-                sb.append(prefix+" WARNING: Package.getPackage(" + pkgName + ") is null");
-                sb.append(Platform.getNewline());
-            }
-            else {
-                sb.append(prefix+" "+p);
-                sb.append(Platform.getNewline());
-                sb.append(prefix+" Specification Title = " + p.getSpecificationTitle());
-                sb.append(Platform.getNewline());
-                sb.append(prefix+" Specification Vendor = " + p.getSpecificationVendor());
-                sb.append(Platform.getNewline());
-                sb.append(prefix+" Specification Version = " + p.getSpecificationVersion());
-                sb.append(Platform.getNewline());
-
-                sb.append(prefix+" Implementation Vendor = " + p.getImplementationVendor());
-                sb.append(Platform.getNewline());
-                sb.append(prefix+" Implementation Version = " + p.getImplementationVersion());
-            }
-        }
-        catch (ClassNotFoundException e) {
-            sb.append(Platform.getNewline());
-            sb.append(prefix+" Unable to load " + pkgName);
-        }
-        return sb;
+    public static void main(String args[]) {
+        System.err.println(VersionInfo.getInfo(null, "JOGL"));
     }
 }
 
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 853d3e888..5eb77d8bb 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -39,6 +39,7 @@ package javax.media.opengl;
 
 import com.jogamp.common.jvm.JVMUtil;
 import com.jogamp.common.util.ReflectionUtil;
+import com.jogamp.common.util.VersionUtil;
 import com.jogamp.opengl.util.VersionInfo;
 import com.jogamp.opengl.impl.Debug;
 import com.jogamp.opengl.impl.GLDrawableFactoryImpl;
@@ -1059,8 +1060,8 @@ public class GLProfile {
         mappedProfiles = computeProfileMap();
 
         if (DEBUG) {
-            System.err.println(VersionInfo.getPackageInfo(null, "GLProfile.init", "javax.media.opengl", "GL"));
-            System.err.println(VersionInfo.getPlatformInfo(null, "GLProfile.init"));
+            System.err.print(VersionUtil.getPlatformInfo(null, "GLProfile.init"));
+            System.err.print(VersionUtil.getManifestInfo(GLProfile.class.getClassLoader(), "GLProfile.init", "javax.media.opengl", "GL", null));
             System.err.println("GLProfile.init firstUIActionOnProcess "+firstUIActionOnProcess);
             System.err.println("GLProfile.init isAWTAvailable "+isAWTAvailable);
             System.err.println("GLProfile.init hasNativeOSFactory "+hasNativeOSFactory);