diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/make/build.xml b/make/build.xml index a39707769..5a17812e0 100644 --- a/make/build.xml +++ b/make/build.xml @@ -16,12 +16,10 @@ <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.1"> + <target name="test.compile"> <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> @@ -149,7 +147,7 @@ </target> <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"> + <uptodate property="android.package.jogl.skip" targetfile="${jogl.all-android.apk}"> <srcfiles dir="${jar}" includes="jogl.all-android.jar" /> <srcfiles dir="resources/android" includes="**" /> </uptodate> @@ -170,28 +168,6 @@ version.name="${jogl.version.plus}" /> </target> - <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" - android.abi="${android.abi}" - 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/lib" /> |