diff options
19 files changed, 429 insertions, 57 deletions
diff --git a/make/Manifest b/make/Manifest index 0cca8b6..d362a39 100755 --- a/make/Manifest +++ b/make/Manifest @@ -9,6 +9,6 @@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ -Extension-Name: com.jogamp.common +Extension-Name: com.jogamp.gluegen Main-Class: com.jogamp.gluegen.GlueGen Class-Path: antlr.jar diff --git a/make/build-test.xml b/make/build-test.xml index f00e7b2..e54f17e 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -136,7 +136,7 @@ jarbasename="gluegen-test" nativebuilddir="${build_t.lib}" nativebasename="test" - androidmanifest.path="lib/android/AndroidManifest.xml" + androidmanifest.path="lib/android/AndroidManifest-Test.xml" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> </target> diff --git a/make/build.xml b/make/build.xml index 2b1454b..1fa52c4 100644 --- a/make/build.xml +++ b/make/build.xml @@ -30,12 +30,12 @@ </not> </condition> - <target name="setup-excludes-1" if="gluegen.nsig"> - <property name="gluegen.excludes" value="" /> + <target name="setup.excludes.nsig" unless="gluegen.nsig"> + <property name="gluegen.excludes.nsig" value="com/jogamp/gluegen/runtime/BufferFactoryInternal.java com/jogamp/gluegen/nativesig/**" /> </target> - <target name="setup-excludes-2" unless="gluegen.nsig"> - <property name="gluegen.excludes" value="com/jogamp/gluegen/runtime/BufferFactoryInternal.java,com/jogamp/gluegen/nativesig/**" /> + <target name="setup.excludes.android" unless="isAndroid"> + <property name="gluegen.excludes.android" value="jogamp/**/android/** com/jogamp/**/android/**" /> </target> <target name="set.debug"> @@ -45,7 +45,7 @@ </target> <target name="init.debug" depends="set.debug, init"/> - <target name="init" depends="jogamp.env.init,gluegen.properties.load.user,gluegen.cpptasks.detect.os,setup-excludes-1,setup-excludes-2"> + <target name="init" depends="jogamp.env.init,gluegen.properties.load.user,gluegen.cpptasks.detect.os,setup.excludes.nsig,setup.excludes.android"> <!-- Declare all paths and user defined variables. --> <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /--> @@ -85,7 +85,7 @@ <property name="gluegen_int_version" value="2"/> <property name="gluegen_base_version" value="2.0"/> <property name="gluegen.version" value="${gluegen_base_version}-b${gluegen.build.number}-${version.timestamp}" /> - <property name="gluegen.version.plus" value="${gluegen_base_version}-${gluegen.branch}-b${gluegen.build.number}-${gluegen.build.commit}-${version.timestamp}" /> + <property name="gluegen.version.plus" value="${gluegen_base_version}-${gluegen.build.branch}-b${gluegen.build.number}-${gluegen.build.commit}-${version.timestamp}" /> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> @@ -108,12 +108,29 @@ <mkdir dir="${src.generated.c}/Windows" /> <mkdir dir="${classes}" /> - <!-- Create the classpath for ANTLR. This requires the user-defined - - "antlr.jar" property. --> + <condition property="android.jar" value="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar"> + <isset property="isAndroid"/> + </condition> + + <!-- Create the classpath for ANTLR. + This requires the user-defined "antlr.jar" property. --> <path id="antlr.classpath"> <pathelement location="${antlr.jar}" /> </path> + <!-- Create the classpath for compiling GlueGen. + This requires the user-defined "antlr.jar" property. --> + <path id="gluegencompile.classpath"> + <pathelement location="${antlr.jar}" /> + <pathelement location="${android.jar}"/> + </path> + + <!-- Create the classpath for using GlueGen. --> + <path id="gluegen.classpath" > + <pathelement location="${classes}" /> + <pathelement location="${antlr.jar}" /> + </path> + <!-- The location of the GlueGen source and the C grammar files. --> <property name="gluegen" value="${src.java}/com/jogamp/gluegen" /> <property name="c.grammar" value="${gluegen}/cgram" /> @@ -138,6 +155,9 @@ <!-- property name="javac.memorymax" value="128m" /--> <!-- I ran out of memory with these .. linux x86_64 6u14 --> <property name="javac.memorymax" value="512m" /> + <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig} ${gluegen.excludes.android}" /> + <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> + <property name="jogamp.common.classes" value="com/jogamp/common/**"/> </target> <!-- @@ -188,11 +208,6 @@ <dirset id="stub.includes.fileset.macosx" dir="."> <include name="stub_includes/macosx/**" /> </dirset> - <!-- Define the classpath we should use --> - <path id="gluegen.classpath" > - <pathelement location="${classes}" /> - <pathelement location="${antlr.jar}" /> - </path> <!-- Define the GlueGen task we just built --> <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask" classpathref="gluegen.classpath" /> @@ -608,30 +623,27 @@ <!-- Build GlueGen using the generated Java files along with the - original source. --> - <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> - <property name="jogamp.common.classes" value="com/jogamp/common/**"/> - <!--compile gluegen-rt with source=1.5 first--> <javac destdir="${classes}" includeAntRuntime="false" - includes="${gluegen-rt.classes},${jogamp.common.classes}" - excludes="${gluegen.excludes}" + includes="${gluegen-rt.classes} ${jogamp.common.classes}" + excludes="${gluegen.excludes.all}" memoryMaximumSize="${javac.memorymax}" source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> - <classpath refid="antlr.classpath" /> + <classpath refid="gluegencompile.classpath" /> </javac> <!--compile gluegen with source=1.5--> <javac destdir="${classes}" includeAntRuntime="true" - excludes="${gluegen.excludes},${gluegen-rt.classes}" + excludes="${gluegen.excludes.all} ${gluegen-rt.classes}" memoryMaximumSize="${javac.memorymax}" source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> - <classpath refid="antlr.classpath" /> + <classpath refid="gluegencompile.classpath" /> </javac> <copy file="Manifest" @@ -696,7 +708,8 @@ jarbasename="gluegen-rt" nativebuilddir="${gluegen.lib.dir}" nativebasename="gluegen-rt" - androidmanifest.path="lib/android/AndroidManifest.xml" + androidmanifest.path="lib/android/AndroidManifest-Runtime.xml" + jarmanifest.path="${build}/Manifest-rt.temp" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> @@ -705,7 +718,8 @@ jarbasename="gluegen" nativebuilddir="${gluegen.lib.dir}" nativebasename="gluegen-rt" - androidmanifest.path="lib/android/AndroidManifest.xml" + androidmanifest.path="lib/android/AndroidManifest-CompileTime.xml" + jarmanifest.path="${build}/Manifest.temp" version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" /> diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index d07d6bc..f5872f2 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -14,6 +14,7 @@ nativebuilddir="${gluegen.lib.dir}" // native library build location nativebasename="gluegen-rt" // native library base file name "*${nativebasename}*.${native.library.suffix}" androidmanifest.path="lib/android/AndroidManifest.xml" + jarmanifest.path="${build}/Manifest-rt.temp" // optional version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" @@ -34,6 +35,7 @@ <attribute name="nativebuilddir" /> <attribute name="nativebasename" /> <attribute name="androidmanifest.path" /> + <attribute name="jarmanifest.path" default="/non.existing.manifest.file"/> <attribute name="version.code" /> <attribute name="version.name" /> <attribute name="keystore.file" default="/non.existing.user.keystore.file" /> @@ -69,6 +71,8 @@ <include name="*@{nativebasename}*.${native.library.suffix}" /> </fileset> </copy> + <copy file="@{androidmanifest.path}" tofile="${m.aapt.build.apk}/image/AndroidManifest.xml"/> + <copy file="@{jarmanifest.path}" failonerror="false" tofile="${m.aapt.build.apk}/image/META-INF/MANIFEST.MF"/> <echo>aapt.signed @{jarbasename}: dex'ing</echo> <exec dir="." executable="dx" logError="true" failonerror="true" failifexecutionfails="true"> @@ -91,17 +95,12 @@ <!--arg line="-v"/--> <arg line="--debug-mode"/> <arg line="-f"/> - <!-- arg line="-j" /> - <arg value="@{jarbuilddir}/@{jarbasename}.jar"/--> - - <arg line="-M" /> - <arg value="@{androidmanifest.path}"/> <arg line="-S" /> <arg value="lib/android/res"/> <arg line="-A" /> - <arg value="${m.aapt.build.apk}/image/lib/assets"/> <!-- FIXME: Should assets be in out lib/android/assets ?? --> + <arg value="${m.aapt.build.apk}/image/lib/assets"/> <arg line="-I" /> <arg value="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar"/> diff --git a/make/lib/android/AndroidManifest-CompileTime.xml b/make/lib/android/AndroidManifest-CompileTime.xml new file mode 100644 index 0000000..f9a5600 --- /dev/null +++ b/make/lib/android/AndroidManifest-CompileTime.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + sharedUserId="com.jogamp.Community" + package="com.jogamp.gluegen"> + + <uses-sdk android:minSdkVersion="8" /> + + <application android:icon="@drawable/icon" + android:label="@string/app_name" + android:description="@string/app_descr" + android:persistent="false" + > + <activity android:name="jogamp.common.os.android.GluegenVersionActivity" + android:finishOnTaskLaunch="true" + android:launchMode="singleTop" + android:label="@string/activity_v_name" + android:description="@string/activity_v_descr" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> diff --git a/make/lib/android/AndroidManifest-Runtime.xml b/make/lib/android/AndroidManifest-Runtime.xml new file mode 100644 index 0000000..7ad8304 --- /dev/null +++ b/make/lib/android/AndroidManifest-Runtime.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + sharedUserId="com.jogamp.Community" + package="com.jogamp.common"> + + <uses-sdk android:minSdkVersion="8" /> + + <application android:icon="@drawable/icon" + android:label="@string/app_name" + android:description="@string/app_descr" + android:persistent="false" + > + <activity android:name="jogamp.common.os.android.GluegenVersionActivity" + android:finishOnTaskLaunch="true" + android:launchMode="singleTop" + android:label="@string/activity_v_name" + android:description="@string/activity_v_descr" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> diff --git a/make/lib/android/AndroidManifest-Test.xml b/make/lib/android/AndroidManifest-Test.xml new file mode 100644 index 0000000..c7c8f03 --- /dev/null +++ b/make/lib/android/AndroidManifest-Test.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + sharedUserId="com.jogamp.Community" + package="com.jogamp.gluegen.test"> + + <uses-sdk android:minSdkVersion="8" /> + + <application android:icon="@drawable/icon" + android:label="@string/app_name" + android:description="@string/app_descr" + android:persistent="false" + > + <activity android:name="jogamp.common.os.android.GluegenVersionActivity" + android:finishOnTaskLaunch="true" + android:launchMode="singleTop" + android:label="@string/activity_v_name" + android:description="@string/activity_v_descr" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> diff --git a/make/lib/android/AndroidManifest.xml b/make/lib/android/AndroidManifest.xml deleted file mode 100644 index 121a876..0000000 --- a/make/lib/android/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.jogamp.gluegen"> - <uses-sdk android:minSdkVersion="8" /> - - <application android:icon="@drawable/icon" android:label="@string/app_name"> - <activity android:name=".GluegenActivity" - android:label="@string/app_name"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - - </application> -</manifest> diff --git a/make/lib/android/res/values/strings.xml b/make/lib/android/res/values/strings.xml index 07501cc..f6a6fe4 100644 --- a/make/lib/android/res/values/strings.xml +++ b/make/lib/android/res/values/strings.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="hello">GlueGen Activity is Greeting You.</string> - <string name="app_name">GlueGen</string> + <string name="app_name">JogAmp\'s GlueGen Library</string> + <string name="app_descr">Contains Dalvik and native code, supporting native bindings.</string> + <string name="activity_v_name">GlueGen\'s Version</string> + <string name="activity_v_descr">Shows the version of the GlueGen Library.</string> </resources> diff --git a/make/scripts/crosstest-java-android-armv7-rel.sh b/make/scripts/crosstest-java-android-armv7-rel.sh index 822d03d..4a1b4b9 100644 --- a/make/scripts/crosstest-java-android-armv7-rel.sh +++ b/make/scripts/crosstest-java-android-armv7-rel.sh @@ -24,6 +24,7 @@ fi #TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter #TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter TSTCLASS=com.jogamp.common.GlueGenVersion +# am start -a android.intent.action.MAIN -n com.jogamp.common/jogamp.common.os.android.GluegenVersionActivity LOGFILE=`basename $0 .sh`.log diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh index efeb0ea..f49383a 100644 --- a/make/scripts/crosstest-java-linux-armv7-rel.sh +++ b/make/scripts/crosstest-java-linux-armv7-rel.sh @@ -8,7 +8,8 @@ export TARGET_ROOT=projects-cross export BUILD_DIR=../build-linux-armv7 -TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter +#TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter +TSTCLASS=com.jogamp.common.GlueGenVersion LOGFILE=`basename $0 .sh`.log diff --git a/src/java/com/jogamp/common/GlueGenVersion.java b/src/java/com/jogamp/common/GlueGenVersion.java index c3dcc75..5ae3412 100644 --- a/src/java/com/jogamp/common/GlueGenVersion.java +++ b/src/java/com/jogamp/common/GlueGenVersion.java @@ -44,9 +44,15 @@ public class GlueGenVersion extends JogampVersion { if(null == jogampCommonVersionInfo) { // volatile: ok synchronized(GlueGenVersion.class) { if( null == jogampCommonVersionInfo ) { - final String packageName = "com.jogamp.common"; - final Manifest mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), "com.jogamp.common"); - jogampCommonVersionInfo = new GlueGenVersion(packageName, mf); + final String packageNameCompileTime = "com.jogamp.gluegen"; + final String packageNameRuntime = "com.jogamp.common"; + Manifest mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), packageNameRuntime); + if(null != mf) { + jogampCommonVersionInfo = new GlueGenVersion(packageNameRuntime, mf); + } else { + mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), packageNameCompileTime); + jogampCommonVersionInfo = new GlueGenVersion(packageNameCompileTime, mf); + } } } } diff --git a/src/java/com/jogamp/common/os/AndroidVersion.java b/src/java/com/jogamp/common/os/AndroidVersion.java index 22786d2..b577631 100644 --- a/src/java/com/jogamp/common/os/AndroidVersion.java +++ b/src/java/com/jogamp/common/os/AndroidVersion.java @@ -1,8 +1,6 @@ package com.jogamp.common.os; -import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.Map; diff --git a/src/java/com/jogamp/common/util/AndroidPackageUtil.java b/src/java/com/jogamp/common/util/AndroidPackageUtil.java new file mode 100644 index 0000000..86b25dd --- /dev/null +++ b/src/java/com/jogamp/common/util/AndroidPackageUtil.java @@ -0,0 +1,59 @@ +/** + * 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 com.jogamp.common.util; + +import java.lang.reflect.Method; + +public class AndroidPackageUtil { + + static final Method androidPackageInfoUtilGetVersionName; + static final boolean androidPackageInfoUtilAvailable; + static { + final ClassLoader cl = AndroidPackageUtil.class.getClassLoader(); + Method m=null; + try { + final Class c = ReflectionUtil.getClass("jogamp.common.os.android.PackageInfoUtil", true, cl); + m = ReflectionUtil.getMethod(c, "getPackageInfoVersionName", String.class); + } catch (Exception e) { /* n/a */ } + androidPackageInfoUtilGetVersionName = m; + androidPackageInfoUtilAvailable = null != m ; + } + + public static boolean isAndroidPackageInfoAvailable() { + return androidPackageInfoUtilAvailable; + } + + public static String getAndroidPackageInfoVersionName(String packageName) { + if(androidPackageInfoUtilAvailable) { + return (String) ReflectionUtil.callMethod(null, androidPackageInfoUtilGetVersionName, packageName); + } + return null; + } +} + 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; } 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; + } +} |