summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgfxadmin <[email protected]>2006-04-14 21:58:50 +0000
committergfxadmin <[email protected]>2006-04-14 21:58:50 +0000
commit1e5239d17e5e4f59220785fb7d3d7a0e053116f8 (patch)
treec50c867e4efca111e221203ee5f4b060fb5dc590
parentbf717a6e0f61b5082a667292b95d89c354c5abad (diff)
Issue number:
Obtained from: Submitted by: Travis Reviewed by: Modify dist build target. New nomenclature for jogl-native*.jar files that distinguishes 32 and 64 bit targets. Starting tonight the nightly build uploads will use the new nomenclature: jogl-natives-solaris-sparc32.jar jogl-natives-solaris-i586.jar jogl-natives-linux-i586.jar jogl-natives-windows-i586.jar jogl-natives-macosx-ppc.jar We will soon be uploading 64 bit targets, too. Modified Files: make/build.xml git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@716 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--make/build.xml54
1 files changed, 27 insertions, 27 deletions
diff --git a/make/build.xml b/make/build.xml
index 93a988b80..42cc0c260 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -1124,7 +1124,7 @@
- fully cross-compiled at this time. To run this target, you need to
- specify the property jogl.dist.dir as a System property (i.e.,
- "ant -Djogl.dist.dir=../dist dist"); directories named jogl-linux,
- - jogl-win32, and jogl-macosx need to be inside that directory and each
+ - jogl-win, and jogl-macosx need to be inside that directory and each
- of those directories needs to contain both the jogl.jar for that
- platform as well as the native code (libjogl.so, jogl.dll, or
- libjogl.jnilib). Also builds jars containing the native code for
@@ -1145,10 +1145,10 @@
<target name="dist.check.windows" if="jogl.dist.dir">
<condition property="windows.complete">
<and>
- <available file="${jogl.dist.dir}/jogl-win32/jogl.jar" />
- <available file="${jogl.dist.dir}/jogl-win32/jogl.dll" />
- <available file="${jogl.dist.dir}/jogl-win32/jogl_awt.dll" />
- <available file="${jogl.dist.dir}/jogl-win32/jogl_cg.dll" />
+ <available file="${jogl.dist.dir}/jogl-win/jogl.jar" />
+ <available file="${jogl.dist.dir}/jogl-win/32/jogl.dll" />
+ <available file="${jogl.dist.dir}/jogl-win/32/jogl_awt.dll" />
+ <available file="${jogl.dist.dir}/jogl-win/32/jogl_cg.dll" />
</and>
</condition>
<fail unless="windows.complete">
@@ -1164,9 +1164,9 @@
<condition property="linux.complete">
<and>
<available file="${jogl.dist.dir}/jogl-linux/jogl.jar" />
- <available file="${jogl.dist.dir}/jogl-linux/libjogl.so" />
- <available file="${jogl.dist.dir}/jogl-linux/libjogl_awt.so" />
- <available file="${jogl.dist.dir}/jogl-linux/libjogl_cg.so" />
+ <available file="${jogl.dist.dir}/jogl-linux/32/libjogl.so" />
+ <available file="${jogl.dist.dir}/jogl-linux/32/libjogl_awt.so" />
+ <available file="${jogl.dist.dir}/jogl-linux/32/libjogl_cg.so" />
</and>
</condition>
<fail unless="linux.complete">
@@ -1182,9 +1182,9 @@
<condition property="macosx.complete">
<and>
<available file="${jogl.dist.dir}/jogl-macosx/jogl.jar" />
- <available file="${jogl.dist.dir}/jogl-macosx/libjogl.jnilib" />
- <available file="${jogl.dist.dir}/jogl-macosx/libjogl_awt.jnilib" />
- <available file="${jogl.dist.dir}/jogl-macosx/libjogl_cg.jnilib" />
+ <available file="${jogl.dist.dir}/jogl-macosx/ppc/libjogl.jnilib" />
+ <available file="${jogl.dist.dir}/jogl-macosx/ppc/libjogl_awt.jnilib" />
+ <available file="${jogl.dist.dir}/jogl-macosx/ppc/libjogl_cg.jnilib" />
</and>
</condition>
<fail unless="macosx.complete">
@@ -1200,8 +1200,8 @@
<condition property="solsparc.complete">
<and>
<available file="${jogl.dist.dir}/jogl-solsparc/jogl.jar" />
- <available file="${jogl.dist.dir}/jogl-solsparc/libjogl.so" />
- <available file="${jogl.dist.dir}/jogl-solsparc/libjogl_awt.so" />
+ <available file="${jogl.dist.dir}/jogl-solsparc/32/libjogl.so" />
+ <available file="${jogl.dist.dir}/jogl-solsparc/32/libjogl_awt.so" />
</and>
</condition>
<fail unless="solsparc.complete">
@@ -1217,8 +1217,8 @@
<condition property="solx86.complete">
<and>
<available file="${jogl.dist.dir}/jogl-solx86/jogl.jar" />
- <available file="${jogl.dist.dir}/jogl-solx86/libjogl.so" />
- <available file="${jogl.dist.dir}/jogl-solx86/libjogl_awt.so" />
+ <available file="${jogl.dist.dir}/jogl-solx86/32/libjogl.so" />
+ <available file="${jogl.dist.dir}/jogl-solx86/32/libjogl_awt.so" />
</and>
</condition>
<fail unless="solx86.complete">
@@ -1238,29 +1238,29 @@
<delete file="${jogl.dist.dir}/jogl-src.zip" />
<delete dir="${jogl.dist.dir}/META-INF" failonerror="false" />
<!-- Extract manifest from one of the jars to re-use it in the dist jar -->
- <unjar src="${jogl.dist.dir}/jogl-win32/jogl.jar" dest="${jogl.dist.dir}" >
+ <unjar src="${jogl.dist.dir}/jogl-win/jogl.jar" dest="${jogl.dist.dir}" >
<patternset>
<include name="META-INF/MANIFEST.MF" />
</patternset>
</unjar>
<jar manifest="${jogl.dist.dir}/META-INF/MANIFEST.MF" destfile="${jogl.dist.dir}/jogl.jar" duplicate="preserve">
<zipgroupfileset dir="${jogl.dist.dir}"
- includes="jogl-win32/*.jar, jogl-linux/*.jar, jogl-macosx/*.jar" />
+ includes="jogl-win/*.jar, jogl-linux/*.jar, jogl-macosx/*.jar" />
</jar>
- <jar destfile="${jogl.dist.dir}/jogl-natives-win32.jar"
- basedir="${jogl.dist.dir}/jogl-win32"
+ <jar destfile="${jogl.dist.dir}/jogl-natives-windows-i586.jar"
+ basedir="${jogl.dist.dir}/jogl-win/32"
includes="jogl.dll,jogl_awt.dll,jogl_cg.dll" />
- <jar destfile="${jogl.dist.dir}/jogl-natives-linux.jar"
- basedir="${jogl.dist.dir}/jogl-linux"
+ <jar destfile="${jogl.dist.dir}/jogl-natives-linux-i586.jar"
+ basedir="${jogl.dist.dir}/jogl-linux/32"
includes="libjogl.so,libjogl_awt.so,libjogl_cg.so,libjogl_drihack.so" />
- <jar destfile="${jogl.dist.dir}/jogl-natives-macosx.jar"
- basedir="${jogl.dist.dir}/jogl-macosx"
+ <jar destfile="${jogl.dist.dir}/jogl-natives-macosx-ppc.jar"
+ basedir="${jogl.dist.dir}/jogl-macosx/ppc"
includes="libjogl.jnilib,libjogl_awt.jnilib,libjogl_cg.jnilib" />
- <jar destfile="${jogl.dist.dir}/jogl-natives-solsparc.jar"
- basedir="${jogl.dist.dir}/jogl-solsparc"
+ <jar destfile="${jogl.dist.dir}/jogl-natives-solaris-sparc32.jar"
+ basedir="${jogl.dist.dir}/jogl-solsparc/32"
includes="libjogl.so,libjogl_awt.so,libjogl_drihack.so" />
- <jar destfile="${jogl.dist.dir}/jogl-natives-solx86.jar"
- basedir="${jogl.dist.dir}/jogl-solx86"
+ <jar destfile="${jogl.dist.dir}/jogl-natives-solaris-i586.jar"
+ basedir="${jogl.dist.dir}/jogl-solx86/32"
includes="libjogl.so,libjogl_awt.so,libjogl_drihack.so" />
<!-- Build a source archive as well -->
<zip destfile="${jogl.dist.dir}/jogl-src.zip"