Author: niallp
Date: Tue Feb 14 14:21:50 2006
New Revision: 377860
URL: http://svn.apache.org/viewcvs?rev=377860&view=rev
Log:
Update 1.2.x ant build to add a manifest for the el jar and automatically put
the version in the jar's manifest
Added:
struts/el/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF (with props)
Modified:
struts/el/branches/STRUTS_1_2_BRANCH/build.xml
Modified: struts/el/branches/STRUTS_1_2_BRANCH/build.xml
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/build.xml?rev=377860&r1=377859&r2=377860&view=diff
==============================================================================
--- struts/el/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/el/branches/STRUTS_1_2_BRANCH/build.xml Tue Feb 14 14:21:50 2006
@@ -52,7 +52,7 @@
These default values assume that the checked out locations are the same
as the full repository paths, and that you are building the trunk.
-->
- <property name="struts.core.home" value="../.."/>
+ <property name="struts.core.home" value="../action"/>
<!-- Load local and user build preferences -->
<property file="build.properties"/>
@@ -196,6 +196,8 @@
<echo message="struts.jar = ${struts.jar}"/>
<echo message="struts-el.jar = ${struts-el.jar}"/>
+ <filter token="version" value="${project.version}"/>
+
<tstamp>
<format property="year" pattern="yyyy"/>
</tstamp>
@@ -212,6 +214,9 @@
<copy file="${jstl.jar}" tofile="${build.home}/library/jstl.jar"/>
<copy file="${jstl-standard.jar}"
tofile="${build.home}/library/standard.jar"/>
+ <copy todir="${build.home}/conf" filtering="on">
+ <fileset dir="${conf.share.dir}" includes="*.MF"/>
+ </copy>
<!-- Compile-time dependency only
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
@@ -289,6 +294,7 @@
value="http://jakarta.apache.org/struts/tags"/>
</replace>
<jar jarfile="${build.home}/library/${app.name}.jar"
+ manifest="${build.home}/conf/MANIFEST.MF"
basedir="${build.home}/library/classes" includes="**"/>
</target>
Added: struts/el/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF?rev=377860&view=auto
==============================================================================
--- struts/el/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF (added)
+++ struts/el/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF Tue Feb 14
14:21:50 2006
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Extension-Name: Struts Framework EL Extension
+Specification-Title: Struts Framework EL Extension
+Specification-Vendor: The Apache Software Foundation
+Specification-Version: @version@
+Implementation-Title: Struts Framework EL Extension
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Vendor-Id: org.apache
+Implementation-Version: @version@
Propchange: struts/el/branches/STRUTS_1_2_BRANCH/conf/share/MANIFEST.MF
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
