A couple of cleanups in the TianoTools build.

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

diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml
index 5351eebe0923c0db9632aba3369dff75ca18ee1b..b4becb71d5b6869162a71ae9f9b7dd9e0e0d29cd 100644 (file)
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 1588ab6dad440e9f85fc388e8c88f58ee4c0b353..28cd4aec74591ba1138f24600cbdf38c79a276df 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/CreateMtFile/build.xml b/Tools/Source/TianoTools/CreateMtFile/build.xml
index 337c255f05128418257bd381721ebf38a6470333..67142578b3a6ff9a9f11ef5299b53e9c6d67c93a 100644 (file)
--- a/Tools/Source/TianoTools/CreateMtFile/build.xml
+++ b/Tools/Source/TianoTools/CreateMtFile/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/CustomizedCompress/build.xml b/Tools/Source/TianoTools/CustomizedCompress/build.xml
index 21be49a5c62a4eb5809808bb683b91c702142457..32aa12d1a9885ed1834730d60217b2dd4dc77fe8 100644 (file)
--- a/Tools/Source/TianoTools/CustomizedCompress/build.xml
+++ b/Tools/Source/TianoTools/CustomizedCompress/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/EfiCompress/build.xml b/Tools/Source/TianoTools/EfiCompress/build.xml
index dae9729146c10b3abb21a6fa21cea1a80cfde99a..093c478514988fde7b949ad4d9e04808b5cfdd24 100644 (file)
--- a/Tools/Source/TianoTools/EfiCompress/build.xml
+++ b/Tools/Source/TianoTools/EfiCompress/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/EfiRom/build.xml b/Tools/Source/TianoTools/EfiRom/build.xml
index 035a6a4b6a53d053ea25a2469d9a939cad5ae9ad..328761730a4ac6d4919ce18c009c7b6316685875 100644 (file)
--- a/Tools/Source/TianoTools/EfiRom/build.xml
+++ b/Tools/Source/TianoTools/EfiRom/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/FlashMap/build.xml b/Tools/Source/TianoTools/FlashMap/build.xml
index 126893d5e6bd33ed6f35f553c2efa11b33cd39f1..66789675552152e4789ffe91804232af4d4b8a18 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/build.xml
+++ b/Tools/Source/TianoTools/FlashMap/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/FwImage/build.xml b/Tools/Source/TianoTools/FwImage/build.xml
index fb85dc4ea7a9d6e386b6fd6fa64642534f7da39f..208128393be61070afa81d135ccdf354789194cd 100644 (file)
--- a/Tools/Source/TianoTools/FwImage/build.xml
+++ b/Tools/Source/TianoTools/FwImage/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GenAcpiTable/build.xml b/Tools/Source/TianoTools/GenAcpiTable/build.xml
index 31ad365723a4903f349cd84adec86310457b2f05..b32446c49e16a6ce334df1c65e56b1cd83dcaac2 100644 (file)
--- a/Tools/Source/TianoTools/GenAcpiTable/build.xml
+++ b/Tools/Source/TianoTools/GenAcpiTable/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.xml b/Tools/Source/TianoTools/GenCRC32Section/build.xml
index dd461ad0ccfc75c61ae81b88580c8f146db7ef2a..6a727e61f43352d29ca0e08432148276237cd82f 100644 (file)
--- a/Tools/Source/TianoTools/GenCRC32Section/build.xml
+++ b/Tools/Source/TianoTools/GenCRC32Section/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
index 369a9395a493fbf0a0f26c85d934ee6f07d8362b..a322c8e6b28ebfda3f05fa5df6d7a4e85a9ff613 100644 (file)
--- a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GenDepex/build.xml b/Tools/Source/TianoTools/GenDepex/build.xml
index dd6cd595094296f1678662ccbd649293116c78c0..5c1c7fc97ee4be391e491bb864a969e51e3bb912 100644 (file)
--- a/Tools/Source/TianoTools/GenDepex/build.xml
+++ b/Tools/Source/TianoTools/GenDepex/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GenFfsFile/build.xml b/Tools/Source/TianoTools/GenFfsFile/build.xml
index 81d4048949c80dd69f08f7de0b21d4ea73907cc5..731cf7324d63f14ac8a2dd3f8f94966653fd1ec1 100644 (file)
--- a/Tools/Source/TianoTools/GenFfsFile/build.xml
+++ b/Tools/Source/TianoTools/GenFfsFile/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index a320e8f3ed8b810d7cfefcff74e619d873379fc5..40e2fa4971619a800530f2cc37c8ebf5c7abacdb 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GenSection/build.xml b/Tools/Source/TianoTools/GenSection/build.xml
index 92fd1514541d0da1cb7a5c44ca441030af9e86d1..ee1453c128dd2251d16a35ab66e0e27b83ff6e91 100644 (file)
--- a/Tools/Source/TianoTools/GenSection/build.xml
+++ b/Tools/Source/TianoTools/GenSection/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/Source/TianoTools/GenTEImage/build.xml
index fd92c01bbaf444bb8a611d0ba8ddbc92757b57b1..e9235063f3e6b4e60b37c0e59148794f5c107de3 100644 (file)
--- a/Tools/Source/TianoTools/GenTEImage/build.xml
+++ b/Tools/Source/TianoTools/GenTEImage/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/GuidChk/build.xml b/Tools/Source/TianoTools/GuidChk/build.xml
index b5c64d34b05b0e0c53bd291093446f63537b9c99..9d798c94c7ccc8ea60f1cd6d13923cb578b13416 100644 (file)
--- a/Tools/Source/TianoTools/GuidChk/build.xml
+++ b/Tools/Source/TianoTools/GuidChk/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/MakeDeps/build.xml b/Tools/Source/TianoTools/MakeDeps/build.xml
index 4cc82f0ebb38eaf6ca0da32e7f06b944b314ad8b..8828eca84f36adfbf981e83d8f4a4ea5913f7cf0 100755 (executable)
--- a/Tools/Source/TianoTools/MakeDeps/build.xml
+++ b/Tools/Source/TianoTools/MakeDeps/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/ModifyInf/build.xml b/Tools/Source/TianoTools/ModifyInf/build.xml
index c31e5537900e14dfa56e4aff89d37c52316bd224..cd2e742413d069aa780a620fdd7c6ad1414f95cf 100644 (file)
--- a/Tools/Source/TianoTools/ModifyInf/build.xml
+++ b/Tools/Source/TianoTools/ModifyInf/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/Pccts/antlr/build.xml b/Tools/Source/TianoTools/Pccts/antlr/build.xml
index 6f30ecbd834bc21ed737b63cb80b70f4a8a2aefd..4c432c1f222ebb0ab7dc3ab2455547cba6680137 100644 (file)
--- a/Tools/Source/TianoTools/Pccts/antlr/build.xml
+++ b/Tools/Source/TianoTools/Pccts/antlr/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/Pccts/build.xml b/Tools/Source/TianoTools/Pccts/build.xml
index 12a3afadacab5d99fcb0fe66d24e8e1966a33cf6..355ed2ca5415932508182f992b7f22b7aee35bee 100644 (file)
--- a/Tools/Source/TianoTools/Pccts/build.xml
+++ b/Tools/Source/TianoTools/Pccts/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/Pccts/dlg/build.xml b/Tools/Source/TianoTools/Pccts/dlg/build.xml
index d926f25e4b80ccde2023fa3985e099054d5e9ed7..efdae432d8e8fcec5ac59e70445330719c65c79b 100644 (file)
--- a/Tools/Source/TianoTools/Pccts/dlg/build.xml
+++ b/Tools/Source/TianoTools/Pccts/dlg/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/PeCoffLoader/build.xml b/Tools/Source/TianoTools/PeCoffLoader/build.xml
index bd275209dc7881b8dedfa772c995452b4d4424ed..e1b41ed3a4c851dccf82fb7cfcc8ec8dcc298664 100644 (file)
--- a/Tools/Source/TianoTools/PeCoffLoader/build.xml
+++ b/Tools/Source/TianoTools/PeCoffLoader/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/PeiRebase/build.xml b/Tools/Source/TianoTools/PeiRebase/build.xml
index af30cfe745769c1f73e2393068a4f36e39f29dd5..4da3cd8269d3dfbbc3ca5ad57032e334f9e300bd 100644 (file)
--- a/Tools/Source/TianoTools/PeiRebase/build.xml
+++ b/Tools/Source/TianoTools/PeiRebase/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
index bad8205131de902741dd1d05322c81b82fa8991b..34b0383981fe4b76cbd308d333e55c9a0e53a890 100644 (file)
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/SecFixup/build.xml b/Tools/Source/TianoTools/SecFixup/build.xml
index 57764ccead179597d16d2defeb030c7ed2f991a1..2df362a62df98b7a27a013f3dc504f22bfd4e395 100644 (file)
--- a/Tools/Source/TianoTools/SecFixup/build.xml
+++ b/Tools/Source/TianoTools/SecFixup/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/SetStamp/build.xml b/Tools/Source/TianoTools/SetStamp/build.xml
index 65a975a62db1938aba6d780a3706e26a67a4a49c..6b47bb8581fbbc5c09450c28bcaeb65a6ddff926 100644 (file)
--- a/Tools/Source/TianoTools/SetStamp/build.xml
+++ b/Tools/Source/TianoTools/SetStamp/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/SplitFile/build.xml b/Tools/Source/TianoTools/SplitFile/build.xml
index aea77d7ab5e3c82744377d5f6287e989e7592718..f4dbae920be1a5e06c81bf3d72d43a797e7289a7 100644 (file)
--- a/Tools/Source/TianoTools/SplitFile/build.xml
+++ b/Tools/Source/TianoTools/SplitFile/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/StrGather/build.xml b/Tools/Source/TianoTools/StrGather/build.xml
index 05035f488a3d6e2153e6636515b737541e504466..98ace14756bc04bfa256f8392b57712e4c44d9bb 100644 (file)
--- a/Tools/Source/TianoTools/StrGather/build.xml
+++ b/Tools/Source/TianoTools/StrGather/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/Source/TianoTools/String/build.xml
index 868a072e243ee70752e7a2d21cbc1b2a36d2f3a0..06c0975a00a923ab6371674f567a34e6f855bdef 100644 (file)
--- a/Tools/Source/TianoTools/String/build.xml
+++ b/Tools/Source/TianoTools/String/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/Strip/build.xml b/Tools/Source/TianoTools/Strip/build.xml
index 56e84ce033dbe07de09fad16183e94e281f076a9..50bf76f253e17328ef5f2fb4a6a16d40f8035773 100644 (file)
--- a/Tools/Source/TianoTools/Strip/build.xml
+++ b/Tools/Source/TianoTools/Strip/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml
index 9c9de3879f82e86383fe15df68d72c7da5f2f6ba..67442dfed3e773e9c0adb7d6dce3884d5c5be934 100644 (file)
--- a/Tools/Source/TianoTools/VfrCompile/build.xml
+++ b/Tools/Source/TianoTools/VfrCompile/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/ZeroDebugData/build.xml b/Tools/Source/TianoTools/ZeroDebugData/build.xml
index 151299bc9c6d8f164e4ae0b85bed8f1a612ad172..0c11f5c03d0ae4eaccbd7271300d1a451e580311 100644 (file)
--- a/Tools/Source/TianoTools/ZeroDebugData/build.xml
+++ b/Tools/Source/TianoTools/ZeroDebugData/build.xml
@@ -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

diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index 0d6d2fbc6f9f9559327c706591a89d02abd907ca..065cb6c33c552d8fc88f147b17077c321220ab04 100644 (file)
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -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