summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-06-26 10:44:08 +0200
committerSven Gothel <[email protected]>2012-06-26 10:44:08 +0200
commita393e45613d87101dbb13763df263c2f9291d2d0 (patch)
tree58acfeb9a1333032267a4607d36c3b7c1f4640df /make/build.xml
parenta1e299b0c376c0ac726125d929bab2f68fe667d1 (diff)
Implement Bug #598 - JOGL ALL JAR File Change incl. it's Native Jar URL Derivation
- Depends on GlueGen commit 9a71703904ebfec343fb2c7266343d37a2e4c3db JAR file name changes: ALL JARs: - jogl.all.jar -> jogl-all.jar - jogl.all-noawt.jar -> jogl-all-noawt.jar - jogl.all-mobile.jar -> jogl-all-mobile.jar - jogl.all-android.jar -> jogl-all-android.jar - jogl.all-android.apk -> jogl-all-android.apk Atomic JARs: - nativewindow.core.jar -> nativewindow-core.jar - nativewindow.awt.jar -> nativewindow-awt.jar - nativewindow.os.x11.jar -> nativewindow-os-x11.jar - nativewindow.os.win.jar -> nativewindow-os-win.jar - nativewindow.os.macosx.jar -> nativewindow-os-osx.jar - jogl.core.jar -> jogl-core.jar - jogl.sdk.jar -> jogl-sdk.jar - jogl.glmobile.jar -> jogl-glmobile.jar - jogl.glmobile.dbg.jar -> jogl-glmobile-dbg.jar - jogl.util.jar -> jogl-util.jar - jogl.glutess.jar -> jogl-glutess.jar - jogl.glumipmap.jar -> jogl-glumipmap.jar - jogl.util.fixedfuncemu.jar -> jogl-util-fixedfuncemu.jar - jogl.awt.jar -> jogl-awt.jar - jogl.swt.jar -> jogl-swt.jar - jogl.util.awt.jar -> jogl-util-awt.jar - jogl.os.x11.jar -> jogl-os-x11.jar - jogl.os.win.jar -> jogl-os-win.jar - jogl.os.osx.jar -> jogl-os-osx.jar - jogl.os.android.jar -> jogl-os-android.jar - jogl.gldesktop.jar -> jogl-gldesktop.jar - jogl.gldesktop.dbg.jar -> jogl-gldesktop-dbg.jar - jogl.glugldesktop.jar -> jogl-glu-gldesktop.jar - jogl.util.gldesktop.jar -> jogl-util-gldesktop.jar - jogl.omx.jar -> jogl-omx.jar - jogl.cg.jar -> jogl-cg.jar - newt.core.jar -> newt-core.jar - newt.ogl.jar -> newt-ogl.jar - newt.awt.jar -> newt-awt.jar - newt.event.jar -> newt-event.jar - newt.driver.x11.jar -> newt-driver-x11.jar - newt.driver.win.jar -> newt-driver-win.jar - newt.driver.macosx.jar -> newt-driver-osx.jar - newt.driver.android.jar -> newt-driver-android.jar - newt.driver.kd.jar -> newt-driver-kd.jar - newt.driver.intelgdl.jar -> newt-driver-intelgdl.jar - newt.driver.broadcomegl.jar -> newt-driver-broadcomegl.jar Test JARs: - jogl.test.jar -> jogl-test.jar - jogl.test-android.jar -> jogl-test-android.jar - jogl.test-android.apk -> jogl-test-android.apk
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml18
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"/>