Remove warning message in MAC GCC tool build

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

diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 3e0d78f12e8d187806e40dbb8d8b4b061625b499..7af7c8119ae5704729ebc87bb02e38240be4466a 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -10,66 +10,30 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
 <project default="GenTool" basedir=".">\r
-  <!--EDK GenDepex Tool\r
-  Copyright (c) 2006, Intel Corporation-->\r
-  <property environment="env"/>\r
+<!--\r
+    EDK CompressDll Tool Library\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
-  <property name="ToolName" value="CompressDll"/>\r
   <property name="LibName" value="CompressDll"/>\r
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>\r
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>\r
+\r
   <taskdef resource="cpptasks.tasks"/>\r
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
+\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
-  <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>\r
+  <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${LibName}/tmp"/>\r
+\r
   <target name="GenTool" depends="init,Lib" >\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool Library: ${LibName} build has completed!"/>\r
   </target>\r
+\r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\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
-      <else>\r
-        <echo>Unsupported Operating System\r
-        Please Contact Intel Corporation</echo>\r
-      </else>\r
-    </if>\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
   </target>\r
   \r
   <target name="Lib" depends="init">\r
@@ -80,30 +44,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       outfile="${BIN_DIR}/${LibName}"\r
       outputfileproperty="result"\r
       >\r
-      <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>\r
+      <compilerarg value="${ExtraArgus}" />\r
+      <fileset dir="${LibName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
-      <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r
-      <includepath path="${env.JAVA_HOME}/include/linux" if="linux"/>\r
+      <includepath path="${env.JAVA_HOME}/include/linux" if="gcc"/>\r
+      <includepath path="${env.JAVA_HOME}/include/win32" if="cygwin"/>\r
+      <includepath path="${env.JAVA_HOME}/include/win32" if="msft"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
-      <syslibset libs="kernel32" unless="gcc"/>\r
+      <syslibset libs="kernel32" if="msft"/>\r
+      <linkerarg value="-mno-cygwin" if="cygwin"/>\r
+      <linkerarg value="--add-stdcall-alias" if="cygwin"/>\r
     </cc>\r
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\r
   </target>\r
-  <target name="clean" depends="init">\r
+\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
-  <target name="cleanall" depends="init">\r
-    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>\r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_dynamic}"/>\r
+\r
+  <target name="cleanall">\r
+    <echo message="Removing Object Files and the Executable: ${LibName}${ext_shared}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${LibName}.*"/>\r
     </delete>\r
   </target>\r
 </project>\r