Make use of nested <manifest> for ant-bootstrap.jar instead of using

separate files that need to be kept in sync.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273401 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -740,9 +740,13 @@
 
     <jar destfile="${build.lib}/${bootstrap.jar}"
          basedir="${build.classes}"
-         manifest="${manifest}.bootstrap">
+         manifest="${manifest}">
       <include name="${ant.package}/Main.class"/>
       <metainf dir="${build.dir}" includes="LICENSE.txt"/>
+      <manifest>
+        <attribute name="Class-Path"
+                   value="ant.jar xml-apis.jar xercesImpl.jar optional.jar xalan.jar"/>
+      </manifest>
     </jar>
 
   </target>

src/etc/manifest.bootstrap

@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.apache.tools.ant.Main
-Class-Path: ant.jar xml-apis.jar xercesImpl.jar optional.jar xalan.jar
-
-