Fixed all scripts to use new directory layout.

[mirror_edk2.git] / Tools / build.xml

diff --git a/Tools/build.xml b/Tools/build.xml
index 820bc2cef60273bba66ed54f1095d32de2c29fe5..4100dfbfa1940730216466a7af58fd4f8e3c26fa 100644 (file)
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="" inheritall="false">\r
       <filelist dir="."\r
         files="\r
-          Source/TianoTools/build.xml\r
+          CCode/Source/build.xml\r
           "/>\r
     </subant>\r
   </target>\r
@@ -32,12 +32,15 @@ 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/PcdTools/build.xml\r
-          Source/GenBuild/build.xml\r
-          Source/FrameworkTasks/build.xml\r
-          Source/Cpptasks/build.xml\r
-          Source/FrameworkWizard/build.xml\r
+          Java/Source/Common/build.xml\r
+          Java/Source/PcdTools/build.xml\r
+          Java/Source/GenBuild/build.xml\r
+          Java/Source/FrameworkTasks/build.xml\r
+          Java/Source/Cpptasks/build.xml\r
+          Java/Source/FrameworkWizard/build.xml\r
+          Java/Source/MigrationTools/build.xml\r
+          Java/Source/ContextTool/build.xml\r
+          Java/Source/Merge/build.xml\r
           "/>\r
     </subant>\r
     <echo message="The EDK II Java Tools build has completed!"/>\r
@@ -48,7 +51,16 @@ 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/FrameworkWizard/build.xml\r
+          Java/Source/FrameworkWizard/build.xml\r
+          "/>\r
+    </subant>\r
+  </target>\r
+\r
+  <target name="Merge" depends="SurfaceArea">\r
+    <subant target="" verbose="true" inheritall="false">\r
+      <filelist dir="."\r
+        files="\r
+          Java/Source/Merge/build.xml\r
           "/>\r
     </subant>\r
   </target>\r
@@ -57,7 +69,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="" verbose="true" inheritall="false">\r
       <filelist dir="."\r
         files="\r
-          Source/SurfaceArea/build.xml\r
+          Java/Source/SurfaceArea/build.xml\r
           "/>\r
     </subant>\r
   </target>\r
@@ -73,8 +85,24 @@ 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
+    <if>\r
+      <not>\r
+        <available file="Conf/tools_def.txt"/>\r
+      </not>\r
+      <then>\r
+        <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt"/>\r
+      </then>\r
+    </if>\r
+\r
+    <if>\r
+      <not>\r
+        <available file="Conf/target.txt"/>\r
+      </not>\r
+      <then>\r
+        <copy file="Conf/target.template" tofile="Conf/target.txt"/>\r
+      </then>\r
+    </if>\r
+\r
     <if>\r
       <not>\r
         <available file="Conf/FrameworkDatabase.db"/>\r
@@ -89,14 +117,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="clean" inheritall="false">\r
       <filelist dir="."\r
         files="\r
-          Source/FrameworkWizard/build.xml \r
-          Source/Cpptasks/build.xml \r
-          Source/FrameworkTasks/build.xml \r
-          Source/GenBuild/build.xml \r
-          Source/PcdTools/build.xml \r
-          Source/Common/build.xml \r
-          Source/SurfaceArea/build.xml \r
-          Source/TianoTools/build.xml\r
+          Java/Source/FrameworkWizard/build.xml \r
+          Java/Source/Cpptasks/build.xml \r
+          Java/Source/FrameworkTasks/build.xml \r
+          Java/Source/GenBuild/build.xml \r
+          Java/Source/PcdTools/build.xml \r
+          Java/Source/Common/build.xml \r
+          Java/Source/SurfaceArea/build.xml \r
+          CCode/Source/build.xml\r
+          Java/Source/MigrationTools/build.xml\r
+          Java/Source/ContextTool/build.xml\r
+          Java/Source/Merge/build.xml\r
         "/>\r
     </subant>\r
   </target>\r
@@ -120,14 +151,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="cleanall" inheritall="true">\r
       <filelist dir="."\r
         files="\r
-          Source/FrameworkWizard/build.xml \r
-          Source/Cpptasks/build.xml \r
-          Source/FrameworkTasks/build.xml \r
-          Source/GenBuild/build.xml \r
-          Source/PcdTools/build.xml \r
-          Source/Common/build.xml \r
-          Source/SurfaceArea/build.xml \r
-          Source/TianoTools/build.xml\r
+          Java/Source/FrameworkWizard/build.xml \r
+          Java/Source/Cpptasks/build.xml \r
+          Java/Source/FrameworkTasks/build.xml \r
+          Java/Source/GenBuild/build.xml \r
+          Java/Source/PcdTools/build.xml \r
+          Java/Source/Common/build.xml \r
+          Java/Source/SurfaceArea/build.xml \r
+          CCode/Source/build.xml\r
+          Java/Source/MigrationTools/build.xml\r
+          Java/Source/ContextTool/build.xml\r
+          Java/Source/Merge/build.xml\r
         "/>\r
     </subant>\r
   </target>\r