<typedef resource="cpptasks.types"/>\r
<taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
\r
- <property environment="env"/>\r
<property name="tmp" value="tmp"/>\r
+ <property name="LibName" value="CommonTool"/>\r
\r
<property name="LINK_OUTPUT_TYPE" value="static"/>\r
<property name="BUILD_DIR" value="${PACKAGE_DIR}/Common/tmp"/>\r
\r
<target name="CommonTools.lib" depends="init, ToolsLibrary">\r
- <echo message="Building the EDK CommonTools Library"/>\r
+ <echo message="The EDK Tool Library: ${LibName} build has completed."/>\r
</target>\r
\r
<target name="init">\r
- <echo message="The EDK CommonTools Library"/>\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
-\r
- <else>\r
- <echo>\r
- Unsupported Operating System\r
- Please Contact Intel Corporation\r
- </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
- </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
- </then>\r
- </elseif>\r
- </if>\r
</target>\r
\r
<target name="ToolsLibrary" depends="init">\r
<cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
outfile="${LIB_DIR}/CommonTools"\r
outtype="static"\r
- libtool="${haveLibtool}"\r
+ debug="true"\r
optimize="speed">\r
+ <compilerarg value="${ExtraArgus}" if="ExtraArgus" />\r
+ <compilerarg value="-fPIC" if="x86_64_linux"/>\r
\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>\r
- <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>\r
+ <includepath path="${PACKAGE_DIR}/Include"/>\r
+ <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
\r
<fileset dir="${basedir}/Common" \r
- includes="*.h *.c" \r
- defaultexcludes="TRUE" \r
- excludes="*.xml *.inf"/>\r
-\r
+ includes="*.c" />\r
</cc>\r
- <if>\r
- <os family="dos"/>\r
- <then>\r
- <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">\r
- <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/CommonTools${ext_static}"/>\r
- </exec>\r
- </then>\r
- </if>\r
</target>\r
\r
- <target name="clean" depends="init">\r
+ <target name="clean">\r
<echo message="Removing Intermediate Files Only from ${BUILD_DIR}"/> \r
- <delete>\r
- <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
- </delete>\r
+ <delete dir="${BUILD_DIR}"/>\r
</target>\r
\r
- <target name="cleanall" depends="init">\r
- <echo message="Removing Object Files and the Library: CommonTools${ext_static}"/> \r
- <delete dir="${BUILD_DIR}">\r
- <fileset dir="${LIB_DIR}" includes="CommonTools${ext_static}"/>\r
+ <target name="cleanall">\r
+ <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/> \r
+ <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+ <fileset dir="${BUILD_DIR}"/>\r
+ <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>\r
</delete>\r
</target>\r
\r