Cleanup Build: GlueGen config files, stub_includes; Add JoclVersion, Android JoclVersionActivity

Cleanup Build:
  - Move gluegen config files into make/config (cleanup)

  - Move stub_includes into respective folder make/stub_includes
    and keep resources 'clean'

JoclVersion:
  - Analoge to JoglVersion, replaces JOCLVersion (deprecated for now)
  - Added text based CL info dump.

JoclVersionActivity:
  - Analog to JoclVersionActivity
  - Added full launch .. tested on Android (but no OpenCL avail.)

1 files changed, 9 insertions, 23 deletions

diff --git a/src/com/jogamp/opencl/util/JOCLVersion.java b/src/com/jogamp/opencl/util/JOCLVersion.java
index 48dd2a9e..7ffa3eb6 100644
--- a/src/com/jogamp/opencl/util/JOCLVersion.java
+++ b/src/com/jogamp/opencl/util/JOCLVersion.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,7 +20,7 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
@@ -36,6 +36,7 @@ import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.JogampVersion;
 import com.jogamp.common.util.VersionUtil;
 import com.jogamp.opencl.llb.CL;
+
 import java.security.PrivilegedAction;
 import java.util.jar.Manifest;
 
@@ -45,6 +46,7 @@ import static com.jogamp.common.util.VersionUtil.*;
 /**
  * Utility for querying module versions and environment properties.
  * @author Michael Bien
+ * @deprecated Use {@link com.jogamp.opencl.JoclVersion}
  */
 public class JOCLVersion extends JogampVersion {
 
@@ -75,14 +77,10 @@ public class JOCLVersion extends JogampVersion {
         final StringBuilder sb = new StringBuilder();
 
         try{
-            sb.append(getPlatformInfo(null));
+            getPlatformInfo(sb);
+            sb.append(Platform.getNewline());
+            GlueGenVersion.getInstance().toString(sb);
             sb.append(Platform.getNewline());
-        }catch(Exception e) {
-            sb.append(e.getMessage());
-            e.printStackTrace();
-        }
-
-        try{
             createInstance().toString(sb);
             sb.append(Platform.getNewline());
         }catch(Exception e) {
@@ -90,18 +88,6 @@ public class JOCLVersion extends JogampVersion {
             e.printStackTrace();
         }
 
-        try{
-            doPrivileged(new PrivilegedAction<Object>() {
-                @Override public Object run() {
-                    sb.append(GlueGenVersion.getInstance().toString());
-                    return null;
-                }
-            });
-        }catch(Exception e) {
-            sb.append(e.getMessage());
-            e.printStackTrace();
-        }
-
         return sb.toString();
     }