removed extra taskdef and taskref definitions that caused some warning messages when...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1694 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/CCode/Source/Common/build.xml b/Tools/CCode/Source/Common/build.xml
index 902f677d1d17b2b01b80b9f8ec47e121ed626f1b..38ae4772965c6a9c4d7e8188f36e8f9054e67bd1 100644 (file)
--- a/Tools/CCode/Source/Common/build.xml
+++ b/Tools/CCode/Source/Common/build.xml
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Copyright (c) 2006, Intel Corporation\r
 -->\r
 \r
   Copyright (c) 2006, Intel Corporation\r
 -->\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="tmp" value="tmp"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="tmp" value="tmp"/>\r

diff --git a/Tools/CCode/Source/CompressDll/build.xml b/Tools/CCode/Source/CompressDll/build.xml
index 124255b17a2822b7ad6c795d1c9a88325609c216..6f591b371b4beeec9e0b5875bf683f11f9d815c3 100644 (file)
--- a/Tools/CCode/Source/CompressDll/build.xml
+++ b/Tools/CCode/Source/CompressDll/build.xml
@@ -20,8 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>\r
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>\r
 \r
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>\r
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r


@@ -71,7 +69,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
   <target name="cleanall">\r
   </target>\r
 \r
   <target name="cleanall">\r

-    <echo message="Removing Object Files and the Executable: ${LibName}${ext_shared}"/>\r
+    <echo message="Removing Object Files and the Executable: ${LibName}${ext_dynamic}"/>\r

     <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
       <fileset dir="${BUILD_DIR}"/>\r
       <fileset file="${BIN_DIR}/${LibName}.*"/>\r
     <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
       <fileset dir="${BUILD_DIR}"/>\r
       <fileset file="${BIN_DIR}/${LibName}.*"/>\r

diff --git a/Tools/CCode/Source/CreateMtFile/build.xml b/Tools/CCode/Source/CreateMtFile/build.xml
index b2272244cd1860b630006462094f7390810441be..4c08a0fffc33958c407f2f5a2c9edf9e111bc95d 100644 (file)
--- a/Tools/CCode/Source/CreateMtFile/build.xml
+++ b/Tools/CCode/Source/CreateMtFile/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="CreateMtFile"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="CreateMtFile"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/CustomizedCompress/build.xml b/Tools/CCode/Source/CustomizedCompress/build.xml
index 4664a957f0c5aaebb8103f7d23735384baf3b3f7..35bffa49879b2ed518121ac992636894123adc3e 100644 (file)
--- a/Tools/CCode/Source/CustomizedCompress/build.xml
+++ b/Tools/CCode/Source/CustomizedCompress/build.xml
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Copyright (c) 2006, Intel Corporation\r
 -->\r
 \r
   Copyright (c) 2006, Intel Corporation\r
 -->\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="CustomizedCompress"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="CustomizedCompress"/>\r

diff --git a/Tools/CCode/Source/EfiCompress/build.xml b/Tools/CCode/Source/EfiCompress/build.xml
index 94f60558ccdef59b049cc44e9109bface4d3c1bd..d08e9854849fcdfa93bfadb5008ffad2e2f012c9 100644 (file)
--- a/Tools/CCode/Source/EfiCompress/build.xml
+++ b/Tools/CCode/Source/EfiCompress/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="EfiCompress"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="EfiCompress"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/EfiRom/build.xml b/Tools/CCode/Source/EfiRom/build.xml
index acb94a48358680a63c256b3f036fa5715a020ad7..a732950af8f9b7b3d5e693c0a557636561015927 100644 (file)
--- a/Tools/CCode/Source/EfiRom/build.xml
+++ b/Tools/CCode/Source/EfiRom/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="EfiRom"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="EfiRom"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/FlashMap/build.xml b/Tools/CCode/Source/FlashMap/build.xml
index 680c1820b0093a93bd746d8551348c75ec8c5dc1..a3e6547ac18ff2bc320eae997c80bc1e6ea341e1 100644 (file)
--- a/Tools/CCode/Source/FlashMap/build.xml
+++ b/Tools/CCode/Source/FlashMap/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="FlashMap"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="FlashMap"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/FwImage/build.xml b/Tools/CCode/Source/FwImage/build.xml
index b52c576c347bf8a6b712cae8133073c0005b988b..42f4b4705181156a3bff56347dd6af269a9ee01e 100644 (file)
--- a/Tools/CCode/Source/FwImage/build.xml
+++ b/Tools/CCode/Source/FwImage/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="FwImage"/>\r
   <property name="FileSet" value="fwimage.c"/>\r
 \r
   <property name="ToolName" value="FwImage"/>\r
   <property name="FileSet" value="fwimage.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/GenAcpiTable/build.xml b/Tools/CCode/Source/GenAcpiTable/build.xml
index 8c8c5eb81f53f5faeb269e013497702baafca5aa..bf4919cfb9c443e1923dabc093ac66a27fcb27ef 100644 (file)
--- a/Tools/CCode/Source/GenAcpiTable/build.xml
+++ b/Tools/CCode/Source/GenAcpiTable/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenAcpiTable"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="GenAcpiTable"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/GenCRC32Section/build.xml b/Tools/CCode/Source/GenCRC32Section/build.xml
index bbb0f71f5d76cad8d2abb30f769a9164a2a3541f..788001aa6fc913c541edaac225de6255648a5301 100644 (file)
--- a/Tools/CCode/Source/GenCRC32Section/build.xml
+++ b/Tools/CCode/Source/GenCRC32Section/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenCRC32Section"/>\r
   <property name="FileSet" value="GenCRC32Section.c GenCRC32Section.h"/>\r
 \r
   <property name="ToolName" value="GenCRC32Section"/>\r
   <property name="FileSet" value="GenCRC32Section.c GenCRC32Section.h"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/GenCapsuleHdr/build.xml b/Tools/CCode/Source/GenCapsuleHdr/build.xml
index 7c43d0a347052e61f0f69cc4bbfd1130ad334884..a16409ab2e734747bc20abce943bdecfc3543859 100644 (file)
--- a/Tools/CCode/Source/GenCapsuleHdr/build.xml
+++ b/Tools/CCode/Source/GenCapsuleHdr/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenCapsuleHdr"/>\r
   <property name="FileSet" value="GenCapsuleHdr.c"/>\r
 \r
   <property name="ToolName" value="GenCapsuleHdr"/>\r
   <property name="FileSet" value="GenCapsuleHdr.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/GenDepex/build.xml b/Tools/CCode/Source/GenDepex/build.xml
index 568177aa03b9c02b530efa4a2026e61ec237f7c7..18f85ac4d566efae9b9f4de3c257ee555e74acad 100644 (file)
--- a/Tools/CCode/Source/GenDepex/build.xml
+++ b/Tools/CCode/Source/GenDepex/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenDepex"/>\r
   <property name="FileSet" value="DepexParser.c GenDepex.c GenDepex.h"/>\r
 \r
   <property name="ToolName" value="GenDepex"/>\r
   <property name="FileSet" value="DepexParser.c GenDepex.c GenDepex.h"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/GenFfsFile/build.xml b/Tools/CCode/Source/GenFfsFile/build.xml
index b7f86814364ae51d9543b75dee1ef7a2040c32de..de4d6a68418c47d4ff4c2cf5bacd1b4b9fe56254 100644 (file)
--- a/Tools/CCode/Source/GenFfsFile/build.xml
+++ b/Tools/CCode/Source/GenFfsFile/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenFfsFile"/>\r
   <property name="FileSet" value="GenFfsFile.c"/>\r
 \r
   <property name="ToolName" value="GenFfsFile"/>\r
   <property name="FileSet" value="GenFfsFile.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/GenFvImage/build.xml b/Tools/CCode/Source/GenFvImage/build.xml
index ae930b053b13450ec86c6180163caedfea830963..398b86291e66f16fd3c894e7a21d34c4ef8be636 100644 (file)
--- a/Tools/CCode/Source/GenFvImage/build.xml
+++ b/Tools/CCode/Source/GenFvImage/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenFvImage"/>\r
   <property name="FileSet" value="GenFvImageLib.c GenFvImageExe.c"/>\r
 \r
   <property name="ToolName" value="GenFvImage"/>\r
   <property name="FileSet" value="GenFvImageLib.c GenFvImageExe.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/GenSection/build.xml b/Tools/CCode/Source/GenSection/build.xml
index 63ffccdf74edceb58b88070664e38936c81e4bf2..2f6baa205b020fb0b378d9615f711c8401528def 100644 (file)
--- a/Tools/CCode/Source/GenSection/build.xml
+++ b/Tools/CCode/Source/GenSection/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenSection"/>\r
   <property name="FileSet" value="GenSection.c"/>\r
 \r
   <property name="ToolName" value="GenSection"/>\r
   <property name="FileSet" value="GenSection.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/GenTEImage/build.xml b/Tools/CCode/Source/GenTEImage/build.xml
index e79f9574a9e8873b033e2b93d6bc24634e4176b0..da485cf5cc67ad2abe4256e207d0e67240613417 100644 (file)
--- a/Tools/CCode/Source/GenTEImage/build.xml
+++ b/Tools/CCode/Source/GenTEImage/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GenTEImage"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="GenTEImage"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
 \r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
 \r

diff --git a/Tools/CCode/Source/GuidChk/build.xml b/Tools/CCode/Source/GuidChk/build.xml
index aec3ad1e9cbebaa8817eed8cb669e425d943741e..cadd6036471c76f8505d17a2006b125a46d6417f 100644 (file)
--- a/Tools/CCode/Source/GuidChk/build.xml
+++ b/Tools/CCode/Source/GuidChk/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="GuidChk"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r
   <property name="ToolName" value="GuidChk"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/MakeDeps/build.xml b/Tools/CCode/Source/MakeDeps/build.xml
index 60c34c2dfa631e7b7570cce5ff5f8ffe63d2df67..4e272033d2b7a3500ee4055ea6ae8d786aac69f5 100755 (executable)
--- a/Tools/CCode/Source/MakeDeps/build.xml
+++ b/Tools/CCode/Source/MakeDeps/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="MakeDeps"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r
   <property name="ToolName" value="MakeDeps"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/ModifyInf/build.xml b/Tools/CCode/Source/ModifyInf/build.xml
index a695ae0e800f8a64555f0fc30dc2b1db7fe29e66..a7a26f49a3fbf0d3ba89948f5ac4d7a8dfe0f472 100644 (file)
--- a/Tools/CCode/Source/ModifyInf/build.xml
+++ b/Tools/CCode/Source/ModifyInf/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="ModifyInf"/>\r
   <property name="FileSet" value="ModifyInf.c"/>\r
 \r
   <property name="ToolName" value="ModifyInf"/>\r
   <property name="FileSet" value="ModifyInf.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/Pccts/antlr/build.xml b/Tools/CCode/Source/Pccts/antlr/build.xml
index dfc1455409cff90d5b6f78beaa2fa934664e18f1..52800858474033bb4dcfc7b45d6725ad588692b0 100644 (file)
--- a/Tools/CCode/Source/Pccts/antlr/build.xml
+++ b/Tools/CCode/Source/Pccts/antlr/build.xml
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->\r
   <property name="ToolName" value="antlr"/>\r
 \r
 -->\r
   <property name="ToolName" value="antlr"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <target name="init">\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <target name="init">\r

diff --git a/Tools/CCode/Source/Pccts/build.xml b/Tools/CCode/Source/Pccts/build.xml
index 4f4e0a9e7c6883ecaa4412222d54d0ebbc8ca5da..d6ed0749df49a68e18d35c7c838432b9f347d377 100644 (file)
--- a/Tools/CCode/Source/Pccts/build.xml
+++ b/Tools/CCode/Source/Pccts/build.xml
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="Pccts"/>\r
 -->\r
 \r
   <property name="ToolName" value="Pccts"/>\r
 -->\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <target name="init">\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <target name="init">\r

diff --git a/Tools/CCode/Source/Pccts/dlg/build.xml b/Tools/CCode/Source/Pccts/dlg/build.xml
index 4195950c7b3447695345c01af09882aaa99d9ee2..3a8a9eec2b0f24f8ecef861e7382c41200a940d3 100644 (file)
--- a/Tools/CCode/Source/Pccts/dlg/build.xml
+++ b/Tools/CCode/Source/Pccts/dlg/build.xml
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->\r
   <property name="ToolName" value="dlg"/>\r
 \r
 -->\r
   <property name="ToolName" value="dlg"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>\r

diff --git a/Tools/CCode/Source/PeCoffLoader/build.xml b/Tools/CCode/Source/PeCoffLoader/build.xml
index db37829840dab0d3c9db27ecba24a3f254e621de..912a545ff5a0a89394824294542851c492a4de30 100644 (file)
--- a/Tools/CCode/Source/PeCoffLoader/build.xml
+++ b/Tools/CCode/Source/PeCoffLoader/build.xml
@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     EDK PeCoffLoader\r
   Copyright (c) 2006, Intel Corporation\r
 -->\r
     EDK PeCoffLoader\r
   Copyright (c) 2006, Intel Corporation\r
 -->\r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="PeCoffLoader"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="PeCoffLoader"/>\r

diff --git a/Tools/CCode/Source/PeiRebase/build.xml b/Tools/CCode/Source/PeiRebase/build.xml
index 7174441f3f35ba7a96363d4acf174647b7a6a797..329a74355321460d7cc3bfdd3ce9d4c81ed96c9a 100644 (file)
--- a/Tools/CCode/Source/PeiRebase/build.xml
+++ b/Tools/CCode/Source/PeiRebase/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="PeiRebase"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="PeiRebase"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/SecApResetVectorFixup/build.xml b/Tools/CCode/Source/SecApResetVectorFixup/build.xml
index f615b2a602cb0b62b94f3f652f6e9c0701119cb6..3550dc55a9243339ad111f0191f9683ceb230d7d 100644 (file)
--- a/Tools/CCode/Source/SecApResetVectorFixup/build.xml
+++ b/Tools/CCode/Source/SecApResetVectorFixup/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SecApResetVectorFixup"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="SecApResetVectorFixup"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/SecFixup/build.xml b/Tools/CCode/Source/SecFixup/build.xml
index ebc408ba26014168ba14049dc6e80290733e3ff9..99f78e0b454bcb1678d8c167d07756fa93218bc5 100644 (file)
--- a/Tools/CCode/Source/SecFixup/build.xml
+++ b/Tools/CCode/Source/SecFixup/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SecFixup"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="SecFixup"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/SetStamp/build.xml b/Tools/CCode/Source/SetStamp/build.xml
index 9425797c4542459bfed8a760b2dbe4ba32f4b7d2..5219bd605186632a03c67a62bc7b575b290f8f24 100644 (file)
--- a/Tools/CCode/Source/SetStamp/build.xml
+++ b/Tools/CCode/Source/SetStamp/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SetStamp"/>\r
   <property name="FileSet" value="SetStamp.c"/>\r
 \r
   <property name="ToolName" value="SetStamp"/>\r
   <property name="FileSet" value="SetStamp.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/SplitFile/build.xml b/Tools/CCode/Source/SplitFile/build.xml
index 6fa9b573c30382e5024043b02d8967d0e2821a5c..0666a1f6fc0af0cb5fd37fcb244b20ecbe91a67d 100644 (file)
--- a/Tools/CCode/Source/SplitFile/build.xml
+++ b/Tools/CCode/Source/SplitFile/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="SplitFile"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="SplitFile"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/StrGather/build.xml b/Tools/CCode/Source/StrGather/build.xml
index f01117777aab7ae661166babc15f128904539fa5..cac016e48579827a48121cfbc46ba6f8474cb804 100644 (file)
--- a/Tools/CCode/Source/StrGather/build.xml
+++ b/Tools/CCode/Source/StrGather/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="StrGather"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r
   <property name="ToolName" value="StrGather"/>\r
   <property name="FileSet" value="*.c *.h"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/String/build.xml b/Tools/CCode/Source/String/build.xml
index 933cb5c1e49447c7c561c4015666890ccc567196..b42504ea258bc332add7910459a1dcde48bf3141 100644 (file)
--- a/Tools/CCode/Source/String/build.xml
+++ b/Tools/CCode/Source/String/build.xml
@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     EDK String\r
   Copyright (c) 2006, Intel Corporation\r
 -->\r
     EDK String\r
   Copyright (c) 2006, Intel Corporation\r
 -->\r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="String"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="String"/>\r

diff --git a/Tools/CCode/Source/Strip/build.xml b/Tools/CCode/Source/Strip/build.xml
index 9ead28d16f56ee9d83bff9235ea0b59b52d17e2b..6c34d95897dc45e548cb992cd7e07dcc1b9097f6 100644 (file)
--- a/Tools/CCode/Source/Strip/build.xml
+++ b/Tools/CCode/Source/Strip/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="Strip"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="Strip"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/VfrCompile/build.xml b/Tools/CCode/Source/VfrCompile/build.xml
index 247f0d231556d643278c18ef18dc50f4724678e2..da857dff48916019d8333fd94554ef719c219224 100644 (file)
--- a/Tools/CCode/Source/VfrCompile/build.xml
+++ b/Tools/CCode/Source/VfrCompile/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="VfrCompile"/>\r
   <property name="FileSet" value="*.cpp"/>\r
   <property name="FileSetPccts" value="ATokenBuffer.cpp DLexerBase.cpp AParser.cpp"/>\r
   <property name="ToolName" value="VfrCompile"/>\r
   <property name="FileSet" value="*.cpp"/>\r
   <property name="FileSetPccts" value="ATokenBuffer.cpp DLexerBase.cpp AParser.cpp"/>\r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/ZeroDebugData/build.xml b/Tools/CCode/Source/ZeroDebugData/build.xml
index 2a85fc1af23b6957e6c86d5ffa30e08a67d13792..efdf002d96951ff4b8d7725eb0a91a56b1c781dd 100644 (file)
--- a/Tools/CCode/Source/ZeroDebugData/build.xml
+++ b/Tools/CCode/Source/ZeroDebugData/build.xml
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="ToolName" value="ZeroDebugData"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r
   <property name="ToolName" value="ZeroDebugData"/>\r
   <property name="FileSet" value="*.c"/>\r
 \r

-  <taskdef resource="cpptasks.tasks"/>\r
-  <typedef resource="cpptasks.types"/>\r

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r

diff --git a/Tools/CCode/Source/build.xml b/Tools/CCode/Source/build.xml
index bbe545606f10cabdd40d824fc9afb6a5e1cf61ce..f222b4abe6f774c0715687eb1113f1f974d00935 100644 (file)
--- a/Tools/CCode/Source/build.xml
+++ b/Tools/CCode/Source/build.xml
@@ -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
     <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="net/sf/antcontrib/antlib.xml" />\r
 \r

-  <taskdef classpathref="classpath" resource="cpptasks.tasks"/>\r
-  <typedef classpathref="classpath" resource="cpptasks.types"/>\r

 \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
     <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
     <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
     <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
     </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
     <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
     </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
     <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
     <subant target="cleanall" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>\r
     </subant>\r