Set the comment for JAVA_HOME to point to the minimum release version of SUN JDK...

[mirror_edk2.git] / Tools / build.xml

diff --git a/Tools/build.xml b/Tools/build.xml
index e7f10311c44d3a36b99c0d4f613848a106874c48..0f746c98e86f44ed3ad610328332f34f6dbc48d9 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,15 +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
-          Source/MigrationTools/build.xml\r
-          Source/ContextTool/build.xml\r
-          Source/Merge/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
@@ -51,7 +51,7 @@ 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
@@ -60,7 +60,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/Merge/build.xml\r
+          Java/Source/Merge/build.xml\r
           "/>\r
     </subant>\r
   </target>\r
@@ -69,14 +69,18 @@ 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
 \r
   <target name="makeCatalog">\r
-    <echo file="XMLSchema/catalog.xml">\r
-      <![CDATA[<?xml version="1.0"?>\r
+    <if>\r
+      <not>\r
+        <available file="XMLSchema/catalog.xml"/>\r
+      </not>\r
+      <then>\r
+        <echo file="XMLSchema/catalog.xml"><![CDATA[<?xml version="1.0"?>\r
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.xsd">\r
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">\r
   <rewriteSystem systemIdStartString="http://www.TianoCore.org/2006/Edk2.0/"\r
@@ -84,7 +88,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <rewriteURI uriStartString="http://www.TianoCore.org/2006/Edk2.0/"\r
     rewritePrefix="file:/]]>${env.WORKSPACE}<![CDATA[/Tools/XMLSchema/"/>\r
 </catalog>]]>\r
-    </echo>\r
+</echo>\r
+      </then>\r
+    </if>\r
     <if>\r
       <not>\r
         <available file="Conf/tools_def.txt"/>\r
@@ -117,17 +123,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
-          Source/MigrationTools/build.xml\r
-          Source/ContextTool/build.xml\r
-          Source/Merge/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
@@ -151,17 +157,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
-          Source/MigrationTools/build.xml\r
-          Source/ContextTool/build.xml\r
-          Source/Merge/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