Streamline the tools build and make it friendlier to gcc.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@97 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
bbahnsen
2006-05-03 22:14:18 +00:00
parent 7b778c8ee3
commit dce914c0d2
13 changed files with 64 additions and 148 deletions

View File

@@ -23,7 +23,7 @@ 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"/>
<target name="GenTool" depends="init,Lib,Dll">
<target name="GenTool" depends="init,Lib" >
<echo message="Building the EDK Tool: ${ToolName}"/>
</target>
<target name="init">
@@ -70,16 +70,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</then>
</elseif>
</if>
<condition property="CheckDepends">
<uptodate targetfile="${BIN_DIR}/${LibName}${ext_dynamic}">
<srcfiles dir="${BUILD_DIR}" includes="CommonTools.lib, CustomizedCompress.lib, CompressDll.obj"/>
</uptodate>
</condition>
</target>
<target name="Lib" depends="init">
<cc name="${ToolChain}" objdir="${BUILD_DIR}" outtype="static" optimize="speed">
<target name="Lib" depends="init" unless="gcc">
<cc name="${ToolChain}"
objdir="${BUILD_DIR}"
outtype="shared"
optimize="speed"
outfile="${BIN_DIR}/${LibName}"
>
<fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>
<includepath path="${env.WORKSPACE}/MdePkg/Include"/>
<includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
@@ -87,20 +86,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Common"/>
<includepath path="${env.JAVA_HOME}/include"/>
<includepath path="${env.JAVA_HOME}/include/win32"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/>
<syslibset libs="kernel32" unless="gcc"/>
</cc>
</target>
<target name="Dll" unless="CheckDepends">
<if>
<os family="dos"/>
<then>
<echo message="Begin link!"/>
<exec dir="${BUILD_DIR}" executable="link" failonerror="false">
<arg line="kernel32.lib ${LIB_DIR}/CommonTools.lib ${LIB_DIR}/CustomizedCompress.lib /NOLOGO /DLL /MACHINE:I386 /OUT:${BUILD_DIR}/${LibName}${ext_dynamic} ${ToolName}"/>
</exec>
<copy todir="${BIN_DIR}" file="${BUILD_DIR}/${LibName}${ext_dynamic}"/>
</then>
</if>
</target>
<target name="clean" depends="init">
<echo message="Removing Intermediate Files Only"/>
<delete>