Updated to handle cygwin/gcc and moved msvc,gcc property settings to the TianoTools...

[mirror_edk2.git] / Tools / Source / TianoTools / GenFvImage / build.xml

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index 40e2fa4971619a800530f2cc37c8ebf5c7abacdb..5ba021f4c64eb58c692b6bd7a184dccd9725601c 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -25,86 +25,52 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <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
+    <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
-        <property name="ToolChain" value="gcc"/>\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
-\r
-    <condition property="syslibdirs" value="">\r
-      <os family="mac"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibs" value="">\r
-      <os family="mac"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibdirs" value="/lib64">\r
-      <istrue value="${x86_64_linux}"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs">\r
-      <os family="windows"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibs" value="uuid">\r
-      <os family="windows"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibdirs" value="/usr/lib">\r
-      <os name="Linux"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibs" value="uuid">\r
-      <os name="Linux"/>\r
-    </condition>\r
-    \r
+    <echo message="syslibdirs set to: ${syslibdirs}"/>\r
   </target>\r
 \r
   <target name="Tool" depends="init, GenFvImage"/>\r
@@ -129,27 +95,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \r
-      <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
-      <syslibset libs="RpcRT4" unless="gcc"/>\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}" 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