Author: niallp
Date: Tue Feb 14 14:19:52 2006
New Revision: 377859
URL: http://svn.apache.org/viewcvs?rev=377859&view=rev
Log:
Update 1.2.x ant build to automatically put the version in the jar's manifest
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/build.xml
struts/action/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF
Modified: struts/action/branches/STRUTS_1_2_BRANCH/build.xml
URL:
http://svn.apache.org/viewcvs/struts/action/branches/STRUTS_1_2_BRANCH/build.xml?rev=377859&r1=377858&r2=377859&view=diff
==============================================================================
--- struts/action/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/action/branches/STRUTS_1_2_BRANCH/build.xml Tue Feb 14 14:19:52 2006
@@ -253,6 +253,8 @@
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
+ <filter token="version" value="${project.version}"/>
+
<tstamp>
<format property="year" pattern="yyyy"/>
</tstamp>
@@ -355,6 +357,9 @@
<copy
todir="${build.home}/library/classes/org/apache/struts/resources">
<fileset dir="${conf.share.dir}" includes="**/*.dtd"/>
</copy>
+ <copy todir="${build.home}/conf" filtering="on">
+ <fileset dir="${conf.share.dir}" includes="*.MF"/>
+ </copy>
<copy file="${commons-beanutils.jar}"
tofile="${build.home}/library/commons-beanutils.jar"/>
@@ -422,7 +427,7 @@
value="http://jakarta.apache.org/struts/tags"/>
</replace>
<jar jarfile="${build.home}/library/${app.name}.jar"
- manifest="${conf.share.dir}/MANIFEST.MF"
+ manifest="${build.home}/conf/MANIFEST.MF"
basedir="${build.home}/library/classes"
includes="**"/>
</target>
Modified: struts/action/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF
URL:
http://svn.apache.org/viewcvs/struts/action/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF?rev=377859&r1=377858&r2=377859&view=diff
==============================================================================
--- struts/action/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF (original)
+++ struts/action/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF Tue Feb 14
14:19:52 2006
@@ -2,11 +2,11 @@
Extension-Name: Struts Framework
Specification-Title: Struts Framework
Specification-Vendor: The Apache Software Foundation
-Specification-Version: 1.2.9-SNAPSHOT
+Specification-Version: @version@
Implementation-Title: Struts Framework
Implementation-Vendor: The Apache Software Foundation
Implementation-Vendor-Id: org.apache
-Implementation-Version: 1.2.9-SNAPSHOT
+Implementation-Version: @version@
Class-Path:
commons-beanutils.jar
commons-digester.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
