X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FTianoTools%2FCommon%2Fbuild.xml;h=902f677d1d17b2b01b80b9f8ec47e121ed626f1b;hp=91cba350d5164d159911b2fa744de5aeffcc53e7;hb=a6b6b67a487999f2adb8f1225e1f4d7ebb02cb70;hpb=dce914c0d20c001d438e4fd13a9310ea44cb4d55

diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml
index 91cba350d5..902f677d1d 100644
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -19,89 +19,48 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
 
-  <property environment="env"/>
   <property name="tmp" value="tmp"/>
+  <property name="LibName" value="CommonTool"/>
 
   <property name="LINK_OUTPUT_TYPE" value="static"/>
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/Common/tmp"/>
 
   <target name="CommonTools.lib" depends="init, ToolsLibrary">
-    <echo message="Building the EDK CommonTools Library"/>
+    <echo message="The EDK Tool Library: ${LibName} build has completed."/>
   </target>
 
   <target name="init">
-    <echo message="The EDK CommonTools Library"/>
+    <echo message="Building the EDK Tool 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>
-		<if>
-		  <equals arg1="${ToolChain}" arg2="msvc"/>
-			<then>
-        <property name="ext_static" value=".lib"/>
-        <property name="ext_dynamic" value=".dll"/>
-			</then>
-			<elseif>
-			  <equals arg1="${ToolChain}" arg2="gcc"/>
-				<then>
-          <property name="ext_static" value=".a"/>
-          <property name="ext_dynamic" value=".so"/>
-				</then>
-			</elseif>
-		</if>
   </target>
 
   <target name="ToolsLibrary" depends="init">
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
         outfile="${LIB_DIR}/CommonTools"
         outtype="static"
+        debug="true"
         optimize="speed">
+      <compilerarg value="${ExtraArgus}" if="ExtraArgus" />
+      <compilerarg value="-fPIC" if="x86_64_linux"/>
 
-      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
-      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${PACKAGE_DIR}/Include"/>
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
 
       <fileset dir="${basedir}/Common" 
         includes="*.c" />
     </cc>
   </target>
 
-  <target name="clean" depends="init">
+  <target name="clean">
     <echo message="Removing Intermediate Files Only from ${BUILD_DIR}"/>  
-    <delete>
-      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
-    </delete>
+    <delete dir="${BUILD_DIR}"/>
   </target>
 
-  <target name="cleanall" depends="init">
-    <echo message="Removing Object Files and the Library: CommonTools${ext_static}"/>  
-    <delete dir="${BUILD_DIR}">
-      <fileset dir="${LIB_DIR}" includes="CommonTools${ext_static}"/>
+  <target name="cleanall">
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset dir="${BUILD_DIR}"/>
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>
     </delete>
   </target>