Fix Android apk activity; Add apk VersionName; Add jar manifest to apk

- build:
  - exclude android packages if !isAndroid

- aapt:
  - Use individual AndroidManifest xml files
  - optional: incl. our JAR manifest file to support detailed version info
  - use def. GluegenVersionActivity

- APK VersionName: Retrieve and show

- package/extension names:
  - gluegen.jar/apk:    com.jogamp.gluegen
  - gluegen-rt.jar/apk: com.jogamp.common

4 files changed, 216 insertions, 1 deletions

diff --git a/src/java/jogamp/common/os/MachineDescriptionRuntime.java b/src/java/jogamp/common/os/MachineDescriptionRuntime.java
index 1413705..bf49105 100644
--- a/src/java/jogamp/common/os/MachineDescriptionRuntime.java
+++ b/src/java/jogamp/common/os/MachineDescriptionRuntime.java
@@ -28,7 +28,6 @@
  
 package jogamp.common.os;
 
-import com.jogamp.common.os.AndroidVersion;
 import com.jogamp.common.os.MachineDescription;
 import com.jogamp.common.os.NativeLibrary;
 import com.jogamp.common.os.Platform;
diff --git a/src/java/jogamp/common/os/android/GluegenVersionActivity.java b/src/java/jogamp/common/os/android/GluegenVersionActivity.java
new file mode 100644
index 0000000..34c6fb5
--- /dev/null
+++ b/src/java/jogamp/common/os/android/GluegenVersionActivity.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * 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
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * 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.
+ */
+package jogamp.common.os.android;
+
+import com.jogamp.common.GlueGenVersion;
+import com.jogamp.common.os.Platform;
+import com.jogamp.common.util.VersionUtil;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+import android.util.Log;
+
+public class GluegenVersionActivity extends Activity {
+   TextView tv = null;
+   
+   @Override
+   public void onCreate(Bundle savedInstanceState) {
+       Log.d(MD.TAG, "onCreate - S");
+       super.onCreate(savedInstanceState);
+       PackageInfoUtil.setContext(this);
+       tv = new TextView(this);
+       tv.setText(VersionUtil.getPlatformInfo()+Platform.NEWLINE+GlueGenVersion.getInstance()+Platform.NEWLINE+Platform.NEWLINE);               
+       setContentView(tv);
+       Log.d(MD.TAG, "onCreate - X");
+   }
+   
+   @Override
+   public void onStart() {
+     Log.d(MD.TAG, "onStart - S");
+     super.onStart();
+     if(null != tv) {
+         tv.append("> started"+Platform.NEWLINE);
+     }
+     Log.d(MD.TAG, "onStart - X");
+   }
+     
+   @Override
+   public void onRestart() {
+     Log.d(MD.TAG, "onRestart - S");
+     super.onRestart();
+     if(null != tv) {
+         tv.append("> restarted"+Platform.NEWLINE);
+     }       
+     Log.d(MD.TAG, "onRestart - X");
+   }
+
+   @Override
+   public void onResume() {
+     Log.d(MD.TAG, "onResume - S");
+     if(null != tv) {
+         tv.append("> resumed"+Platform.NEWLINE);
+     }       
+     super.onResume();
+     Log.d(MD.TAG, "onResume - X");
+   }
+
+   @Override
+   public void onPause() {
+     Log.d(MD.TAG, "onPause - S");
+     if(null != tv) {
+         tv.append("> paused"+Platform.NEWLINE);
+     }              
+     super.onPause();
+     // Log.d(MD.TAG, "onPause - x");
+     // finish(); // ensure destroy after pause() -> one shot activity
+     Log.d(MD.TAG, "onPause - X");
+   }
+
+   @Override
+   public void onStop() {
+     Log.d(MD.TAG, "onStop - S");
+     if(null != tv) {
+         tv.append("> stopped"+Platform.NEWLINE);
+     }
+     super.onStop();  
+     Log.d(MD.TAG, "onStop - X");
+   }
+
+   @Override
+   public void onDestroy() {
+     Log.d(MD.TAG, "onDestroy - S");
+     if(null != tv) {
+         tv.append("> destroyed"+Platform.NEWLINE);
+     }
+     PackageInfoUtil.setContext(null);
+     Log.d(MD.TAG, "onDestroy - x");
+     super.onDestroy();  
+     Log.d(MD.TAG, "onDestroy - X");
+   }   
+}
diff --git a/src/java/jogamp/common/os/android/MD.java b/src/java/jogamp/common/os/android/MD.java
new file mode 100644
index 0000000..d6a2e48
--- /dev/null
+++ b/src/java/jogamp/common/os/android/MD.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * 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
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * 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.
+ */
+package jogamp.common.os.android;
+
+public class MD {
+   public static final String TAG = "JogAmp.GlueGen";
+}
diff --git a/src/java/jogamp/common/os/android/PackageInfoUtil.java b/src/java/jogamp/common/os/android/PackageInfoUtil.java
new file mode 100644
index 0000000..473f262
--- /dev/null
+++ b/src/java/jogamp/common/os/android/PackageInfoUtil.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * 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
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * 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.
+ */
+package jogamp.common.os.android;
+
+import android.content.*;
+import android.content.pm.*;
+import android.util.Log;
+
+public class PackageInfoUtil {
+   private static Context context = null;
+   private static boolean DEBUG = false;
+   
+   public static final synchronized void setContext(Context ctx) {
+       if(DEBUG) Log.d(MD.TAG, "setContext("+ctx+")");
+       context = ctx;
+   }
+   public static final synchronized Context getContext() {
+       return context;
+   }
+   public static final PackageInfo getPackageInfo(String packageName) {
+       Context ctx = getContext();
+       if(null != ctx) {
+           try {
+               final PackageInfo pi = ctx.getPackageManager().getPackageInfo(packageName, PackageManager.GET_META_DATA);
+               if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): "+pi);
+               return pi;
+           } catch (Exception e) { if(DEBUG) { Log.d(MD.TAG, "getPackageInfo("+packageName+")", e); } }
+       }
+       if(DEBUG) Log.d(MD.TAG, "getPackageInfo("+packageName+"): NULL");
+       return null;
+   }
+   
+   public static final int getPackageInfoVersionCode(String packageName) {
+       final PackageInfo pInfo = getPackageInfo(packageName);
+       return ( null != pInfo ) ? pInfo.versionCode : -1 ;
+   }   
+   public static final String getPackageInfoVersionName(String packageName) {
+       final PackageInfo pInfo = getPackageInfo(packageName);
+       final String s = ( null != pInfo ) ? pInfo.versionName : null ;
+       if(DEBUG) Log.d(MD.TAG, "getPackageInfoVersionName("+packageName+"): "+s);
+       return s;
+   }   
+}