A couple of cleanups in the TianoTools build.
authorbbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 26 Jul 2006 17:25:15 +0000 (17:25 +0000)
committerbbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 26 Jul 2006 17:25:15 +0000 (17:25 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1104 6f19259b-4bc3-4df7-8a09-765794883524

34 files changed:
Tools/Source/TianoTools/Common/build.xml
Tools/Source/TianoTools/CompressDll/build.xml
Tools/Source/TianoTools/CreateMtFile/build.xml
Tools/Source/TianoTools/CustomizedCompress/build.xml
Tools/Source/TianoTools/EfiCompress/build.xml
Tools/Source/TianoTools/EfiRom/build.xml
Tools/Source/TianoTools/FlashMap/build.xml
Tools/Source/TianoTools/FwImage/build.xml
Tools/Source/TianoTools/GenAcpiTable/build.xml
Tools/Source/TianoTools/GenCRC32Section/build.xml
Tools/Source/TianoTools/GenCapsuleHdr/build.xml
Tools/Source/TianoTools/GenDepex/build.xml
Tools/Source/TianoTools/GenFfsFile/build.xml
Tools/Source/TianoTools/GenFvImage/build.xml
Tools/Source/TianoTools/GenSection/build.xml
Tools/Source/TianoTools/GenTEImage/build.xml
Tools/Source/TianoTools/GuidChk/build.xml
Tools/Source/TianoTools/MakeDeps/build.xml
Tools/Source/TianoTools/ModifyInf/build.xml
Tools/Source/TianoTools/Pccts/antlr/build.xml
Tools/Source/TianoTools/Pccts/build.xml
Tools/Source/TianoTools/Pccts/dlg/build.xml
Tools/Source/TianoTools/PeCoffLoader/build.xml
Tools/Source/TianoTools/PeiRebase/build.xml
Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
Tools/Source/TianoTools/SecFixup/build.xml
Tools/Source/TianoTools/SetStamp/build.xml
Tools/Source/TianoTools/SplitFile/build.xml
Tools/Source/TianoTools/StrGather/build.xml
Tools/Source/TianoTools/String/build.xml
Tools/Source/TianoTools/Strip/build.xml
Tools/Source/TianoTools/VfrCompile/build.xml
Tools/Source/TianoTools/ZeroDebugData/build.xml
Tools/Source/TianoTools/build.xml

index 5351eeb..b4becb7 100644 (file)
@@ -19,7 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
   <property name="tmp" value="tmp"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
index 1588ab6..28cd4ae 100644 (file)
@@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Copyright (c) 2006, Intel Corporation\r
 -->\r
 \r
-  <property environment="env"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="ToolName" value="CompressDll"/>\r
   <property name="LibName" value="CompressDll"/>\r
@@ -92,8 +91,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
-      <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r
       <includepath path="${env.JAVA_HOME}/include/linux" if="gcc"/>\r
+      <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="kernel32" unless="gcc"/>\r
     </cc>\r
index 337c255..6714257 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 21be49a..32aa12d 100644 (file)
@@ -19,8 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/CustomizedCompress/tmp"/>\r
 \r
index dae9729..093c478 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 035a6a4..3287617 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 126893d..6678967 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index fb85dc4..2081283 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 31ad365..b32446c 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index dd461ad..6a727e6 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 369a939..a322c8e 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
@@ -77,6 +75,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </then>\r
       </elseif>\r
     </if>\r
+\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -95,6 +94,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
+      <syslibset dir="${env.CYGWIN_HOME}/lib/mingw" libs="msvcr71" if="cygwin"/>\r
     </cc>\r
   </target>\r
 \r
index dd6cd59..5c1c7fc 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 81d4048..731cf73 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index a320e8f..40e2fa4 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 92fd151..ee1453c 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index fd92c01..e923506 100644 (file)
@@ -21,7 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
index b5c64d3..9d798c9 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 4cc82f0..8828eca 100755 (executable)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index c31e553..cd2e742 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 6f30ecb..4c432c1 100644 (file)
@@ -20,8 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <target name="init">\r
     <echo message="The EDK Tool: ${ToolName}"/>\r
     <if>\r
index 12a3afa..355ed2c 100644 (file)
@@ -20,8 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <target name="init">\r
     <echo message="The EDK Tool: ${ToolName}"/>\r
     <if>\r
index d926f25..efdae43 100644 (file)
@@ -20,7 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
   <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>\r
 \r
   <target name="init">\r
index bd27520..e1b41ed 100644 (file)
@@ -19,8 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="PeCoffLoader"/>\r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR_IA32" value="${PACKAGE_DIR}/${LibName}/tmp/Ia32"/>\r
   <property name="BUILD_DIR_X64" value="${PACKAGE_DIR}/${LibName}/tmp/X64"/>\r
index af30cfe..4da3cd8 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index bad8205..34b0383 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 57764cc..2df362a 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 65a975a..6b47bb8 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index aea77d7..f4dbae9 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 05035f4..98ace14 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 868a072..06c0975 100644 (file)
@@ -19,8 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LibName" value="String"/>\r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${LibName}/tmp"/>\r
 \r
index 56e84ce..50bf76f 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 9c9de38..67442df 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 151299b..0c11f5c 100644 (file)
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
-  <property environment="env"/>\r
-\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
index 0d6d2fb..065cb6c 100644 (file)
@@ -88,6 +88,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <os name="Linux"/>\r
     </condition>\r
     \r
+    <condition property="cygwin">\r
+      <and>\r
+        <os family="dos"/>\r
+        <istrue value="${gcc}"/>\r
+      </and>\r
+    </condition>\r
+    \r
     <condition property="x86_64_linux">\r
       <and>\r
         <os name="Linux"/>\r