Copyright (c) 2006, Intel Corporation\r
-->\r
<property name="ToolName" value="GenFvImage"/>\r
- <property name="FileSet" value="BasePeCoff.c GenFvImageLib.c GenFvImageExe.c"/>\r
+ <property name="FileSet" value="GenFvImageLib.c GenFvImageExe.c"/>\r
\r
<taskdef resource="cpptasks.tasks"/>\r
<typedef resource="cpptasks.types"/>\r
<taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
\r
- <property environment="env"/>\r
-\r
<property name="LINK_OUTPUT_TYPE" value="static"/>\r
- <property name="BUILD_DIR_IA32" value="${PACKAGE_DIR}/${ToolName}/tmp/Ia32"/>\r
- <property name="BUILD_DIR_X64" value="${PACKAGE_DIR}/${ToolName}/tmp/X64"/>\r
- <property name="BUILD_DIR_IPF" value="${PACKAGE_DIR}/${ToolName}/tmp/Ipf"/>\r
+ <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
\r
<target name="GenTool" depends="init, Tool">\r
- <echo message="Building the EDK Tool: ${ToolName}"/>\r
+ <echo message="The EDK Tool: ${ToolName} build has completed"/>\r
</target>\r
\r
<target name="init">\r
- <echo message="The EDK Tool: ${ToolName}"/>\r
- <mkdir dir="${BUILD_DIR_IA32}"/>\r
- <mkdir dir="${BUILD_DIR_X64}"/>\r
- <mkdir dir="${BUILD_DIR_IPF}"/>\r
+ <echo message="Building the EDK Tool: ${ToolName}"/>\r
+ <mkdir dir="${BUILD_DIR}"/>\r
<if>\r
- <equals arg1="${GCC}" arg2="cygwin"/>\r
+ <istrue value="${OSX}"/>\r
<then>\r
- <echo message="Cygwin Family"/>\r
- <property name="ToolChain" value="gcc"/>\r
+ <property name="syslibdirs" value=""/>\r
+ <property name="syslibs" value=""/>\r
</then>\r
- <elseif>\r
- <os family="dos"/>\r
+ </if>\r
+\r
+ <if>\r
+ <istrue value="${cygwin}"/>\r
<then>\r
- <echo message="Windows Family"/>\r
- <property name="ToolChain" value="msvc"/>\r
+ <property name="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs"/>\r
+ <property name="syslibs" value="uuid"/>\r
</then>\r
- </elseif>\r
- <elseif>\r
- <os family="unix"/>\r
+ </if>\r
+ \r
+ <if>\r
+ <istrue value="${msft}"/>\r
<then>\r
- <echo message="UNIX Family"/>\r
- <property name="ToolChain" value="gcc"/>\r
+ <property name="syslibdirs" value=""/>\r
+ <property name="syslibs" value="uuid"/>\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
<if>\r
- <equals arg1="${ToolChain}" arg2="msvc"/>\r
+ <istrue value="${linux}"/>\r
<then>\r
- <property name="ext_static" value=".lib"/>\r
- <property name="ext_dynamic" value=".dll"/>\r
- <property name="ext_exe" value=".exe"/>\r
+ <if>\r
+ <istrue value="${x86_64_linux}"/>\r
+ <then>\r
+ <property name="syslibdirs" value="/lib64"/>\r
+ </then>\r
+ <else>\r
+ <property name="syslibdirs" value="/usr/lib"/>\r
+ </else>\r
+ </if>\r
+ <property name="syslibs" value="uuid"/>\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
+ <echo message="syslibdirs set to: ${syslibdirs}"/>\r
</target>\r
\r
- <target name="Tool" depends="init, GenFvImage, GenFvImage_Ia32, GenFvImage_X64, GenFvImage_Ipf"/>\r
+ <target name="Tool" depends="init, GenFvImage"/>\r
\r
- <target name="GenFvImage">\r
- <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
+ <target name="GenFvImage" >\r
+ <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
outfile="${BIN_DIR}/${ToolName}"\r
outtype="executable"\r
- libtool="${haveLibtool}"\r
optimize="speed">\r
\r
<defineset>\r
</defineset>\r
\r
<fileset dir="${basedir}/${ToolName}" \r
- includes="${FileSet} Ia32/PeCoffLoaderEx.c" \r
- defaultexcludes="TRUE" \r
- excludes="*.xml *.inf"/>\r
+ includes="${FileSet}"/>\r
\r
<includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
+ <includepath path="${PACKAGE_DIR}/Include"/>\r
+ <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
<includepath path="${PACKAGE_DIR}/Common"/>\r
+ <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
\r
- <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
- <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
- <linkerarg value="/nodefaultlib:libc.lib"/>\r
- <linkerarg value="RpcRT4.Lib"/>\r
-\r
- </cc>\r
- </target>\r
-\r
- <target name="GenFvImage_Ia32">\r
- <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
- outfile="${BIN_DIR}/${ToolName}_Ia32"\r
- outtype="executable"\r
- libtool="${haveLibtool}"\r
- optimize="speed">\r
-\r
- <defineset>\r
- <define name="BUILDING_TOOLS"/>\r
- <define name="TOOL_BUILD_IA32_TARGET"/>\r
- </defineset>\r
- \r
- <fileset dir="${basedir}/${ToolName}" \r
- includes="${FileSet} Ia32/PeCoffLoaderEx.c" \r
- defaultexcludes="TRUE" \r
- excludes="*.xml *.inf"/>\r
-\r
- <includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
- <includepath path="${PACKAGE_DIR}/Common"/>\r
-\r
- <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
- <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
- <linkerarg value="/nodefaultlib:libc.lib"/>\r
- <linkerarg value="RpcRT4.Lib"/>\r
-\r
- </cc>\r
- </target>\r
-\r
- <target name="GenFvImage_X64">\r
- <cc name="${ToolChain}" objdir="${BUILD_DIR_X64}" \r
- outfile="${BIN_DIR}/${ToolName}_X64"\r
- outtype="executable"\r
- libtool="${haveLibtool}"\r
- optimize="speed">\r
-\r
- <defineset>\r
- <define name="BUILDING_TOOLS"/>\r
- <define name="TOOL_BUILD_X64_TARGET"/>\r
- </defineset>\r
- \r
- <fileset dir="${basedir}/${ToolName}" \r
- includes="${FileSet} X64/PeCoffLoaderEx.c" \r
- defaultexcludes="TRUE" \r
- excludes="*.xml *.inf"/>\r
-\r
- <includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
- <includepath path="${PACKAGE_DIR}/Common"/>\r
-\r
- <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
- <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
- <linkerarg value="/nodefaultlib:libc.lib"/>\r
- <linkerarg value="RpcRT4.Lib"/>\r
-\r
- </cc>\r
- </target>\r
-\r
- <target name="GenFvImage_Ipf">\r
- <cc name="${ToolChain}" objdir="${BUILD_DIR_IPF}" \r
- outfile="${BIN_DIR}/${ToolName}_Ipf"\r
- outtype="executable"\r
- libtool="${haveLibtool}"\r
- optimize="speed">\r
-\r
- <defineset>\r
- <define name="BUILDING_TOOLS"/>\r
- <define name="TOOL_BUILD_IPF_TARGET"/>\r
- </defineset>\r
- \r
- <fileset dir="${basedir}/${ToolName}" \r
- includes="${FileSet} Ipf/PeCoffLoaderEx.c" \r
- defaultexcludes="TRUE" \r
- excludes="*.xml *.inf"/>\r
-\r
- <includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
- <includepath path="${PACKAGE_DIR}/Common"/>\r
-\r
- <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
- <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
- <linkerarg value="/nodefaultlib:libc.lib"/>\r
- <linkerarg value="RpcRT4.Lib"/>\r
-\r
+ <linkerarg value="/nodefaultlib:libc.lib" if="msft"/>\r
+ <syslibset dir="${syslibdirs}" libs="${syslibs}" if="cyglinux"/>\r
+ <syslibset libs="RpcRT4" if="msft"/>\r
</cc>\r
</target>\r
\r
- <target name="clean" depends="init">\r
+ <target name="clean">\r
<echo message="Removing Intermediate Files Only"/> \r
<delete>\r
- <fileset dir="${BUILD_DIR_IA32}" includes="*.obj"/>\r
- <fileset dir="${BUILD_DIR_X64}" includes="*.obj"/>\r
- <fileset dir="${BUILD_DIR_IPF}" includes="*.obj"/>\r
+ <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
</delete>\r
</target>\r
\r
- <target name="cleanall" depends="init">\r
+ <target name="cleanall">\r
<echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/> \r
- <delete dir="${PACKAGE_DIR}/${ToolName}/tmp">\r
- \r
- <fileset dir="${BIN_DIR}" includes="${ToolName}_Ia32${ext_exe}"/>\r
- <fileset dir="${BIN_DIR}" includes="${ToolName}_X64${ext_exe}"/>\r
- <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
- <fileset dir="${BIN_DIR}" includes="${ToolName}_Ipf${ext_exe}"/>\r
+ <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+ <fileset dir="${BUILD_DIR}"/>\r
+ <fileset file="${BIN_DIR}/${ToolName}_Ia32${ext_exe}"/>\r
+ <fileset file="${BIN_DIR}/${ToolName}_X64${ext_exe}"/>\r
+ <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
+ <fileset file="${BIN_DIR}/${ToolName}_Ipf${ext_exe}"/>\r
</delete>\r
</target>\r
\r