diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 2 | ||||
| -rw-r--r-- | make/build.xml | 20 | ||||
| -rwxr-xr-x | make/scripts/adb-install-all-armv7.sh | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 7540c1c..a5417b6 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -86,7 +86,7 @@ </path> <property name="junit.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> <property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen.root}/make/lib/TestJarsInJar.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> - <property name="junit.run.remote.apks" value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${build_t}/gluegen-test.apk${path.separator}${gluegen.root}/make/lib/TestJarsInJar.apk"/> + <property name="junit.run.remote.apks" value="${gluegen.root}/${rootrel.build}/jogamp-android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${build_t}/gluegen-test.apk${path.separator}${gluegen.root}/make/lib/TestJarsInJar.apk"/> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> diff --git a/make/build.xml b/make/build.xml index 9b4e316..671e3c3 100644 --- a/make/build.xml +++ b/make/build.xml @@ -141,7 +141,7 @@ <property name="archive" value="${build}/${archive.name}" /> <!-- the launcher is compiled and packaged explicit - if android --> - <property name="jogamp.android-launcher.classes" value="jogamp/android/launcher/**"/> + <property name="jogamp-android-launcher.classes" value="jogamp/android/launcher/**"/> <!-- optional android classes - if android --> <property name="java.part.android" value="jogamp/common/os/android/**"/> @@ -150,7 +150,7 @@ <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> <property name="jogamp.common.classes" value="com/jogamp/common/** jogamp/common/**"/> - <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig} ${jogamp.android-launcher.classes}" /> + <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig} ${jogamp-android-launcher.classes}" /> </target> @@ -709,7 +709,7 @@ <jar destfile="${build}/gluegen.jar" manifest="${build}/Manifest.temp"> <fileset dir="${classes}"> <include name="**/*.class" /> - <exclude name="${jogamp.android-launcher.classes}" /> + <exclude name="${jogamp-android-launcher.classes}" /> <exclude name="${java.part.android}" /> </fileset> <fileset dir="resources/assets"> @@ -734,7 +734,7 @@ <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/common/**" /> <include name="jogamp/common/**" /> - <exclude name="${jogamp.android-launcher.classes}" /> + <exclude name="${jogamp-android-launcher.classes}" /> <exclude name="${java.part.android}" /> </fileset> <fileset dir="resources/assets"> @@ -793,7 +793,7 @@ <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/common/**" /> <include name="jogamp/common/**" /> - <exclude name="${jogamp.android-launcher.classes}" /> + <exclude name="${jogamp-android-launcher.classes}" /> </fileset> <fileset dir="resources/assets"> <include name="**" /> @@ -812,14 +812,14 @@ <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "resources/android" includes="**/*.xml"/> <srcfiles dir= "${src.java}/jogamp/android/launcher" includes="**"/> - <mapper type="merge" to="${build}/jogamp.android-launcher.jar"/> + <mapper type="merge" to="${build}/jogamp-android-launcher.jar"/> </uptodate> </target> <target name="android-launcher.build" depends="gluegen.cpptasks.detect.os,gluegen.build.check.android-launcher" if="isAndroid" unless="gluegen.build.skip.android-launcher"> <javac destdir="${classes}" includeAntRuntime="false" - includes="${jogamp.android-launcher.classes}" + includes="${jogamp-android-launcher.classes}" excludes="${jogamp.common.classes}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" @@ -842,16 +842,16 @@ </filterset> </copy> - <jar destfile="${build}/jogamp.android-launcher.jar" manifest="${build}/Manifest-android-launcher.temp"> + <jar destfile="${build}/jogamp-android-launcher.jar" manifest="${build}/Manifest-android-launcher.temp"> <fileset dir="${classes}"> - <include name="${jogamp.android-launcher.classes}" /> + <include name="${jogamp-android-launcher.classes}" /> </fileset> </jar> <aapt.signed assetsdir="resources/assets-launcher" jarbuilddir="${build}" - jarbasename="jogamp.android-launcher" + jarbasename="jogamp-android-launcher" nativebuilddir="${build}" nativebasename="non-existing" androidmanifest.path="resources/android/AndroidManifest-Launcher.xml" diff --git a/make/scripts/adb-install-all-armv7.sh b/make/scripts/adb-install-all-armv7.sh index 6f271eb..9a0e4f7 100755 --- a/make/scripts/adb-install-all-armv7.sh +++ b/make/scripts/adb-install-all-armv7.sh @@ -1,2 +1,2 @@ -adb $* install ../build-android-armv7/jogamp.android-launcher.apk +adb $* install ../build-android-armv7/jogamp-android-launcher.apk adb $* install ../build-android-armv7/gluegen-rt-android-armeabi-v7a.apk |