diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/make/build.xml b/make/build.xml index 9258df0e9..23aa218b4 100644 --- a/make/build.xml +++ b/make/build.xml @@ -99,7 +99,7 @@ </target> <target name="one.jar.dir.android" depends="one.jar.dir.prep" if="isAndroid" unless="one.dir.skip"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-android.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-android.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_core_atoms.classpath"/> @@ -111,7 +111,7 @@ </target> <target name="one.jar.dir" depends="one.jar.dir.prep,one.jar.dir.android" unless="one.dir.skip"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all_atoms.classpath"/> @@ -120,7 +120,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-noawt.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-noawt.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all-noawt_atoms.classpath"/> @@ -129,7 +129,7 @@ </zips> </archives> </jar> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.all-mobile.jar}" filesonly="true" excludes="META-INF/*"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-mobile.jar}" filesonly="true" excludes="META-INF/*"> <archives> <zips> <path refid="nativewindow_all-noawt_atoms.classpath"/> @@ -147,8 +147,8 @@ </target> <target name="android.package.jogl.skip.check" depends="init,gluegen.cpptasks.detect.os"> - <uptodate property="android.package.jogl.skip" targetfile="${jogl.all-android.apk}"> - <srcfiles dir="${jar}" includes="jogl.all-android.jar" /> + <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> </target> @@ -158,7 +158,7 @@ assetsdir="resources/assets" jarsrcdir="${src}/jogl/classes" jarbuilddir="${jar}" - jarbasename="jogl.all-android" + jarbasename="jogl-all-android" nativebuilddir="${lib}" nativebasename="" android.abi="${android.abi}" @@ -173,12 +173,12 @@ <uptodate property="one.dir.skip.native" targetfile="${jar}/jogl-all-natives-${os.and.arch}.jar"> <srcfiles dir="${lib}" includes="*.${native.library.suffix}" /> </uptodate> - <uptodate property="one.dir.skip.all" targetfile="${jogl.all.jar}"> + <uptodate property="one.dir.skip.all" targetfile="${jogl-all.jar}"> <srcfiles dir="${build.nativewindow}" includes="*.jar"/> <srcfiles dir="${build.jogl}" includes="*.jar"/> <srcfiles dir="${build.newt}" includes="*.jar"/> </uptodate> - <uptodate property="one.dir.skip.android" targetfile="${jogl.all-android.jar}"> + <uptodate property="one.dir.skip.android" targetfile="${jogl-all-android.jar}"> <srcfiles dir="${build.nativewindow}" includes="*.jar"/> <srcfiles dir="${build.jogl}" includes="*.jar"/> <srcfiles dir="${build.newt}" includes="*.jar"/> |