From 41feb573c01758182a12716881352a39b9d394ac Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 4 Oct 2002 09:18:46 +0000
Subject: [PATCH] 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                  | 6 +++++-
 src/etc/manifest.bootstrap | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 src/etc/manifest.bootstrap

diff --git a/build.xml b/build.xml
index 83c9a9e8b..3e00952d7 100644
--- a/build.xml
+++ b/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>
diff --git a/src/etc/manifest.bootstrap b/src/etc/manifest.bootstrap
deleted file mode 100644
index b663a416a..000000000
--- a/src/etc/manifest.bootstrap
+++ /dev/null
@@ -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
-
-