Updated to handle cygwin/gcc and moved msvc,gcc property settings to the TianoTools...

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

diff --git a/Tools/Source/TianoTools/PeCoffLoader/build.xml b/Tools/Source/TianoTools/PeCoffLoader/build.xml
index e1b41ed3a4c851dccf82fb7cfcc8ec8dcc298664..26f52ac48feeb8b044c14aa234e6a2abf530c004 100644 (file)
--- a/Tools/Source/TianoTools/PeCoffLoader/build.xml
+++ b/Tools/Source/TianoTools/PeCoffLoader/build.xml
@@ -24,60 +24,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR_X64" value="${PACKAGE_DIR}/${LibName}/tmp/X64"/>\r
   <property name="BUILD_DIR_IPF" value="${PACKAGE_DIR}/${LibName}/tmp/Ipf"/>\r
 \r
-  <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${LibName}"/>\r
+  <target name="GenTool" depends="init, PeCoffLoaderLib">\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_IA32}"/>\r
     <mkdir dir="${BUILD_DIR_X64}"/>\r
     <mkdir dir="${BUILD_DIR_IPF}"/>\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
@@ -105,7 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     \r
   </target>\r
 \r
-  <target name="Tool" depends="init, PeCoffLoader_Ia32, PeCoffLoader_Ipf, PeCoffLoader_X64"/>\r
+  <target name="PeCoffLoaderLib" depends="init, PeCoffLoader_Ia32, PeCoffLoader_Ipf, PeCoffLoader_X64"/>\r
 \r
   <target name="PeCoffLoader_Ia32" >\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
@@ -171,7 +126,7 @@ 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_IA32}" includes="*.obj"/>\r
@@ -180,10 +135,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${LibName}${ext_exe}"/>  \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}_Ia32${ext_static}"/>\r
+      <fileset file="${BIN_DIR}/${LibName}_X64${ext_static}"/>\r
+      <fileset file="${BIN_DIR}/${LibName}_IPF${ext_static}"/>\r
+    </delete>\r
   </target>\r
 \r
 </project>\r