aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rwxr-xr-xmake/Manifest2
-rw-r--r--make/build-test.xml2
-rw-r--r--make/build.xml60
-rw-r--r--make/jogamp-androidtasks.xml11
-rw-r--r--make/lib/android/AndroidManifest-CompileTime.xml26
-rw-r--r--make/lib/android/AndroidManifest-Runtime.xml26
-rw-r--r--make/lib/android/AndroidManifest-Test.xml26
-rw-r--r--make/lib/android/AndroidManifest.xml16
-rw-r--r--make/lib/android/res/values/strings.xml5
-rw-r--r--make/scripts/crosstest-java-android-armv7-rel.sh1
-rw-r--r--make/scripts/crosstest-java-linux-armv7-rel.sh3
11 files changed, 129 insertions, 49 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 22:45:29 +0000