X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2Fbuild.xml;h=4100dfbfa1940730216466a7af58fd4f8e3c26fa;hp=14f5afc92b5cafb49782375baab3866e61b93223;hb=aba23ad92e37106b379d36a9a874cca2f0bdc829;hpb=7f762c2d410a5cb46d0ff1a4f85f35290839d5e5

diff --git a/Tools/build.xml b/Tools/build.xml
index 14f5afc92b..4100dfbfa1 100644
--- 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">
       <filelist dir="."
         files="
-          Source/TianoTools/build.xml
+          CCode/Source/build.xml
           "/>
     </subant>
   </target>
@@ -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. -->
       <filelist dir="."
         files="
-          Source/Common/build.xml
-          Source/PcdTools/build.xml
-          Source/GenBuild/build.xml
-          Source/FrameworkTasks/build.xml
-          Source/Cpptasks/build.xml
-          Source/FrameworkWizard/build.xml
+          Java/Source/Common/build.xml
+          Java/Source/PcdTools/build.xml
+          Java/Source/GenBuild/build.xml
+          Java/Source/FrameworkTasks/build.xml
+          Java/Source/Cpptasks/build.xml
+          Java/Source/FrameworkWizard/build.xml
+          Java/Source/MigrationTools/build.xml
+          Java/Source/ContextTool/build.xml
+          Java/Source/Merge/build.xml
           "/>
     </subant>
     <echo message="The EDK II Java Tools build has completed!"/>
@@ -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. -->
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml
+          Java/Source/FrameworkWizard/build.xml
+          "/>
+    </subant>
+  </target>
+
+  <target name="Merge" depends="SurfaceArea">
+    <subant target="" verbose="true" inheritall="false">
+      <filelist dir="."
+        files="
+          Java/Source/Merge/build.xml
           "/>
     </subant>
   </target>
@@ -57,7 +69,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="" verbose="true" inheritall="false">
       <filelist dir="."
         files="
-          Source/SurfaceArea/build.xml
+          Java/Source/SurfaceArea/build.xml
           "/>
     </subant>
   </target>
@@ -73,8 +85,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     rewritePrefix="file:/]]>${env.WORKSPACE}<![CDATA[/Tools/XMLSchema/"/>
 </catalog>]]>
     </echo>
-    <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt" overwrite="false"/>
-    <copy file="Conf/target.template" tofile="Conf/target.txt" overwrite="false"/>
+    <if>
+      <not>
+        <available file="Conf/tools_def.txt"/>
+      </not>
+      <then>
+        <copy file="Conf/tools_def.template" tofile="Conf/tools_def.txt"/>
+      </then>
+    </if>
+
+    <if>
+      <not>
+        <available file="Conf/target.txt"/>
+      </not>
+      <then>
+        <copy file="Conf/target.template" tofile="Conf/target.txt"/>
+      </then>
+    </if>
+
     <if>
       <not>
         <available file="Conf/FrameworkDatabase.db"/>
@@ -89,30 +117,51 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <subant target="clean" inheritall="false">
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml 
-          Source/Cpptasks/build.xml 
-          Source/FrameworkTasks/build.xml 
-          Source/GenBuild/build.xml 
-          Source/PcdTools/build.xml 
-          Source/Common/build.xml 
-          Source/SurfaceArea/build.xml 
-          Source/TianoTools/build.xml
+          Java/Source/FrameworkWizard/build.xml 
+          Java/Source/Cpptasks/build.xml 
+          Java/Source/FrameworkTasks/build.xml 
+          Java/Source/GenBuild/build.xml 
+          Java/Source/PcdTools/build.xml 
+          Java/Source/Common/build.xml 
+          Java/Source/SurfaceArea/build.xml 
+          CCode/Source/build.xml
+          Java/Source/MigrationTools/build.xml
+          Java/Source/ContextTool/build.xml
+          Java/Source/Merge/build.xml
         "/>
     </subant>
   </target>
 
   <target name="cleanall">
+    <available classname="org.tianocore.frameworkwizard.FrameworkWizardUI" property="FrameworkWizardUI.available"/>
+    <available classname="org.tianocore.build.GenBuildTask" property="GenBuildTask.available"/>
+    <available classname="org.tianocore.framework.tasks.Tool" property="Tool.available"/>
+    <available classname="org.tianocore.pcd.action.BuildAction" property="PcdClass.available"/>
+    <if>
+      <or>
+        <isset property="FrameworkWizardUI.available"/>
+        <isset property="GenBuildTask.available"/>
+        <isset property="Tool.available"/>
+        <isset property="PcdClass.available"/>
+      </or>
+      <then>
+        <fail message="Use ant -noclasspath cleanall, to remove all jar files!"/>
+      </then>
+    </if>
     <subant target="cleanall" inheritall="true">
       <filelist dir="."
         files="
-          Source/FrameworkWizard/build.xml 
-          Source/Cpptasks/build.xml 
-          Source/FrameworkTasks/build.xml 
-          Source/GenBuild/build.xml 
-          Source/PcdTools/build.xml 
-          Source/Common/build.xml 
-          Source/SurfaceArea/build.xml 
-          Source/TianoTools/build.xml
+          Java/Source/FrameworkWizard/build.xml 
+          Java/Source/Cpptasks/build.xml 
+          Java/Source/FrameworkTasks/build.xml 
+          Java/Source/GenBuild/build.xml 
+          Java/Source/PcdTools/build.xml 
+          Java/Source/Common/build.xml 
+          Java/Source/SurfaceArea/build.xml 
+          CCode/Source/build.xml
+          Java/Source/MigrationTools/build.xml
+          Java/Source/ContextTool/build.xml
+          Java/Source/Merge/build.xml
         "/>
     </subant>
   </target>