zongaro 2004/02/22 17:39:56
Modified: java Tag: xslt20-compiled build.xml
java/src Tag: xslt20-compiled manifest.xsltc MANIFEST.MF
Log:
Applying patch for Bugzilla bug report 24728 from Sarah McNamara
(mcnamara () ca ! ibm ! com).
Use Ant's filtering capabilities to place appropriate "created-by" information
into the MANIFEST.MF file of the jar that's being built.
Revision Changes Path
No revision
No revision
1.196.2.7 +12 -2 xml-xalan/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/java/build.xml,v
retrieving revision 1.196.2.6
retrieving revision 1.196.2.7
diff -u -r1.196.2.6 -r1.196.2.7
--- build.xml 21 Jan 2004 19:19:41 -0000 1.196.2.6
+++ build.xml 23 Feb 2004 01:39:56 -0000 1.196.2.7
@@ -410,6 +410,8 @@
description="Jar just the xsltc.jar file" >
<!-- Copy over the manifest, with filtering (for version number) -->
<filter token="impl.version" value="${impl.version}"/>
+ <filter token="java.version" value="${java.version}"/>
+ <filter token="java.vendor" value="${java.vendor}"/>
<copy todir="${build.dir}" file="${manifest.xsltc.mf}" filtering="true"/>
<jar jarfile="${build.xsltc.jar}" manifest="${build.dir}/manifest.xsltc"
basedir="${build.classes}" >
<patternset><!-- relative to jar/@basedir -->
@@ -495,6 +497,8 @@
<!-- Copy over the manifest, with filtering (for version number) -->
<filter token="impl.version" value="${impl.version}"/>
+ <filter token="java.version" value="${java.version}"/>
+ <filter token="java.vendor" value="${java.vendor}"/>
<copy todir="${build.dir}" file="${manifest.xsltc.mf}" filtering="true"/>
<!-- make bundled jar named xsltc.jar -->
@@ -520,6 +524,8 @@
description="Jar up everything in Xalan interpretive (without XSLTC)" >
<!-- Copy over the manifest, with filtering (for version number) -->
<filter token="impl.version" value="${impl.version}"/>
+ <filter token="java.version" value="${java.version}"/>
+ <filter token="java.vendor" value="${java.vendor}"/>
<copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/>
<jar jarfile="${build.xalan-interpretive.jar}"
manifest="${build.dir}/MANIFEST.MF" basedir="${build.classes}" >
<patternset><!-- relative to jar/@basedir -->
@@ -539,6 +545,8 @@
<target name="unbundledjar"
depends="xalan-interpretive.compile,xsltc.compile"
description="Jar up Xalan and XSLTC, without the XSLTC dependencies" >
<filter token="impl.version" value="${impl.version}"/>
+ <filter token="java.version" value="${java.version}"/>
+ <filter token="java.vendor" value="${java.vendor}"/>
<copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/>
<jar jarfile="${build.xalan-unbundled.jar}"
manifest="${build.dir}/MANIFEST.MF" basedir="${build.classes}" >
<patternset>
@@ -559,6 +567,8 @@
<!-- Copy over the manifest, with filtering (for version number) -->
<filter token="impl.version" value="${impl.version}"/>
+ <filter token="java.version" value="${java.version}"/>
+ <filter token="java.vendor" value="${java.vendor}"/>
<copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/>
<!-- make bundled jar named xalan.jar -->
No revision
No revision
1.7.2.1 +1 -1 xml-xalan/java/src/manifest.xsltc
Index: manifest.xsltc
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/manifest.xsltc,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- manifest.xsltc 2 Jul 2003 17:07:15 -0000 1.7
+++ manifest.xsltc 23 Feb 2004 01:39:56 -0000 1.7.2.1
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Created-By: 1.2.2 (Sun Microsystems Inc.)
+Created-By: @java.version@ (@java.vendor@)
Name: org/apache/xalan/xsltc
Comment: Main XSLTC engine implementing TrAX/JAXP
1.9.2.1 +1 -1 xml-xalan/java/src/MANIFEST.MF
Index: MANIFEST.MF
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/MANIFEST.MF,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- MANIFEST.MF 2 Jul 2003 17:07:15 -0000 1.9
+++ MANIFEST.MF 23 Feb 2004 01:39:56 -0000 1.9.2.1
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Created-By: 1.2.2 (Sun Microsystems Inc.)
+Created-By: @java.version@ (@java.vendor@)
Main-Class: org.apache.xalan.xslt.Process
Class-Path: xercesImpl.jar xml-apis.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
