X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FTianoTools%2FCompressDll%2Fbuild.xml;h=5043d127d5a2bc00f19ef65be67cfab2bb979f3e;hb=214b0d1914b48d651b25e58f321ddb77a46903b8;hp=2ef384934058702202754bff94cdb3633ca3eb15;hpb=dce914c0d20c001d438e4fd13a9310ea44cb4d55;p=mirror_edk2.git

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