X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FTianoTools%2FString%2Fbuild.xml;h=933cb5c1e49447c7c561c4015666890ccc567196;hp=b77b69069742fa718c1a1e33bd143c26ff521282;hb=205437772a146f6a7c87a010234e771169e50bdb;hpb=ce53a8c3b23b6e6a483a4d626be59f122c6763ae

diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/Source/TianoTools/String/build.xml
index b77b690697..933cb5c1e4 100644
--- 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"/>
 
   <property name="LibName" value="String"/>
-  <property environment="env"/>
-
   <property name="LINK_OUTPUT_TYPE" value="static"/>
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${LibName}/tmp"/>
 
   <target name="GenTool" depends="init, String">
-    <echo message="Building the EDK Tool: ${LibName}"/>
+    <echo message="The EDK Library: ${LibName} build has completed!"/>
   </target>
 
   <target name="init">
-    <echo message="The EDK Library: ${LibName}"/>
+    <echo message="Building the EDK Library: ${LibName}"/>
     <mkdir dir="${BUILD_DIR}"/>
-    <if>
-      <equals arg1="${GCC}" arg2="cygwin"/>
-      <then>
-        <echo message="Cygwin Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    <elseif>
-      <os family="dos"/>
-      <then>
-        <echo message="Windows Family"/>
-        <property name="ToolChain" value="msvc"/>
-      </then>
-    </elseif>
-    <elseif>
-      <os family="unix"/>
-      <then>
-        <echo message="UNIX Family"/>
-        <property name="ToolChain" value="gcc"/>
-      </then>
-    </elseif>
-
-    <else>
-      <echo>
-        Unsupported Operating System
-        Please Contact Intel Corporation
-      </echo>
-    </else>
-    </if>
-        <property name="ToolChain" value="gcc"/>
-    <if>
-      <equals arg1="${ToolChain}" arg2="msvc"/>
-      <then>
-        <property name="ext_static" value=".lib"/>
-        <property name="ext_dynamic" value=".dll"/>
-        <property name="ext_exe" value=".exe"/>
-      </then>
-      <elseif>
-        <equals arg1="${ToolChain}" arg2="gcc"/>
-        <then>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-          <property name="ext_exe" value=""/>
-        </then>
-      </elseif>
-    </if>
 
     <condition property="syslibdirs" value="">
       <os family="mac"/>
@@ -107,8 +60,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${LIB_DIR}/${LibName}"
         outtype="static"
+        debug="true"
         optimize="speed">
-
+      <compilerarg value="${ExtraArgus}" if="ExtraArgus" />
       <compilerarg value="-fshort-wchar" if="gcc"/>
 
       <fileset dir="${basedir}/${LibName}" 
@@ -116,23 +70,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${LibName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
     </cc>
   </target>
 
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only"/>  
     <delete>
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>
     </delete>
   </target>
 
-  <target name="cleanall" depends="init">
-    <echo message="Removing Object Files and the Executable: ${LibName}${ext_exe}"/>  
+  <target name="cleanall">
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  
     <delete dir="${PACKAGE_DIR}/${LibName}/tmp">
     </delete>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>
+    </delete>
   </target>
 
 </project>