You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by je...@apache.org on 2006/11/13 16:15:22 UTC

svn commit: r474363 - /xmlgraphics/commons/trunk/build.xml

Author: jeremias
Date: Mon Nov 13 07:15:21 2006
New Revision: 474363

URL: http://svn.apache.org/viewvc?view=rev&rev=474363
Log:
Merge from branch 1.1:
Placing the license files in META-INF as seems to be the suggested way.

Modified:
    xmlgraphics/commons/trunk/build.xml

Modified: xmlgraphics/commons/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/build.xml?view=diff&rev=474363&r1=474362&r2=474363
==============================================================================
--- xmlgraphics/commons/trunk/build.xml (original)
+++ xmlgraphics/commons/trunk/build.xml Mon Nov 13 07:15:21 2006
@@ -252,6 +252,7 @@
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/)"/>
         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
       </manifest>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 
@@ -294,10 +295,7 @@
       <fileset dir="${src.java.version.dir}">
         <patternset refid="java-only"/>
       </fileset>
-      <fileset dir="${basedir}">
-        <include name="LICENSE"/>
-        <include name="NOTICE"/>
-      </fileset>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 
@@ -435,10 +433,7 @@
         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
       </manifest>
       <fileset dir="${build.javadocs.dir}"/>
-      <fileset dir="${basedir}">
-        <include name="LICENSE"/>
-        <include name="NOTICE"/>
-      </fileset>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 
@@ -632,10 +627,7 @@
         <include name="${name}-${version}-javadoc.jar"/>
       </fileset>
       <fileset dir="${build.dir}/maven"/>
-      <fileset dir="${basedir}">
-        <include name="LICENSE"/>
-        <include name="NOTICE"/>
-      </fileset>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
   



---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org