diff options
| author | Kenneth Russel <[email protected]> | 2006-03-25 02:11:29 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2006-03-25 02:11:29 +0000 |
| commit | 51b44871ec13d363f6261c1a28ccc2174b110cf5 (patch) | |
| tree | 101eb237c6dcb2ff8001224118b0c337476441ea | |
| parent | a4db00a6897cd71d36857a013cc91ac6641906ed (diff) | |
Fixed problem with dist target destroying version string in manifest
of assembled jogl.jar and typo in gluegen's license file name
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@680 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index 299733b85..01bef3fd7 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1183,7 +1183,14 @@ <fileset dir="${jogl.dist.dir}" includes="jogl-natives-*.jar" /> </delete> <delete file="${jogl.dist.dir}/jogl-src.zip" /> - <jar manifest="joglversion" destfile="${jogl.dist.dir}/jogl.jar" duplicate="preserve"> + <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}" > + <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" /> </jar> @@ -1205,7 +1212,7 @@ <!-- Build a source archive as well --> <zip destfile="${jogl.dist.dir}/jogl-src.zip" basedir="../.." - includes="gluegen/LICENCE.txt,gluegen/doc/**,gluegen/make/**,gluegen/src/**,jogl/LICENSE.txt,jogl/README.txt,jogl/doc/**,jogl/make/**,jogl/src/**" + includes="gluegen/LICENSE.txt,gluegen/doc/**,gluegen/make/**,gluegen/src/**,jogl/LICENSE.txt,jogl/README.txt,jogl/doc/**,jogl/make/**,jogl/src/**" excludes="**/*.class,**/*~" /> </target> |