Fixed the clean and distclean targets to only clean packages built by the all target.

Use a common list of packages to build for use by all of the targets.  A <filelist> element is used since the order in which the packages is built is important.  This element is also valid to use when you want to produce an ordered list of directories.  The subant task works on a list of directories so it isn't necessary to specify file names.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@32 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/build.xml b/build.xml
index 421fa969c2f7f253585f438c33afe96a742e2310..4dc7ce236c82eeff46eba86c92e25733477007ce 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -10,27 +10,32 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
 <project name="mdk" default="all" basedir=".">\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
 <project name="mdk" default="all" basedir=".">\r

+  <description>\r
+This is the highest-level build file.\r
+It can build all packages or clean up the build products.\r
+  </description>\r

   <property environment="env"/>\r
   <property environment="env"/>\r

-  <target name="all">\r
+  <!-- Note: this is an ordered list. The projects have dependencies between them. -->\r
+  <filelist\r
+      id="Pkg.Dirs"\r
+      dir="."\r
+      files="Tools,MdePkg,EdkModulePkg,EdkNt32Pkg"/>\r
+\r
+  <target name="all" description="Build all packages.">\r

     <subant target="" inheritall="false">\r
     <subant target="" inheritall="false">\r

-      <!-- Note: this is an ordered list. The projects have dependencies between them. -->\r
-      <filelist dir="."\r
-        files="\r
-          Tools/build.xml\r
-          MdePkg/build.xml\r
-          EdkModulePkg/build.xml\r
-          EdkNt32Pkg/build.xml\r
-          "/>\r
+      <filelist refid="Pkg.Dirs"/>\r

     </subant>\r
   </target>\r
     </subant>\r
   </target>\r

-  <target name="clean">\r
+\r
+  <target name="clean" description="Remove compile and assembly artifacts.">\r

     <subant target="clean" inheritall="false">\r
     <subant target="clean" inheritall="false">\r

-      <fileset dir="." includes="*/build.xml"/>\r
+      <filelist refid="Pkg.Dirs"/>\r

     </subant>\r
   </target>\r
     </subant>\r
   </target>\r

-  <target name="distclean">\r
+\r
+  <target name="distclean" description="Remove everything not in the distribution.">\r

     <subant target="distclean" inheritall="false">\r
     <subant target="distclean" inheritall="false">\r

-      <fileset dir="." includes="*/build.xml"/>\r
+      <filelist refid="Pkg.Dirs"/>\r

     </subant>\r
   </target>\r
 </project>\r
     </subant>\r
   </target>\r
 </project>\r