vmassol 2003/10/24 07:18:54
Modified: . build-common.xml build.xml
documentation/docs/xdocs downloads.xml
Log:
Also use <name>-<version>.<extension> format for the src zip (Merged from 1.5 branch)
Revision Changes Path
1.34 +10 -2 jakarta-cactus/build-common.xml
Index: build-common.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build-common.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build-common.xml 23 Oct 2003 12:27:42 -0000 1.33
+++ build-common.xml 24 Oct 2003 14:18:54 -0000 1.34
@@ -2,7 +2,6 @@
=============================================================================
Build file used by the different Cactus subprojects. It contains common
Ant properties and common useful targets.
-
$Id$
=============================================================================
@@ -160,16 +159,25 @@
<property name="release.j2ee.dir"
location="${base.dir}/release-${j2ee.api}"/>
+
<condition property="release.dir" value="${release.j2ee.dir}">
<isset property="j2ee.api"/>
</condition>
<property name="release.dir" location="${base.dir}/release"/>
+
<condition property="main.release.name"
value="${project.prefix}-${project.name.file}-${j2ee.api}-${project.version}">
<isset property="j2ee.api"/>
</condition>
<property name="main.release.name"
value="${project.prefix}-${project.name.file}-${project.version}"/>
+
+ <condition property="main.release.src.name"
+
value="${project.prefix}-${project.name.file}-${j2ee.api}-src-${project.version}">
+ <isset property="j2ee.api"/>
+ </condition>
+ <property name="main.release.src.name"
+ value="${project.prefix}-${project.name.file}-src-${project.version}"/>
</target>
1.66 +3 -3 jakarta-cactus/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- build.xml 23 Oct 2003 12:27:42 -0000 1.65
+++ build.xml 24 Oct 2003 14:18:54 -0000 1.66
@@ -224,8 +224,8 @@
<target name="release.src"
depends="init.properties">
- <zip zipfile="${release.dir}/${main.release.name}-src.zip">
- <zipfileset dir="." prefix="${main.release.name}-src">
+ <zip zipfile="${release.dir}/${main.release.src.name}.zip">
+ <zipfileset dir="." prefix="${main.release.src.name}">
<exclude name="**/target*/**"/>
<exclude name="**/dist*/**"/>
<exclude name="**/release/**"/>
1.13 +1 -2 jakarta-cactus/documentation/docs/xdocs/downloads.xml
Index: downloads.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/downloads.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- downloads.xml 12 Sep 2003 11:21:02 -0000 1.12
+++ downloads.xml 24 Oct 2003 14:18:54 -0000 1.13
@@ -44,8 +44,7 @@
</p>
</li>
<li>
- <strong>jakarta-cactus-<version>-src.zip</strong> (or
- <strong>jakarta-cactus-src-<version>.zip</strong>)
+ <strong>jakarta-cactus-src-<version>.zip</strong>
<p>
The source distribution of Cactus. This corresponds to a clean CVS
checkout of the Cactus sources at the time the version was
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
