Remove warning message in MAC GCC tool build

[mirror_edk2.git] / Tools / Source / TianoTools / String / build.xml

diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/Source/TianoTools/String/build.xml
index 868a072e243ee70752e7a2d21cbc1b2a36d2f3a0..44c617360b41a04013073ce3f2928b562fe3c9a1 100644 (file)
--- a/Tools/Source/TianoTools/String/build.xml
+++ b/Tools/Source/TianoTools/String/build.xml
@@ -19,63 +19,16 @@ 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
   <target name="GenTool" depends="init, String">\r
-    <echo message="Building the EDK Tool: ${LibName}"/>\r
+    <echo message="The EDK Library: ${LibName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Library: ${LibName}"/>\r
+    <echo message="Building the EDK Library: ${LibName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\r
-        <property name="ToolChain" value="gcc"/>\r
-    <if>\r
-      <equals arg1="${ToolChain}" arg2="msvc"/>\r
-      <then>\r
-        <property name="ext_static" value=".lib"/>\r
-        <property name="ext_dynamic" value=".dll"/>\r
-        <property name="ext_exe" value=".exe"/>\r
-      </then>\r
-      <elseif>\r
-        <equals arg1="${ToolChain}" arg2="gcc"/>\r
-        <then>\r
-          <property name="ext_static" value=".a"/>\r
-          <property name="ext_dynamic" value=".so"/>\r
-          <property name="ext_exe" value=""/>\r
-        </then>\r
-      </elseif>\r
-    </if>\r
 \r
     <condition property="syslibdirs" value="">\r
       <os family="mac"/>\r
@@ -109,7 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outtype="static"\r
         debug="true"\r
         optimize="speed">\r
-\r
+      <compilerarg value="${ExtraArgus}" />\r
       <compilerarg value="-fshort-wchar" if="gcc"/>\r
 \r
       <fileset dir="${basedir}/${LibName}" \r
@@ -123,17 +76,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
-    <echo message="Removing Object Files and the Executable: ${LibName}${ext_exe}"/>  \r
+  <target name="cleanall">\r
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  \r
     <delete dir="${PACKAGE_DIR}/${LibName}/tmp">\r
     </delete>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>\r
+    </delete>\r
   </target>\r
 \r
 </project>\r