You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by zo...@apache.org on 2004/02/22 16:20:43 UTC

cvs commit: xml-xalan/java/src manifest.xsltc MANIFEST.MF

zongaro     2004/02/22 07:20:43

  Modified:    java     build.xml
               java/src 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
  1.204     +12 -2     xml-xalan/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/build.xml,v
  retrieving revision 1.203
  retrieving revision 1.204
  diff -u -r1.203 -r1.204
  --- build.xml	11 Feb 2004 14:48:41 -0000	1.203
  +++ build.xml	22 Feb 2004 15:20:43 -0000	1.204
  @@ -408,6 +408,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 -->
  @@ -493,6 +495,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 -->
  @@ -518,6 +522,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 -->
  @@ -537,6 +543,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>
  @@ -557,6 +565,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 -->
  
  
  
  1.8       +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.8
  diff -u -r1.7 -r1.8
  --- manifest.xsltc	2 Jul 2003 17:07:15 -0000	1.7
  +++ manifest.xsltc	22 Feb 2004 15:20:43 -0000	1.8
  @@ -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.10      +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.10
  diff -u -r1.9 -r1.10
  --- MANIFEST.MF	2 Jul 2003 17:07:15 -0000	1.9
  +++ MANIFEST.MF	22 Feb 2004 15:20:43 -0000	1.10
  @@ -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: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org