cziegeler 2003/07/03 05:50:49
Modified: . build.properties
src/targets dist-build.xml
Log:
Fix dist build
Revision Changes Path
1.23 +1 -1 cocoon-2.1/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.properties 30 Jun 2003 19:22:15 -0000 1.22
+++ build.properties 3 Jul 2003 12:50:48 -0000 1.23
@@ -160,7 +160,7 @@
# Distribution Directories
dist.root=dist
dist=${dist.root}/${name}-${version}
-dist.name=${name}-${version}-src
+dist.name=${name}-${version}
dist.target=${dist.root}
# Site Directory
1.7 +6 -6 cocoon-2.1/src/targets/dist-build.xml
Index: dist-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/dist-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dist-build.xml 20 May 2003 09:23:04 -0000 1.6
+++ dist-build.xml 3 Jul 2003 12:50:48 -0000 1.7
@@ -51,12 +51,12 @@
<fixcrlf srcdir="${dist}" includes="antRun" eol="lf"/>
<fixcrlf srcdir="${dist}" includes="**.bat" eol="crlf"/>
- <zip zipfile="${dist.target}/${dist.name}.zip"
+ <zip zipfile="${dist.target}/${dist.name}-src.zip"
basedir="${dist.root}"
includes="${dist.name}/**">
</zip>
- <tar tarfile="${dist.target}/${dist.name}.tar"
+ <tar tarfile="${dist.target}/${dist.name}-src.tar"
longfile="gnu">
<tarfileset dir="${dist.root}">
<include name="${dist.name}/**"/>
@@ -70,15 +70,15 @@
<include name="${dist.name}/tools/bin/antRun"/>
</tarfileset>
</tar>
- <gzip zipfile="${dist.target}/${dist.name}.tar.gz"
src="${dist.target}/${dist.name}.tar"/>
- <delete file="${dist.target}/${dist.name}.tar"/>
+ <gzip zipfile="${dist.target}/${dist.name}-src.tar.gz"
src="${dist.target}/${dist.name}-src.tar"/>
+ <delete file="${dist.target}/${dist.name}-src.tar"/>
</target>
<target name="clean-dist" depends="clean" description="Cleans everything
and brings back to original 'CVS checkout' state">
<delete dir="${build.root}"/>
<delete dir="${tools.tasks.dest}"/>
<delete dir="${tools.loader.dest}"/>
- <delete file="${dist.target}/${dist.name}.tar.gz"/>
- <delete file="${dist.target}/${dist.name}.zip"/>
+ <delete file="${dist.target}/${dist.name}-src.tar.gz"/>
+ <delete file="${dist.target}/${dist.name}-src.zip"/>
<delete dir="${dist.root}"/>
</target>
