Updated to handle cygwin/gcc and moved msvc,gcc property settings to the TianoTools/build.xml file. Properties are inherited, so we only need to set them one. Cleaned up clean and cleanall targets to remove the executables and library files. Added makefile.cygwin to antlr and dlg programs to generate the .exe needed for cygwin.

FlashMap.c needed a newline at the end of the file to remove a warning message in cygwin.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1174 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 14 insertions, 55 deletions

diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 28cd4aec74..ff80a6c4ed 100644
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -11,12 +11,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->

 <project default="GenTool" basedir=".">

 <!--

-    EDK GenDepex Tool

+    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"/>

@@ -26,56 +25,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <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">

@@ -86,31 +44,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       outfile="${BIN_DIR}/${LibName}"

       outputfileproperty="result"

       >

-      <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>

+      <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/linux" if="gcc"/>

-      <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>

+      <includepath path="${env.JAVA_HOME}/include/linux" if="cyglinux"/>

+      <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"/>

     </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>