aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2007-01-24 01:48:57 +0000
committerKenneth Russel <[email protected]>2007-01-24 01:48:57 +0000
commit6b9a49f4f7ea4c1c1e8d52760c1849637f285f65 (patch)
tree65136e360b29b6a487ec6e0e7b58b0a18b42564c
parentd6596e7ca5e5e11106fd06d60e2bc41e4fbbfd33 (diff)
Inserted pack200 repacking into the dist build target, and removed the
obsolete redist target git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1101 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--make/build.xml34
1 files changed, 5 insertions, 29 deletions
diff --git a/make/build.xml b/make/build.xml
index c204b106f..bb4a37988 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -1391,6 +1391,11 @@
<zipgroupfileset dir="${jogl.dist.dir}"
includes="jogl-win/jogl.jar, jogl-linux/jogl.jar, jogl-macosx/jogl.jar" />
</jar>
+ <!-- Apply Pack200 repacking to allow later compression by that mechanism -->
+ <apply executable="pack200" verbose="true" >
+ <arg value="--repack" />
+ <fileset file="${jogl.dist.dir}/jogl.jar" />
+ </apply>
<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" />
@@ -1531,35 +1536,6 @@
includes="*.jar" />
</target>
- <!-- unjar and re-jar the platform-independent jogl.jar with the official manifest -->
- <target name="redist" depends="dist.dir.check">
- <condition property="dist.complete">
- <available file="${jogl.dist.dir}/jogl.jar" />
- </condition>
- <fail unless="dist.complete">
- ******************************************************************
- ** It appears the dist command did not complete; the platform- **
- ** independent jogl.jar is missing. Please check the status of **
- ** the dist build and try again. **
- ******************************************************************
- </fail>
- <delete dir="${jogl.dist.dir}/tmp" failonerror="false" />
- <mkdir dir="${jogl.dist.dir}/tmp" />
- <unjar src="${jogl.dist.dir}/jogl.jar" dest="${jogl.dist.dir}/tmp" />
- <delete dir="${jogl.dist.dir}/tmp/META-INF" />
- <delete file="${jogl.dist.dir}/jogl.jar" />
- <jar manifest="joglRIversion"
- destfile="${jogl.dist.dir}/jogl.jar"
- basedir="${jogl.dist.dir}/tmp"
- includes="*/**" />
- <delete dir="${jogl.dist.dir}/tmp" />
- <!-- Apply Pack200 repacking to allow later compression by that mechanism -->
- <apply executable="pack200" verbose="true" >
- <arg value="--repack" />
- <fileset file="${jogl.dist.dir}/jogl.jar" />
- </apply>
- </target>
-
<!-- ================================================================== -->
<!--
- Clean up all that is built.