antoine 2004/02/05 12:49:42 Modified: . Tag: ANT_16_BRANCH bootstrap.sh build.xml Log: Merge from HEAD Revision Changes Path No revision No revision 1.67.2.1 +13 -2 ant/bootstrap.sh Index: bootstrap.sh =================================================================== RCS file: /home/cvs/ant/bootstrap.sh,v retrieving revision 1.67 retrieving revision 1.67.2.1 diff -u -r1.67 -r1.67.2.1 --- bootstrap.sh 21 Jul 2003 08:56:13 -0000 1.67 +++ bootstrap.sh 5 Feb 2004 20:49:42 -0000 1.67.2.1 @@ -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.392.2.19 +15 -3 ant/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.392.2.18 retrieving revision 1.392.2.19 diff -u -r1.392.2.18 -r1.392.2.19 --- build.xml 29 Jan 2004 20:21:14 -0000 1.392.2.18 +++ build.xml 5 Feb 2004 20:49:42 -0000 1.392.2.19 @@ -686,6 +686,7 @@ <include name="LICENSE.xerces"/> <include name="LICENSE.dom"/> <include name="LICENSE.sax"/> + <include name="NOTICE"/> </fileset> <mapper type="glob" from="*" to="*.txt"/> </copy> @@ -738,7 +739,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}/"> @@ -768,7 +772,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"/> @@ -813,7 +820,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"> @@ -973,6 +983,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"/> @@ -1064,6 +1075,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]
