Porting several more tools to edk2.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@246 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c b/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
index e769b8835e3740c655b6f95d327c6c714ae3b249..055c187985a06451f35c11d7f7aaf2aa9bf5af77 100644 (file)
--- a/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
+++ b/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
@@ -23,7 +23,8 @@ Abstract:
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r

-#include "TianoCommon.h"\r
+#include "UefiBaseTypes.h"\r
+#include "Base.h"\r

 \r
 #define PROGRAM_NAME  "CreateMtFile"\r
 \r
 \r
 #define PROGRAM_NAME  "CreateMtFile"\r
 \r

diff --git a/Tools/Source/TianoTools/CreateMtFile/build.xml b/Tools/Source/TianoTools/CreateMtFile/build.xml
new file mode 100644 (file)
index 0000000..56cff1f
--- /dev/null
+++ b/Tools/Source/TianoTools/CreateMtFile/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK CreateMtFile Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="CreateMtFile"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c b/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
index db3e184e577fc8dbecd4ac0a709f00d7ebf4f233..5964eb544cbfc1febf6ab2f17ea4492979970b8d 100644 (file)
--- a/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
+++ b/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
@@ -25,7 +25,8 @@ Abstract:
 #include <ctype.h>\r
 #include <stdarg.h>\r
 #include <stdio.h>\r
 #include <ctype.h>\r
 #include <stdarg.h>\r
 #include <stdio.h>\r

-#include "TianoCommon.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r

 #include "EfiCompress.h"\r
 \r
 int\r
 #include "EfiCompress.h"\r
 \r
 int\r

diff --git a/Tools/Source/TianoTools/EfiCompress/build.xml b/Tools/Source/TianoTools/EfiCompress/build.xml
new file mode 100644 (file)
index 0000000..adf40d9
--- /dev/null
+++ b/Tools/Source/TianoTools/EfiCompress/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK EfiCompress Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="EfiCompress"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/EfiRom/EfiRom.c b/Tools/Source/TianoTools/EfiRom/EfiRom.c
index fc168ed14bbaa82bc55fc91f3912d6aed22f2e15..5fb99ab35d29a7cd95623efeac1e525a218c9c79 100644 (file)
--- 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\r
 // Includes for Tiano build\r
 //\r
 // #include "Compress.h"   // for compression function\r
 // Includes for Tiano build\r
 //\r

-#include "TianoCommon.h"\r
-#include "EfiImage.h" // for PE32 structure definitions\r
-#include "EfiCompress.h"\r
+#include <UefiBaseTypes.h>\r
+#include <EfiImage.h> // for PE32 structure definitions\r
+#include <EfiCompress.h>\r
+#include <CommonLib.h>\r
+#include <MultiPhase.h>\r

 \r
 //\r
 // END include differences\r
 //\r
 \r
 //\r
 // END include differences\r
 //\r

-#include "Pci22.h"  // for option ROM header structures\r
+#include "pci22.h"  // for option ROM header structures\r

 //\r
 // Version of this utility\r
 //\r
 //\r
 // Version of this utility\r
 //\r

diff --git a/Tools/Source/TianoTools/EfiRom/build.xml b/Tools/Source/TianoTools/EfiRom/build.xml
new file mode 100644 (file)
index 0000000..619e9fc
--- /dev/null
+++ b/Tools/Source/TianoTools/EfiRom/build.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK EfiRom Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="EfiRom"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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/IndustryStandard"/>\r
+      <includepath path="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/FlashMap/FlashDefFile.c b/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
index fa31863d475dca49a50afaed758ad3397202e116..a4de90136ee01795fa76b9db19b2c50deba1086a 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
+++ b/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
@@ -24,13 +24,16 @@ Abstract:
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r

+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r

 \r
 \r

-#include "Tiano.h"\r

 #include "EfiUtilityMsgs.h"\r
 #include "FlashDefFile.h"\r
 #include "SimpleFileParsing.h"\r
 #include "Symbols.h"\r
 #include "EfiUtilityMsgs.h"\r
 #include "FlashDefFile.h"\r
 #include "SimpleFileParsing.h"\r
 #include "Symbols.h"\r

-#include "EfiFirmwareVolumeHeader.h"\r
+// #include "EfiFirmwareVolumeHeader.h"\r
+#include "MultiPhase.h"\r
+#include "FirmwareVolumeHeader.h"\r

 \r
 //\r
 // #include "TrackMallocFree.h"\r
 \r
 //\r
 // #include "TrackMallocFree.h"\r

diff --git a/Tools/Source/TianoTools/FlashMap/FlashMap.c b/Tools/Source/TianoTools/FlashMap/FlashMap.c
index 86e26b6fc7c958ea8b0c813656ad9549679a5da4..ce20157795a0d03111186780fc0b6d75a45b7194 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/FlashMap.c
+++ b/Tools/Source/TianoTools/FlashMap/FlashMap.c
@@ -24,12 +24,8 @@ Abstract:
 #include <string.h>\r
 #include <stdlib.h>\r
 #include <ctype.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
 #include <ctype.h>\r

-\r
-#include "Tiano.h"\r
-\r
-#ifndef INT8\r
-#define INT8  char\r
-#endif\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r

 \r
 #include "EfiUtilityMsgs.h"\r
 #include "Microcode.h"\r
 \r
 #include "EfiUtilityMsgs.h"\r
 #include "Microcode.h"\r

diff --git a/Tools/Source/TianoTools/FlashMap/Microcode.c b/Tools/Source/TianoTools/FlashMap/Microcode.c
index 51ae20e9f51e60b7099498baff5915eb2354efb7..f5bea095e0e7211b923a8923f34d40cefb24f6c1 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/Microcode.c
+++ b/Tools/Source/TianoTools/FlashMap/Microcode.c
@@ -24,8 +24,6 @@ Abstract:
 #include <string.h> // for memset()\r
 #include <ctype.h>\r
 #include <stdlib.h> // for malloc()\r
 #include <string.h> // for memset()\r
 #include <ctype.h>\r
 #include <stdlib.h> // for malloc()\r

-#define INT8    char\r
-#define UINT32  unsigned int\r

 \r
 #include "EfiUtilityMsgs.h"\r
 #include "Microcode.h"\r
 \r
 #include "EfiUtilityMsgs.h"\r
 #include "Microcode.h"\r

diff --git a/Tools/Source/TianoTools/FlashMap/Symbols.c b/Tools/Source/TianoTools/FlashMap/Symbols.c
index 471128a6b6abbc13576a95947d869e2b4b433106..b83f1501805814f8141076ddf92d07631e0003a0 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/Symbols.c
+++ b/Tools/Source/TianoTools/FlashMap/Symbols.c
@@ -29,7 +29,10 @@ Abstract:
 //\r
 #include <ctype.h>\r
 \r
 //\r
 #include <ctype.h>\r
 \r

-#include "Tiano.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r
+#include <CommonLib.h>\r
+\r

 #include "EfiUtilityMsgs.h"\r
 #include "Symbols.h"\r
 \r
 #include "EfiUtilityMsgs.h"\r
 #include "Symbols.h"\r
 \r

diff --git a/Tools/Source/TianoTools/FlashMap/build.xml b/Tools/Source/TianoTools/FlashMap/build.xml
new file mode 100644 (file)
index 0000000..d2bfdd5
--- /dev/null
+++ b/Tools/Source/TianoTools/FlashMap/build.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK FlashMap Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="FlashMap"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <defineset>\r
+        <define name="_malloc" value="malloc"/>\r
+        <define name="_free" value="free"/>\r
+      </defineset>\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c b/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
index 6c1ec5f76b1ee9faafbabfb85e451defb558eae6..c0b914747de03e3ad12231aed62c71e2c5b11505 100644 (file)
--- a/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
+++ b/Tools/Source/TianoTools/GenAcpiTable/GenAcpiTable.c
@@ -23,8 +23,9 @@ Abstract:
 #include <string.h>\r
 #include <stdlib.h>\r
 \r
 #include <string.h>\r
 #include <stdlib.h>\r
 \r

-#include "Tiano.h"\r
-#include "TianoCommon.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r
+#include <CommonLib.h>\r

 #include "EfiImage.h" // for PE32 structure definitions\r
 #include "EfiUtilityMsgs.h"\r
 \r
 #include "EfiImage.h" // for PE32 structure definitions\r
 #include "EfiUtilityMsgs.h"\r
 \r

diff --git a/Tools/Source/TianoTools/GenAcpiTable/build.xml b/Tools/Source/TianoTools/GenAcpiTable/build.xml
new file mode 100644 (file)
index 0000000..b6f2427
--- /dev/null
+++ b/Tools/Source/TianoTools/GenAcpiTable/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK GenAcpiTable Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="GenAcpiTable"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c b/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
index 87195e735b1c3fa09acda6affcd9abd0377b2ce9..88944cc66484db52d136f96834900a6d9d062de1 100644 (file)
--- a/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/GenCapsuleHdr.c
@@ -28,11 +28,18 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r

-#include "Tiano.h"                  // need a guid definition\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r
+#include <CommonLib.h>\r
+\r

 #include "EfiUtilityMsgs.h"\r
 #include "EfiUtilityMsgs.h"\r

-#include "EfiCapsule.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
-#include "EfiFirmwareFileSystem.h"  // for FV header GUID\r
+#include "MultiPhase.h"\r
+#include "Capsule.h"\r
+#include "Guid/Capsule.h"\r
+#include "FirmwareVolumeImageFormat.h"\r
+#include "FirmwareVolumeHeader.h"\r
+#include "FirmwareFileSystem.h"  // for FV header GUID\r
+#include "Guid/FirmwareFileSystem.h"  // for FV header GUID\r

 #define MAX_PATH                  256\r
 #define PROGRAM_NAME              "GenCapsuleHdr"\r
 \r
 #define MAX_PATH                  256\r
 #define PROGRAM_NAME              "GenCapsuleHdr"\r
 \r

diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
new file mode 100644 (file)
index 0000000..8862307
--- /dev/null
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK GenCapsuleHdr Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="GenCapsuleHdr"/>\r
+  <property name="FileSet" value="GenCapsuleHdr.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/GenFdImage/GenFdImage.h b/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
index 68cfa8c5ffd20d3e27e5780e8fbb6aeffda52548..d9c268616775119c83b09017b1d742969df85efe 100644 (file)
--- a/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
+++ b/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
@@ -33,11 +33,10 @@ Abstract:
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r

-#include <io.h>\r
+// #include <io.h>\r

 #include <assert.h>\r
 #include <assert.h>\r

-#include "TianoCommon.h"\r

 #include "ParseInf.h"\r
 #include "ParseInf.h"\r

-#include "GenFvImage.h"\r
+// #include "GenFvImage.h"\r

 \r
 //\r
 // Defines\r
 \r
 //\r
 // Defines\r

diff --git a/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c b/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
index c7d9b8b9f11e89db9d7a87206ad9f5c743daf3a8..ff78aee18d433f3f2324967baf0d8d708199419a 100644 (file)
--- a/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
+++ b/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
@@ -26,11 +26,12 @@ Intel Corporation.
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r

-#include <io.h>\r
+// #include <io.h>\r

 #include <assert.h>\r
 #include <assert.h>\r

-#include "TianoCommon.h"\r
+#include "UefiBaseTypes.h"\r
+#include "Base.h"\r

 #include "GenFdImage.h"\r
 #include "GenFdImage.h"\r

-#include "GenFvImage.h"\r
+// #include "GenFvImage.h"\r

 #include "ParseInf.h"\r
 \r
 //\r
 #include "ParseInf.h"\r
 \r
 //\r

diff --git a/Tools/Source/TianoTools/GenTEImage/GenTEImage.c b/Tools/Source/TianoTools/GenTEImage/GenTEImage.c
index 8aef6d316e37ae9936412eb43a30ec57504d5a32..8313f9655bb3d06f38e09cd066c4fced38249d02 100644 (file)
--- a/Tools/Source/TianoTools/GenTEImage/GenTEImage.c
+++ b/Tools/Source/TianoTools/GenTEImage/GenTEImage.c
@@ -24,8 +24,10 @@ Abstract:
 #include <string.h>\r
 #include <stdlib.h>\r
 \r
 #include <string.h>\r
 #include <stdlib.h>\r
 \r

-#include "Tiano.h"\r
-#include "TianoCommon.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r
+#include <CommonLib.h>\r
+\r

 #include "EfiImage.h" // for PE32 structure definitions\r
 #include "EfiUtilityMsgs.h"\r
 \r
 #include "EfiImage.h" // for PE32 structure definitions\r
 #include "EfiUtilityMsgs.h"\r
 \r

diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/Source/TianoTools/GenTEImage/build.xml
new file mode 100644 (file)
index 0000000..c0e2c82
--- /dev/null
+++ b/Tools/Source/TianoTools/GenTEImage/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK GenTEImage Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="GenTEImage"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        optimize="speed">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
index 1845c48cbd8a0f50a197778f9393a1059cb3d584..e9511644a67f46dac7d3a0aa15ed8d09e0449040 100644 (file)
--- a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
+++ b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
@@ -22,18 +22,23 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include "PeiRebaseExe.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r

 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include "CommonLib.h"\r
 #include "ParseInf.h"\r
 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include "CommonLib.h"\r
 #include "ParseInf.h"\r

-#include EFI_GUID_DEFINITION (PeiPeCoffLoader)\r
+// #include <Guid/PeiPeCoffLoader.h>\r

 #include "FvLib.h"\r
 \r
 #include "EfiUtilityMsgs.h"\r
 #include "FvLib.h"\r
 \r
 #include "EfiUtilityMsgs.h"\r

+#include "FirmwareFileSystem.h"\r
+#include "PeCoffLib.h"\r
+\r
+#include "PeiRebaseExe.h"\r

 \r
 \r

-extern EFI_PEI_PE_COFF_LOADER_PROTOCOL  mPeCoffLoader;\r
+extern PEI_PE_COFF_LOADER_PROTOCOL  mPeCoffLoader;\r

 \r
 EFI_STATUS\r
 ReadHeader (\r
 \r
 EFI_STATUS\r
 ReadHeader (\r

diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
index 9070d1ce1fde3b143be5f5be882c5fe86eb6966e..b9e71f4ed985e542387cc5be6cffe623e70c6a33 100644 (file)
--- 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\r
 #define _EFI_PEIM_FIXUP_EXE_H\r
 \r
 #ifndef _EFI_PEIM_FIXUP_EXE_H\r
 #define _EFI_PEIM_FIXUP_EXE_H\r
 \r

-#include "Efi2WinNt.h"\r
-#include "EfiFirmwareFileSystem.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
+// #include "Efi2WinNt.h"\r
+#include "FirmwareFileSystem.h"\r
+#include "FirmwareVolumeHeader.h"\r
+#include "MultiPhase.h"\r

 \r
 //\r
 // Utility Name\r
 \r
 //\r
 // Utility Name\r

diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
index 2bed5bc547d09f26fe676695d569812c8fa13774..a41fc3af7bef33237fcb3e0d5365bc2ea37cea21 100644 (file)
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.h
@@ -25,11 +25,12 @@ Abstract:
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r

-#include "EfiCommon.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r

 #include "EfiImage.h"\r
 #include "EfiImage.h"\r

-#include "EfiImageFormat.h"\r
-#include "EfiFirmwareFileSystem.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
+#include <FirmwareVolumeImageFormat.h>\r
+#include "FirmwareFileSystem.h"\r
+#include "FirmwareVolumeHeader.h"\r

 #include "EfiUtilityMsgs.c"\r
 #include "CommonLib.h"\r
 \r
 #include "EfiUtilityMsgs.c"\r
 #include "CommonLib.h"\r
 \r

diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
new file mode 100644 (file)
index 0000000..3df9dcc
--- /dev/null
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK SecApResetVectorFixup Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="SecApResetVectorFixup"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/SecFixup/SecFixup.c b/Tools/Source/TianoTools/SecFixup/SecFixup.c
index a8e707fd16ef4625b77b7c636f335074f4714210..96faaf089a7a34d65d9d4af71e869b5ca5a35ccf 100644 (file)
--- a/Tools/Source/TianoTools/SecFixup/SecFixup.c
+++ b/Tools/Source/TianoTools/SecFixup/SecFixup.c
@@ -28,9 +28,10 @@ Abstract:
 \r
 #include <stdio.h>\r
 \r
 \r
 #include <stdio.h>\r
 \r

-#include "EfiCommon.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r

 #include "EfiImage.h"\r
 #include "EfiImage.h"\r

-#include "EfiImageFormat.h"\r
+#include "FirmwareVolumeImageFormat.h"\r

 #include "EfiUtilityMsgs.c"\r
 \r
 #include "SecFixup.h"\r
 #include "EfiUtilityMsgs.c"\r
 \r
 #include "SecFixup.h"\r

diff --git a/Tools/Source/TianoTools/SecFixup/build.xml b/Tools/Source/TianoTools/SecFixup/build.xml
new file mode 100644 (file)
index 0000000..2594fdd
--- /dev/null
+++ b/Tools/Source/TianoTools/SecFixup/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK SecFixup Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="SecFixup"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/SplitFile/build.xml b/Tools/Source/TianoTools/SplitFile/build.xml
new file mode 100644 (file)
index 0000000..51adc21
--- /dev/null
+++ b/Tools/Source/TianoTools/SplitFile/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK SplitFile Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="SplitFile"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/Strip/Strip.c b/Tools/Source/TianoTools/Strip/Strip.c
index 3fd6ad7d46cdc14053edf47a13c82c9724b4dd0a..567b526568751afaefe77b325291022c1f78e378 100644 (file)
--- a/Tools/Source/TianoTools/Strip/Strip.c
+++ b/Tools/Source/TianoTools/Strip/Strip.c
@@ -23,7 +23,6 @@ Abstract:
 #include <stdio.h>\r
 #include <memory.h>\r
 #include <string.h>\r
 #include <stdio.h>\r
 #include <memory.h>\r
 #include <string.h>\r

-#include <malloc.h>\r

 \r
 int\r
 main (\r
 \r
 int\r
 main (\r

diff --git a/Tools/Source/TianoTools/Strip/build.xml b/Tools/Source/TianoTools/Strip/build.xml
new file mode 100644 (file)
index 0000000..d63faeb
--- /dev/null
+++ b/Tools/Source/TianoTools/Strip/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK Strip Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="Strip"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r

diff --git a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c b/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
index 2f2003956adaf87d4bbf90fbeb87649dd5630dfb..0a7ce85d891630b2059d5ee39af386ece0713989 100644 (file)
--- a/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
+++ b/Tools/Source/TianoTools/ZeroDebugData/ZeroDebugData.c
@@ -21,7 +21,6 @@ Abstract:
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r

-#include <malloc.h>\r

 \r
 void\r
 PrintUsage (\r
 \r
 void\r
 PrintUsage (\r

diff --git a/Tools/Source/TianoTools/ZeroDebugData/build.xml b/Tools/Source/TianoTools/ZeroDebugData/build.xml
new file mode 100644 (file)
index 0000000..3e00f70
--- /dev/null
+++ b/Tools/Source/TianoTools/ZeroDebugData/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>\r
+<!--\r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+-->\r
+<project default="GenTool" basedir=".">\r
+<!--\r
+    EDK ZeroDebugData Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+  <property name="ToolName" value="ZeroDebugData"/>\r
+  <property name="FileSet" value="*.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" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
+\r
+  <target name="GenTool" depends="init, Tool">\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+  </target>\r
+\r
+  <target name="init">\r
+    <echo message="The EDK Tool: ${ToolName}"/>\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
+        <property name="ext_exe" value=".exe"/>\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
+  </target>\r
+\r
+  <target name="Tool" depends="init">\r
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
+        outfile="${BIN_DIR}/${ToolName}"\r
+        outtype="executable"\r
+        libtool="${haveLibtool}"\r
+        debug="false">\r
+\r
+      <fileset dir="${basedir}/${ToolName}" \r
+        includes="${FileSet}" \r
+        defaultexcludes="TRUE" \r
+        excludes="*.xml *.inf"/>\r
+\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="${PACKAGE_DIR}/Common"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+    </cc>\r
+  </target>\r
+\r
+  <target name="clean" depends="init">\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
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
+    <delete dir="${BUILD_DIR}">\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    </delete>\r
+  </target>\r
+\r
+</project>\r