From 51d48c2666aac102c522f38609d6017f6fcdd6b1 Mon Sep 17 00:00:00 2001
From: bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 23 May 2006 18:03:58 +0000
Subject: [PATCH] Porting several more tools to edk2.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@246 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../TianoTools/CreateMtFile/CreateMtFile.c    |   3 +-
 .../Source/TianoTools/CreateMtFile/build.xml  | 117 +++++++++++++++++
 .../TianoTools/EfiCompress/EfiCompressMain.c  |   3 +-
 Tools/Source/TianoTools/EfiCompress/build.xml | 117 +++++++++++++++++
 Tools/Source/TianoTools/EfiRom/EfiRom.c       |  10 +-
 Tools/Source/TianoTools/EfiRom/build.xml      | 118 +++++++++++++++++
 .../Source/TianoTools/FlashMap/FlashDefFile.c |   7 +-
 Tools/Source/TianoTools/FlashMap/FlashMap.c   |   8 +-
 Tools/Source/TianoTools/FlashMap/Microcode.c  |   2 -
 Tools/Source/TianoTools/FlashMap/Symbols.c    |   5 +-
 Tools/Source/TianoTools/FlashMap/build.xml    | 122 ++++++++++++++++++
 .../TianoTools/GenAcpiTable/GenAcpiTable.c    |   5 +-
 .../Source/TianoTools/GenAcpiTable/build.xml  | 117 +++++++++++++++++
 .../TianoTools/GenCapsuleHdr/GenCapsuleHdr.c  |  15 ++-
 .../Source/TianoTools/GenCapsuleHdr/build.xml | 117 +++++++++++++++++
 .../Source/TianoTools/GenFdImage/GenFdImage.h |   5 +-
 .../TianoTools/GenFdImage/GenFdImageDll.c     |   7 +-
 .../Source/TianoTools/GenTEImage/GenTEImage.c |   6 +-
 Tools/Source/TianoTools/GenTEImage/build.xml  | 117 +++++++++++++++++
 .../TianoTools/PeiRebase/PeiRebaseExe.c       |  11 +-
 .../TianoTools/PeiRebase/PeiRebaseExe.h       |   7 +-
 .../SecApResetVectorFixup.h                   |   9 +-
 .../SecApResetVectorFixup/build.xml           | 117 +++++++++++++++++
 Tools/Source/TianoTools/SecFixup/SecFixup.c   |   5 +-
 Tools/Source/TianoTools/SecFixup/build.xml    | 117 +++++++++++++++++
 Tools/Source/TianoTools/SplitFile/build.xml   | 117 +++++++++++++++++
 Tools/Source/TianoTools/Strip/Strip.c         |   1 -
 Tools/Source/TianoTools/Strip/build.xml       | 117 +++++++++++++++++
 .../TianoTools/ZeroDebugData/ZeroDebugData.c  |   1 -
 .../Source/TianoTools/ZeroDebugData/build.xml | 117 +++++++++++++++++
 30 files changed, 1475 insertions(+), 45 deletions(-)
 create mode 100644 Tools/Source/TianoTools/CreateMtFile/build.xml
 create mode 100644 Tools/Source/TianoTools/EfiCompress/build.xml
 create mode 100644 Tools/Source/TianoTools/EfiRom/build.xml
 create mode 100644 Tools/Source/TianoTools/FlashMap/build.xml
 create mode 100644 Tools/Source/TianoTools/GenAcpiTable/build.xml
 create mode 100644 Tools/Source/TianoTools/GenCapsuleHdr/build.xml
 create mode 100644 Tools/Source/TianoTools/GenTEImage/build.xml
 create mode 100644 Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
 create mode 100644 Tools/Source/TianoTools/SecFixup/build.xml
 create mode 100644 Tools/Source/TianoTools/SplitFile/build.xml
 create mode 100644 Tools/Source/TianoTools/Strip/build.xml
 create mode 100644 Tools/Source/TianoTools/ZeroDebugData/build.xml

diff --git a/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c b/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
index e769b8835e..055c187985 100644
--- a/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
+++ b/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
@@ -23,7 +23,8 @@ Abstract:
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "TianoCommon.h"
+#include "UefiBaseTypes.h"
+#include "Base.h"
 
 #define PROGRAM_NAME  "CreateMtFile"
 
diff --git a/Tools/Source/TianoTools/CreateMtFile/build.xml b/Tools/Source/TianoTools/CreateMtFile/build.xml
new file mode 100644
index 0000000000..56cff1fdb3
--- /dev/null
+++ b/Tools/Source/TianoTools/CreateMtFile/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK CreateMtFile Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="CreateMtFile"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c b/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
index db3e184e57..5964eb544c 100644
--- a/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
+++ b/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
@@ -25,7 +25,8 @@ Abstract:
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include "TianoCommon.h"
+#include <UefiBaseTypes.h>
+#include <Base.h>
 #include "EfiCompress.h"
 
 int
diff --git a/Tools/Source/TianoTools/EfiCompress/build.xml b/Tools/Source/TianoTools/EfiCompress/build.xml
new file mode 100644
index 0000000000..adf40d9586
--- /dev/null
+++ b/Tools/Source/TianoTools/EfiCompress/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK EfiCompress Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="EfiCompress"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/EfiRom/EfiRom.c b/Tools/Source/TianoTools/EfiRom/EfiRom.c
index fc168ed14b..5fb99ab35d 100644
--- a/Tools/Source/TianoTools/EfiRom/EfiRom.c
+++ b/Tools/Source/TianoTools/EfiRom/EfiRom.c
@@ -33,14 +33,16 @@ Abstract:
 // #include "Compress.h"   // for compression function
 // Includes for Tiano build
 //
-#include "TianoCommon.h"
-#include "EfiImage.h" // for PE32 structure definitions
-#include "EfiCompress.h"
+#include <UefiBaseTypes.h>
+#include <EfiImage.h> // for PE32 structure definitions
+#include <EfiCompress.h>
+#include <CommonLib.h>
+#include <MultiPhase.h>
 
 //
 // END include differences
 //
-#include "Pci22.h"  // for option ROM header structures
+#include "pci22.h"  // for option ROM header structures
 //
 // Version of this utility
 //
diff --git a/Tools/Source/TianoTools/EfiRom/build.xml b/Tools/Source/TianoTools/EfiRom/build.xml
new file mode 100644
index 0000000000..619e9fc280
--- /dev/null
+++ b/Tools/Source/TianoTools/EfiRom/build.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK EfiRom Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="EfiRom"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/IndustryStandard"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/FlashMap/FlashDefFile.c b/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
index fa31863d47..a4de90136e 100644
--- a/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
+++ b/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
@@ -24,13 +24,16 @@ Abstract:
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <UefiBaseTypes.h>
+#include <Base.h>
 
-#include "Tiano.h"
 #include "EfiUtilityMsgs.h"
 #include "FlashDefFile.h"
 #include "SimpleFileParsing.h"
 #include "Symbols.h"
-#include "EfiFirmwareVolumeHeader.h"
+// #include "EfiFirmwareVolumeHeader.h"
+#include "MultiPhase.h"
+#include "FirmwareVolumeHeader.h"
 
 //
 // #include "TrackMallocFree.h"
diff --git a/Tools/Source/TianoTools/FlashMap/FlashMap.c b/Tools/Source/TianoTools/FlashMap/FlashMap.c
index 86e26b6fc7..ce20157795 100644
--- a/Tools/Source/TianoTools/FlashMap/FlashMap.c
+++ b/Tools/Source/TianoTools/FlashMap/FlashMap.c
@@ -24,12 +24,8 @@ Abstract:
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-
-#include "Tiano.h"
-
-#ifndef INT8
-#define INT8  char
-#endif
+#include <UefiBaseTypes.h>
+#include <Base.h>
 
 #include "EfiUtilityMsgs.h"
 #include "Microcode.h"
diff --git a/Tools/Source/TianoTools/FlashMap/Microcode.c b/Tools/Source/TianoTools/FlashMap/Microcode.c
index 51ae20e9f5..f5bea095e0 100644
--- a/Tools/Source/TianoTools/FlashMap/Microcode.c
+++ b/Tools/Source/TianoTools/FlashMap/Microcode.c
@@ -24,8 +24,6 @@ Abstract:
 #include <string.h> // for memset()
 #include <ctype.h>
 #include <stdlib.h> // for malloc()
-#define INT8    char
-#define UINT32  unsigned int
 
 #include "EfiUtilityMsgs.h"
 #include "Microcode.h"
diff --git a/Tools/Source/TianoTools/FlashMap/Symbols.c b/Tools/Source/TianoTools/FlashMap/Symbols.c
index 471128a6b6..b83f150180 100644
--- a/Tools/Source/TianoTools/FlashMap/Symbols.c
+++ b/Tools/Source/TianoTools/FlashMap/Symbols.c
@@ -29,7 +29,10 @@ Abstract:
 //
 #include <ctype.h>
 
-#include "Tiano.h"
+#include <UefiBaseTypes.h>
+#include <Base.h>
+#include <CommonLib.h>
+
 #include "EfiUtilityMsgs.h"
 #include "Symbols.h"
 
diff --git a/Tools/Source/TianoTools/FlashMap/build.xml b/Tools/Source/TianoTools/FlashMap/build.xml
new file mode 100644
index 0000000000..d2bfdd5568
--- /dev/null
+++ b/Tools/Source/TianoTools/FlashMap/build.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK FlashMap Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="FlashMap"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <defineset>
+        <define name="_malloc" value="malloc"/>
+        <define name="_free" value="free"/>
+      </defineset>
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c b/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
index 6c1ec5f76b..c0b914747d 100644
--- a/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
+++ b/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
@@ -23,8 +23,9 @@ Abstract:
 #include <string.h>
 #include <stdlib.h>
 
-#include "Tiano.h"
-#include "TianoCommon.h"
+#include <UefiBaseTypes.h>
+#include <Base.h>
+#include <CommonLib.h>
 #include "EfiImage.h" // for PE32 structure definitions
 #include "EfiUtilityMsgs.h"
 
diff --git a/Tools/Source/TianoTools/GenAcpiTable/build.xml b/Tools/Source/TianoTools/GenAcpiTable/build.xml
new file mode 100644
index 0000000000..b6f2427157
--- /dev/null
+++ b/Tools/Source/TianoTools/GenAcpiTable/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GenAcpiTable Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GenAcpiTable"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c b/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
index 87195e735b..88944cc664 100644
--- a/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
@@ -28,11 +28,18 @@ Abstract:
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "Tiano.h"                  // need a guid definition
+#include <UefiBaseTypes.h>
+#include <Base.h>
+#include <CommonLib.h>
+
 #include "EfiUtilityMsgs.h"
-#include "EfiCapsule.h"
-#include "EfiFirmwareVolumeHeader.h"
-#include "EfiFirmwareFileSystem.h"  // for FV header GUID
+#include "MultiPhase.h"
+#include "Capsule.h"
+#include "Guid/Capsule.h"
+#include "FirmwareVolumeImageFormat.h"
+#include "FirmwareVolumeHeader.h"
+#include "FirmwareFileSystem.h"  // for FV header GUID
+#include "Guid/FirmwareFileSystem.h"  // for FV header GUID
 #define MAX_PATH                  256
 #define PROGRAM_NAME              "GenCapsuleHdr"
 
diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
new file mode 100644
index 0000000000..88623078ce
--- /dev/null
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GenCapsuleHdr Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GenCapsuleHdr"/>
+  <property name="FileSet" value="GenCapsuleHdr.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/GenFdImage/GenFdImage.h b/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
index 68cfa8c5ff..d9c2686167 100644
--- a/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
+++ b/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
@@ -33,11 +33,10 @@ Abstract:
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <io.h>
+// #include <io.h>
 #include <assert.h>
-#include "TianoCommon.h"
 #include "ParseInf.h"
-#include "GenFvImage.h"
+// #include "GenFvImage.h"
 
 //
 // Defines
diff --git a/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c b/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
index c7d9b8b9f1..ff78aee18d 100644
--- a/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
+++ b/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
@@ -26,11 +26,12 @@ Intel Corporation.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <io.h>
+// #include <io.h>
 #include <assert.h>
-#include "TianoCommon.h"
+#include "UefiBaseTypes.h"
+#include "Base.h"
 #include "GenFdImage.h"
-#include "GenFvImage.h"
+// #include "GenFvImage.h"
 #include "ParseInf.h"
 
 //
diff --git a/Tools/Source/TianoTools/GenTEImage/GenTEImage.c b/Tools/Source/TianoTools/GenTEImage/GenTEImage.c
index 8aef6d316e..8313f9655b 100644
--- a/Tools/Source/TianoTools/GenTEImage/GenTEImage.c
+++ b/Tools/Source/TianoTools/GenTEImage/GenTEImage.c
@@ -24,8 +24,10 @@ Abstract:
 #include <string.h>
 #include <stdlib.h>
 
-#include "Tiano.h"
-#include "TianoCommon.h"
+#include <UefiBaseTypes.h>
+#include <Base.h>
+#include <CommonLib.h>
+
 #include "EfiImage.h" // for PE32 structure definitions
 #include "EfiUtilityMsgs.h"
 
diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/Source/TianoTools/GenTEImage/build.xml
new file mode 100644
index 0000000000..c0e2c82c74
--- /dev/null
+++ b/Tools/Source/TianoTools/GenTEImage/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GenTEImage Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GenTEImage"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
index 1845c48cbd..e9511644a6 100644
--- a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
+++ b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
@@ -22,18 +22,23 @@ Abstract:
 
 --*/
 
-#include "PeiRebaseExe.h"
+#include <UefiBaseTypes.h>
+#include <Base.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "CommonLib.h"
 #include "ParseInf.h"
-#include EFI_GUID_DEFINITION (PeiPeCoffLoader)
+// #include <Guid/PeiPeCoffLoader.h>
 #include "FvLib.h"
 
 #include "EfiUtilityMsgs.h"
+#include "FirmwareFileSystem.h"
+#include "PeCoffLib.h"
+
+#include "PeiRebaseExe.h"
 
-extern EFI_PEI_PE_COFF_LOADER_PROTOCOL  mPeCoffLoader;
+extern PEI_PE_COFF_LOADER_PROTOCOL  mPeCoffLoader;
 
 EFI_STATUS
 ReadHeader (
diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
index 9070d1ce1f..b9e71f4ed9 100644
--- a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
+++ b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
@@ -23,9 +23,10 @@ Abstract:
 #ifndef _EFI_PEIM_FIXUP_EXE_H
 #define _EFI_PEIM_FIXUP_EXE_H
 
-#include "Efi2WinNt.h"
-#include "EfiFirmwareFileSystem.h"
-#include "EfiFirmwareVolumeHeader.h"
+// #include "Efi2WinNt.h"
+#include "FirmwareFileSystem.h"
+#include "FirmwareVolumeHeader.h"
+#include "MultiPhase.h"
 
 //
 // Utility Name
diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
index 2bed5bc547..a41fc3af7b 100644
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
@@ -25,11 +25,12 @@ Abstract:
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "EfiCommon.h"
+#include <UefiBaseTypes.h>
+#include <Base.h>
 #include "EfiImage.h"
-#include "EfiImageFormat.h"
-#include "EfiFirmwareFileSystem.h"
-#include "EfiFirmwareVolumeHeader.h"
+#include <FirmwareVolumeImageFormat.h>
+#include "FirmwareFileSystem.h"
+#include "FirmwareVolumeHeader.h"
 #include "EfiUtilityMsgs.c"
 #include "CommonLib.h"
 
diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
new file mode 100644
index 0000000000..3df9dcc073
--- /dev/null
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK SecApResetVectorFixup Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="SecApResetVectorFixup"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/SecFixup/SecFixup.c b/Tools/Source/TianoTools/SecFixup/SecFixup.c
index a8e707fd16..96faaf089a 100644
--- a/Tools/Source/TianoTools/SecFixup/SecFixup.c
+++ b/Tools/Source/TianoTools/SecFixup/SecFixup.c
@@ -28,9 +28,10 @@ Abstract:
 
 #include <stdio.h>
 
-#include "EfiCommon.h"
+#include <UefiBaseTypes.h>
+#include <Base.h>
 #include "EfiImage.h"
-#include "EfiImageFormat.h"
+#include "FirmwareVolumeImageFormat.h"
 #include "EfiUtilityMsgs.c"
 
 #include "SecFixup.h"
diff --git a/Tools/Source/TianoTools/SecFixup/build.xml b/Tools/Source/TianoTools/SecFixup/build.xml
new file mode 100644
index 0000000000..2594fdd38a
--- /dev/null
+++ b/Tools/Source/TianoTools/SecFixup/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK SecFixup Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="SecFixup"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/SplitFile/build.xml b/Tools/Source/TianoTools/SplitFile/build.xml
new file mode 100644
index 0000000000..51adc216db
--- /dev/null
+++ b/Tools/Source/TianoTools/SplitFile/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK SplitFile Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="SplitFile"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/Strip/Strip.c b/Tools/Source/TianoTools/Strip/Strip.c
index 3fd6ad7d46..567b526568 100644
--- a/Tools/Source/TianoTools/Strip/Strip.c
+++ b/Tools/Source/TianoTools/Strip/Strip.c
@@ -23,7 +23,6 @@ Abstract:
 #include <stdio.h>
 #include <memory.h>
 #include <string.h>
-#include <malloc.h>
 
 int
 main (
diff --git a/Tools/Source/TianoTools/Strip/build.xml b/Tools/Source/TianoTools/Strip/build.xml
new file mode 100644
index 0000000000..d63faebbbb
--- /dev/null
+++ b/Tools/Source/TianoTools/Strip/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK Strip Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="Strip"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c b/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
index 2f2003956a..0a7ce85d89 100644
--- a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
+++ b/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
@@ -21,7 +21,6 @@ Abstract:
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <malloc.h>
 
 void
 PrintUsage (
diff --git a/Tools/Source/TianoTools/ZeroDebugData/build.xml b/Tools/Source/TianoTools/ZeroDebugData/build.xml
new file mode 100644
index 0000000000..3e00f7040f
--- /dev/null
+++ b/Tools/Source/TianoTools/ZeroDebugData/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK ZeroDebugData Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="ZeroDebugData"/>
+  <property name="FileSet" value="*.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <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="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        debug="false">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <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_exe}"/>
+    </delete>
+  </target>
+
+</project>
-- 
2.39.2