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

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

diff --git a/Tools/Source/TianoTools/CustomizedCompress/build.xml b/Tools/Source/TianoTools/CustomizedCompress/build.xml
index 32aa12d1a9885ed1834730d60217b2dd4dc77fe8..46c9275f92de2106ac0a92b96e6d1b39206b5714 100644 (file)
--- a/Tools/Source/TianoTools/CustomizedCompress/build.xml
+++ b/Tools/Source/TianoTools/CustomizedCompress/build.xml
@@ -9,7 +9,7 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
-<project default="CustomizedCompress.lib" basedir=".">\r
+<project default="GenLib" basedir="." name="CustomizedCompressLibrary">\r
 <!--\r
     EDK Customized Compress Library\r
   Copyright (c) 2006, Intel Corporation\r
@@ -19,71 +19,27 @@ 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 name="LibName" value="CustomizedCompress"/>\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/CustomizedCompress/tmp"/>\r
 \r
-  <target name="CustomizedCompress.lib" depends="ToolsLibrary">\r
-    <echo message="Building the EDK CustomizedCompress Library"/>\r
+  <target name="GenLib" depends="init, CustomizedCompress">\r
+    <echo message="The EDK Tool Library ${LibName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK CustomizedCompress Library"/>\r
+    <echo message="Building the EDK Tool 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
-\r
-    <echo message="ToolChain: ${ToolChain}"/>\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
-      </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
-        </then>\r
-      </elseif>\r
-    </if>\r
   </target>\r
 \r
-  <target name="ToolsLibrary" depends="init">\r
+  <target name="CustomizedCompress" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
-        outfile="${LIB_DIR}/CustomizedCompress"\r
+        outfile="${LIB_DIR}/${LibName}"\r
         outtype="static"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/CustomizedCompress" \r
-        includes="*.h *.c" \r
+        includes="*.c" \r
         defaultexcludes="TRUE" \r
         excludes="*.xml *.inf"/>\r
 \r
@@ -91,7 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
     </cc>\r
     <if>\r
-      <os family="dos"/>\r
+      <istrue value="msft"/>\r
       <then>\r
         <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">\r
           <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/CustomizedCompress${ext_static}"/>\r
@@ -108,9 +64,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
   <target name="cleanall">\r
-    <echo message="Removing Object Files and the Library: CustomizedCompress${ext_static}"/>  \r
-    <delete dir="${BUILD_DIR}" failonerror="false">\r
-      <fileset dir="${LIB_DIR}" includes="CustomizedCompress${ext_static}"/>\r
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  \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