Enhance peirebase tool to get base address from the corresponding fv.inf file, which...

[mirror_edk2.git] / Tools / CCode / Source / build.xml

diff --git a/Tools/CCode/Source/build.xml b/Tools/CCode/Source/build.xml
index 3d59c9c2c277e4bc4f091a64b7258c69c84560f7..f222b4abe6f774c0715687eb1113f1f974d00935 100644 (file)
--- a/Tools/CCode/Source/build.xml
+++ b/Tools/CCode/Source/build.xml
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="WORKSPACE" value="${env.WORKSPACE}" />\r
   <property name="WORKSPACE_DIR" value="${WORKSPACE}" />\r
   <property name="PACKAGE" value="Tools" />\r
-  <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools/Source/TianoTools" />\r
+  <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools/CCode/Source" />\r
   <property name="LIB_DIR" value="${PACKAGE_DIR}/Library" />\r
   <property name="BIN_DIR" value="${WORKSPACE}/Tools/bin" />\r
   <property name="BUILD_MODE" value="PACKAGE" />\r
@@ -35,21 +35,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>\r
   </path>\r
 \r
-  <taskdef classpathref="classpath" resource="GenBuild.tasks" />\r
   <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />\r
 \r
-  <taskdef classpathref="classpath" resource="cpptasks.tasks"/>\r
-  <typedef classpathref="classpath" resource="cpptasks.types"/>\r
 \r
-  <target name="all" depends="init, Tools">\r
+  <target name="all" depends="initArch, init, Tools">\r
     <echo message="The EDK II C Tools build complete!"/>\r
   </target>\r
   \r
   <target name="init">\r
     <echo message="EDK C Code Tools, build initialization"/>\r
+    <taskdef classpathref="classpath" resource="GenBuild.tasks" />\r
+    <taskdef classpathref="classpath" resource="cpptasks.tasks"/>\r
+    <typedef classpathref="classpath" resource="cpptasks.types"/>\r
     <mkdir dir="${BIN_DIR}" />\r
     <mkdir dir="${LIB_DIR}" />\r
 \r
+  </target>\r
+\r
+  <target name="initArch">\r
     <condition property="HostArch" value="X64">\r
       <os arch="amd64"/>\r
     </condition>\r
@@ -240,7 +243,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </if>\r
   </target>\r
 \r
-  <target name="Libraries" depends="init">\r
+  <target name="Libraries" depends="initArch, init">\r
     <subant target="" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" \r
         includes="${Libs}"/>\r
@@ -254,13 +257,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean" depends="initArch">\r
     <subant target="clean" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>\r
     </subant>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall" depends="initArch">\r
     <subant target="cleanall" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>\r
     </subant>\r