diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/make/build.xml b/make/build.xml index a18406631..791e69aed 100644 --- a/make/build.xml +++ b/make/build.xml @@ -16,10 +16,12 @@ <target name="all.ide" description="Debug IDE build nativewindow, jogl and newt projects, including all junit tests, but don't tag the build or create archives" depends="init.debug,build.nativewindow,build.jogl,build.newt,one.dir,test.compile" /> - <target name="test.compile"> + <target name="test.compile.1"> <ant antfile="build-test.xml" target="test.compile" inheritRefs="true" inheritAll="true"/> </target> + <target name="test.compile" depends="test.compile.1,android.test.package"/> + <target name="test.auto.run" description="Run automated tests (junit and others) in nativewindow, jogl and newt projects"> <ant antfile="build-test.xml" target="test.auto.run" inheritRefs="true" inheritAll="true"/> </target> @@ -146,15 +148,16 @@ </jar> </target> - <target name="android.package.skip.check" depends="init,gluegen.cpptasks.detect.os"> - <uptodate property="android.package.skip" targetfile="${jar}/jogl.all-android.apk"> + <target name="android.package.jogl.skip.check" depends="init,gluegen.cpptasks.detect.os"> + <uptodate property="android.package.jogl.skip" targetfile="${jar}/jogl.all-android.apk"> <srcfiles dir="${jar}" includes="jogl.all-android.jar" /> <srcfiles dir="resources/android" includes="**" /> </uptodate> </target> - <target name="android.package" depends="init,gluegen.cpptasks.detect.os,android.package.skip.check" if="isAndroid" unless="android.package.skip"> + <target name="android.jogl.package" depends="init,gluegen.cpptasks.detect.os,android.package.jogl.skip.check" if="isAndroid" unless="android.package.jogl.skip"> <aapt.signed + jarsrcdir="${src}/jogl/classes" jarbuilddir="${jar}" jarbasename="jogl.all-android" nativebuilddir="${lib}" @@ -166,9 +169,29 @@ version.name="${jogl.version.plus}" /> </target> - <target name="android.launcher" depends="init,gluegen.cpptasks.detect.os" if="isAndroid"> + <target name="android.package.test.skip.check" depends="init,gluegen.cpptasks.detect.os"> + <uptodate property="android.package.test.skip" targetfile="${jar}/jogl.test.apk"> + <srcfiles dir="${jar}" includes="jogl.test.jar" /> + <srcfiles dir="resources/android" includes="**" /> + </uptodate> + </target> + + <target name="android.test.package" depends="init,gluegen.cpptasks.detect.os,android.package.test.skip.check" if="isAndroid" unless="android.package.test.skip"> + <aapt.signed + jarsrcdir="${src}/test" + jarbuilddir="${jar}" + jarbasename="jogl.test" + nativebuilddir="${lib}" + nativebasename="non-existing" + androidmanifest.path="resources/android/AndroidManifest-test.xml" + androidresources.path="resources/android/res-jogl" + jarmanifest.path="${build.jogl}/manifest.mf" + version.code="${jogl_int_version}" + version.name="${jogl.version.plus}" /> + </target> + + <target name="android.launcher.package" depends="init,gluegen.cpptasks.detect.os" if="isAndroid"> <mkdir dir="${build}/android/classes" /> - <mkdir dir="${build}/android/jar" /> <mkdir dir="${build}/android/lib" /> <javac destdir="${build}/android/classes" includes="com/jogamp/android/launcher/**" @@ -180,13 +203,13 @@ <src path="${project.root}/src/android" /> <classpath location="${android.jar}"/> </javac> - <jar destfile="${build}/android/jar/jogllauncher.jar" filesonly="true"> + <jar destfile="${jar}/jogl.android-launcher.jar" filesonly="true"> <fileset dir="${build}/android/classes" includes="com/jogamp/android/launcher/**"/> </jar> <aapt.signed - jarbuilddir="${build}/android/jar" - jarbasename="jogllauncher" + jarbuilddir="${jar}" + jarbasename="jogl.android-launcher" nativebuilddir="${build}/android/lib" nativebasename="non-existing" androidmanifest.path="resources/android/AndroidManifest-launcher.xml" @@ -218,7 +241,7 @@ </condition> </target> - <target name="one.dir" depends="one.dir.skip.check, one.jar.dir, android.package, android.launcher"/> + <target name="one.dir" depends="one.dir.skip.check, one.jar.dir, android.jogl.package, android.launcher.package"/> <target name="repack-jars" depends="one.jar.dir"> <!-- Re-pack jars we have the intent to compress later, after signing --> |