From dcaa3cb5cabfa11ae88fad266b54a1690148edf9 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 28 Jul 2011 15:27:17 +0200
Subject: 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
---
 src/java/com/jogamp/common/util/JogampVersion.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/java/com/jogamp/common/util/JogampVersion.java')

diff --git a/src/java/com/jogamp/common/util/JogampVersion.java b/src/java/com/jogamp/common/util/JogampVersion.java
index 1af86d3..a2b1e2f 100644
--- a/src/java/com/jogamp/common/util/JogampVersion.java
+++ b/src/java/com/jogamp/common/util/JogampVersion.java
@@ -30,6 +30,7 @@ package com.jogamp.common.util;
 
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.os.Platform;
+
 import java.util.Iterator;
 import java.util.Set;
 import java.util.jar.Attributes;
@@ -45,13 +46,16 @@ public class JogampVersion {
     private int hash;
     private Attributes mainAttributes;
     private Set/*<Attributes.Name>*/ mainAttributeNames;
-
-    protected JogampVersion(String packageName, Manifest mf) {
+    
+    private final String androidPackageVersionName;
+    
+    protected JogampVersion(String packageName, Manifest mf) {        
         this.packageName = packageName;
         this.mf = ( null != mf ) ? mf : new Manifest();
         this.hash = this.mf.hashCode();
         mainAttributes = this.mf.getMainAttributes();
         mainAttributeNames = mainAttributes.keySet();
+        androidPackageVersionName = AndroidPackageUtil.getAndroidPackageInfoVersionName(packageName);
     }
 
     @Override
@@ -98,6 +102,9 @@ public class JogampVersion {
     }
 
     public final String getExtensionName() {
+        if(null != androidPackageVersionName) {
+            return packageName;
+        }
         return this.getAttribute(Attributes.Name.EXTENSION_NAME);
     }
 
@@ -129,6 +136,10 @@ public class JogampVersion {
         return this.getAttribute(Attributes.Name.IMPLEMENTATION_VERSION);
     }
 
+    public final String getAndroidPackageVersionName() {
+        return androidPackageVersionName;
+    }
+    
     public final String getSpecificationTitle() {
         return this.getAttribute(Attributes.Name.SPECIFICATION_TITLE);
     }
@@ -162,6 +173,9 @@ public class JogampVersion {
         sb.append("Implementation Version: ").append(getImplementationVersion()).append(nl);
         sb.append("Implementation Branch: ").append(getImplementationBranch()).append(nl);
         sb.append("Implementation Commit: ").append(getImplementationCommit()).append(nl);
+        if(null != getAndroidPackageVersionName()) {
+            sb.append("Android Package Version: ").append(getAndroidPackageVersionName()).append(nl);
+        }
         return sb;
     }
 
-- 
cgit v1.2.3