antoine 2004/02/05 12:44:02 Modified: . bootstrap.sh build.xml Log: Added the NOTICE to the metainf dir of ant.jar, ant-launcher.jar and ant-nodeps.jar and also to the distribution files Updated the copyright notice in bootstrap.sh Revision Changes Path 1.68 +13 -2 ant/bootstrap.sh Index: bootstrap.sh =================================================================== RCS file: /home/cvs/ant/bootstrap.sh,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- bootstrap.sh 21 Jul 2003 08:56:13 -0000 1.67 +++ bootstrap.sh 5 Feb 2004 20:44:02 -0000 1.68 @@ -1,7 +1,18 @@ #!/bin/sh -# Copyright (c) 2000-2003 The Apache Software Foundation. All rights -# reserved. +# Copyright 2000-2004 Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # OS specific support. $var _must_ be set to either true or false. cygwin=false; 1.408 +15 -3 ant/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.407 retrieving revision 1.408 diff -u -r1.407 -r1.408 --- build.xml 13 Jan 2004 12:39:53 -0000 1.407 +++ build.xml 5 Feb 2004 20:44:02 -0000 1.408 @@ -687,6 +687,7 @@ <include name="LICENSE.xerces"/> <include name="LICENSE.dom"/> <include name="LICENSE.sax"/> + <include name="NOTICE"/> </fileset> <mapper type="glob" from="*" to="*.txt"/> </copy> @@ -739,7 +740,10 @@ </or> </selector> </not> - <metainf dir="${build.dir}" includes="LICENSE.txt"/> + <metainf dir="${build.dir}"> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </metainf> <manifest> <section name="${ant.package}/"> @@ -769,7 +773,10 @@ basedir="${build.classes}" manifest="${manifest}"> <include name="${ant.package}/Main.class"/> - <metainf dir="${build.dir}" includes="LICENSE.txt"/> + <metainf dir="${build.dir}"> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </metainf> <manifest> <attribute name="Class-Path" value="ant.jar xml-apis.jar xercesImpl.jar xalan.jar"/> @@ -814,7 +821,10 @@ </or> </not> </and> - <metainf dir="${build.dir}" includes="LICENSE.txt"/> + <metainf dir="${build.dir}"> + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </metainf> </jar> <macrodef name="optional-jar"> @@ -974,6 +984,7 @@ <include name="LICENSE.xerces"/> <include name="LICENSE.dom"/> <include name="LICENSE.sax"/> + <include name="NOTICE"/> <include name="TODO"/> <include name="WHATSNEW"/> <include name="KEYS"/> @@ -1065,6 +1076,7 @@ <include name="LICENSE.xerces"/> <include name="LICENSE.dom"/> <include name="LICENSE.sax"/> + <include name="NOTICE"/> <include name="TODO"/> <include name="WHATSNEW"/> <include name="KEYS"/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
