Simplify the script. It now allows normal ant targets and flags to be passed straight...

[mirror_edk2.git] / Tools / build.xml

diff --git a/Tools/build.xml b/Tools/build.xml
index 38149c38e741fe0ed3d52121df40ed2897c2c977..54d39200f18466ea478a222bea56f50f8df63967 100644 (file)
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -18,11 +18,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!-- Note: this is an ordered list. The projects have dependencies between them. -->\r
       <filelist dir="."\r
         files="\r
+          Source/Common/build.xml\r
           Source/GenBuild/build.xml\r
           Source/FrameworkTasks/build.xml\r
           Source/Cpptasks/build.xml\r
-          Source/ModuleEditor/build.xml\r
-          Source/PackageEditor/build.xml\r
+          Source/FrameworkWizard/build.xml\r
           "/>\r
     </subant>\r
   </target>\r
@@ -39,7 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
   <target name="C_Code" depends="JavaCode">\r
-    <subant target="" verbose="true" inheritall="false">\r
+    <subant target="" inheritall="false">\r
       <filelist dir="."\r
         files="\r
           Source/TianoTools/build.xml\r
@@ -58,32 +58,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     rewritePrefix="file:/]]>${env.WORKSPACE}<![CDATA[/Tools/XMLSchema/"/>\r
 </catalog>]]>\r
     </echo>\r
+    <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt" overwrite="false"/>\r
+    <copy file="Conf/target.template" tofile="Conf/target.txt" overwrite="false"/>\r
   </target>\r
+\r
   <target name="clean">\r
     <subant target="clean" inheritall="false">\r
       <filelist dir="."\r
         files="\r
           Source/TianoTools/build.xml\r
-          Source/ModuleEditor/build.xml\r
-          Source/PackageEditor/build.xml\r
+          Source/FrameworkWizard/build.xml\r
+          Source/Cpptasks/build.xml\r
           Source/FrameworkTasks/build.xml\r
           Source/GenBuild/build.xml\r
+          Source/Common/build.xml\r
           Source/SurfaceArea/build.xml\r
-          Source/Cpptasks/build.xml\r
           "/>\r
     </subant>\r
   </target>\r
+\r
   <target name="cleanall">\r
-    <subant target="cleanall" verbose="true" inheritall="false">\r
+    <subant target="cleanall" inheritall="false">\r
       <filelist dir="."\r
         files="\r
           Source/TianoTools/build.xml\r
-          Source/ModuleEditor/build.xml\r
-          Source/PackageEditor/build.xml\r
+          Source/FrameworkWizard/build.xml\r
+          Source/Cpptasks/build.xml\r
           Source/FrameworkTasks/build.xml\r
           Source/GenBuild/build.xml\r
+          Source/Common/build.xml\r
           Source/SurfaceArea/build.xml\r
-          Source/Cpptasks/build.xml\r
           "/>\r
     </subant>\r
   </target>\r