1. Removed the unnecessary #include statements and include files

2. Removed the unnecessary library and include path from MSA files

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

diff --git a/Tools/Source/TianoTools/Common/CommonLib.h b/Tools/Source/TianoTools/Common/CommonLib.h
index 80cd8830245e2bdd7fb7a73147cbb722f47bc741..46f0cbace5645a9771ac4f818658c7975332cb8a 100644 (file)
--- a/Tools/Source/TianoTools/Common/CommonLib.h
+++ b/Tools/Source/TianoTools/Common/CommonLib.h
@@ -22,13 +22,7 @@ Abstract:
 #ifndef _EFI_COMMON_LIB_H\r
 #define _EFI_COMMON_LIB_H\r
 \r
 #ifndef _EFI_COMMON_LIB_H\r
 #define _EFI_COMMON_LIB_H\r
 \r

-/*\r
-#include "TianoCommon.h"\r
-#include "TianoCommon.h"\r
-#include "PeiHob.h"\r
-*/\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r

 \r
 #ifndef _MAX_PATH\r
 #define _MAX_PATH 500\r
 \r
 #ifndef _MAX_PATH\r
 #define _MAX_PATH 500\r

diff --git a/Tools/Source/TianoTools/Common/Crc32.h b/Tools/Source/TianoTools/Common/Crc32.h
index 0d24004fba578585188d3ac531e09578664742e6..ec48cdd4783f64b3fa30bbb672d0a708cede822b 100644 (file)
--- a/Tools/Source/TianoTools/Common/Crc32.h
+++ b/Tools/Source/TianoTools/Common/Crc32.h
@@ -19,22 +19,17 @@ Abstract:
   \r
 --*/\r
 \r
   \r
 --*/\r
 \r

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

 #ifndef _CRC32_H\r
 #define _CRC32_H\r
 #ifndef _CRC32_H\r
 #define _CRC32_H\r

+\r
+#include <Common/UefiBaseTypes.h>\r
+\r

 EFI_STATUS\r
 CalculateCrc32 (\r
   IN  UINT8                             *Data,\r
   IN  UINTN                             DataSize,\r
   IN OUT UINT32                         *CrcOut\r
   )\r
 EFI_STATUS\r
 CalculateCrc32 (\r
   IN  UINT8                             *Data,\r
   IN  UINTN                             DataSize,\r
   IN OUT UINT32                         *CrcOut\r
   )\r

-;\r
-\r

 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r


@@ -54,4 +49,6 @@ Returns:
   EFI_INVALID_PARAMETER     - Data / CrcOut = NULL, or DataSize = 0\r
 \r
 --*/\r
   EFI_INVALID_PARAMETER     - Data / CrcOut = NULL, or DataSize = 0\r
 \r
 --*/\r

+;\r
+\r

 #endif\r
 #endif\r

diff --git a/Tools/Source/TianoTools/Common/EfiCompress.c b/Tools/Source/TianoTools/Common/EfiCompress.c
index 0a60a46d4b9aa2af1f94c720635dd393bb8cc1c8..5b91b1d216df5f046b66660bb614e29289395d3f 100644 (file)
--- a/Tools/Source/TianoTools/Common/EfiCompress.c
+++ b/Tools/Source/TianoTools/Common/EfiCompress.c
@@ -23,9 +23,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-/*\r
-#include "TianoCommon.h"\r
-*/\r

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

diff --git a/Tools/Source/TianoTools/Common/EfiCompress.h b/Tools/Source/TianoTools/Common/EfiCompress.h
index a129f2cc33dcb6fa83af897f0a2c354344538498..6ad80e4742424333669e6a7d53ef9a1f7ccb9048 100644 (file)
--- a/Tools/Source/TianoTools/Common/EfiCompress.h
+++ b/Tools/Source/TianoTools/Common/EfiCompress.h
@@ -19,13 +19,14 @@ Abstract:
   \r
 --*/\r
 \r
   \r
 --*/\r
 \r

+#ifndef _EFICOMPRESS_H\r
+#define _EFICOMPRESS_H\r
+\r

 #include <string.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r

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

 \r
 \r

-#ifndef _EFICOMPRESS_H\r
-#define _EFICOMPRESS_H\r
+#include <Common/UefiBaseTypes.h>\r
+\r

 EFI_STATUS\r
 Compress (\r
   IN      UINT8   *SrcBuffer,\r
 EFI_STATUS\r
 Compress (\r
   IN      UINT8   *SrcBuffer,\r

diff --git a/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h b/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
index 4953e42b526969bbae632ae478177eab3f26b59c..af26b6f12aa1f6a83ff72e67abed104f27bec427 100644 (file)
--- a/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
+++ b/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
@@ -19,11 +19,11 @@ Abstract:
   \r
 --*/\r
 \r
   \r
 --*/\r
 \r

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

 #ifndef _EFICUSTOMIZEDCOMPRESS_H\r
 #define _EFICUSTOMIZEDCOMPRESS_H\r
 #ifndef _EFICUSTOMIZEDCOMPRESS_H\r
 #define _EFICUSTOMIZEDCOMPRESS_H\r

+\r
+#include <Common/UefiBaseTypes.h>\r
+\r

 EFI_STATUS\r
 SetCustomizedCompressionType (\r
   IN  CHAR8   *Type\r
 EFI_STATUS\r
 SetCustomizedCompressionType (\r
   IN  CHAR8   *Type\r

diff --git a/Tools/Source/TianoTools/Common/EfiDecompress.h b/Tools/Source/TianoTools/Common/EfiDecompress.h
index c5004a74a97dff8600123bbdf588484770a4921f..3f82ac687282358a15bb171ba4aff49687c66869 100644 (file)
--- a/Tools/Source/TianoTools/Common/EfiDecompress.h
+++ b/Tools/Source/TianoTools/Common/EfiDecompress.h
@@ -18,11 +18,12 @@ Abstract:
   Header file for compression routine\r
   \r
 --*/\r
   Header file for compression routine\r
   \r
 --*/\r

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

 \r
 #ifndef _EFI_DECOMPRESS_H\r
 #define _EFI_DECOMPRESS_H\r
 \r
 #ifndef _EFI_DECOMPRESS_H\r
 #define _EFI_DECOMPRESS_H\r

+\r
+#include <Common/UefiBaseTypes.h>\r
+\r

 EFI_STATUS\r
 GetInfo (\r
   IN      VOID    *Source,\r
 EFI_STATUS\r
 GetInfo (\r
   IN      VOID    *Source,\r

diff --git a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
index 6312c17250b5dacfe9d4b751fc17aec541270c52..566d214cabedc8c599fdcb873da623739ecad573 100644 (file)
--- a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
+++ b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
@@ -25,9 +25,6 @@ Abstract:
 #include <ctype.h>\r
 #include <stdarg.h>\r
 \r
 #include <ctype.h>\r
 #include <stdarg.h>\r
 \r

-/*\r
-#include "Tiano.h"\r
-*/\r

 #include "EfiUtilityMsgs.h"\r
 \r
 #define MAX_LINE_LEN  200\r
 #include "EfiUtilityMsgs.h"\r
 \r
 #define MAX_LINE_LEN  200\r

diff --git a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
index 777cacf7717c147d9dbd13c64fe5076e30ce946c..a76b822675be7dc6c42723ec1b390d6b012dbea4 100644 (file)
--- a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
+++ b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
@@ -19,12 +19,11 @@ Abstract:
   \r
 --*/\r
 \r
   \r
 --*/\r
 \r

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

 #ifndef _EFI_UTILITY_MSGS_H_\r
 #define _EFI_UTILITY_MSGS_H_\r
 \r
 #ifndef _EFI_UTILITY_MSGS_H_\r
 #define _EFI_UTILITY_MSGS_H_\r
 \r

+#include <Common/UefiBaseTypes.h>\r
+\r

 //\r
 // Status codes returned by EFI utility programs and functions\r
 //\r
 //\r
 // Status codes returned by EFI utility programs and functions\r
 //\r

diff --git a/Tools/Source/TianoTools/Common/FvLib.c b/Tools/Source/TianoTools/Common/FvLib.c
index 9bfd84346d0ccb6f68f7374153cd3d723fcfeace..e8d62791f31251fe831b3a62877eb8209ca99efd 100644 (file)
--- a/Tools/Source/TianoTools/Common/FvLib.c
+++ b/Tools/Source/TianoTools/Common/FvLib.c
@@ -25,14 +25,6 @@ Abstract:
 #include "FvLib.h"\r
 #include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r
 #include "FvLib.h"\r
 #include "CommonLib.h"\r
 #include "EfiUtilityMsgs.h"\r

-#include "MultiPhase.h"\r
-/*\r
-#include <CommonBuild.h>\r
-*/\r
-\r
-/*\r
-#include EFI_GUID_DEFINITION (FirmwareFileSystem)\r
-*/\r

 \r
 //\r
 // Module global variables\r
 \r
 //\r
 // Module global variables\r

diff --git a/Tools/Source/TianoTools/Common/FvLib.h b/Tools/Source/TianoTools/Common/FvLib.h
index 4a10a3d364722ea5e4d825a1a572930698ede52e..1ad1e812dd67086710a1d4587b7b4e85374d19fb 100644 (file)
--- a/Tools/Source/TianoTools/Common/FvLib.h
+++ b/Tools/Source/TianoTools/Common/FvLib.h
@@ -25,18 +25,14 @@ Abstract:
 //\r
 // Include files\r
 //\r
 //\r
 // Include files\r
 //\r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <string.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r

 #include <Common/EfiImage.h>\r
 #include <Common/FirmwareVolumeImageFormat.h>\r
 #include <Common/FirmwareFileSystem.h>\r
 #include <Common/FirmwareVolumeHeader.h>\r
 #include <Common/EfiImage.h>\r
 #include <Common/FirmwareVolumeImageFormat.h>\r
 #include <Common/FirmwareFileSystem.h>\r
 #include <Common/FirmwareVolumeHeader.h>\r

-/*\r
-#include "TianoCommon.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
-#include "EfiFirmwareFileSystem.h"\r
-*/\r
-#include <string.h>\r
+#include <Common/MultiPhase.h>\r

 \r
 EFI_STATUS\r
 InitializeFvLib (\r
 \r
 EFI_STATUS\r
 InitializeFvLib (\r

diff --git a/Tools/Source/TianoTools/Common/MyAlloc.h b/Tools/Source/TianoTools/Common/MyAlloc.h
index d766682ea1bffafef15837d07ef9c1be53596cb1..9697012d7d7fb437b61fe21eb5eb0b92883e9d63 100644 (file)
--- a/Tools/Source/TianoTools/Common/MyAlloc.h
+++ b/Tools/Source/TianoTools/Common/MyAlloc.h
@@ -25,11 +25,8 @@ 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 <Base.h>\r

 \r
 \r

-/*\r
-#include "Tiano.h"\r
-*/\r
+#include <Common/BaseTypes.h>\r

 \r
 //\r
 // Default operation is to use the memory allocation tracking functions.\r
 \r
 //\r
 // Default operation is to use the memory allocation tracking functions.\r

diff --git a/Tools/Source/TianoTools/Common/ParseInf.c b/Tools/Source/TianoTools/Common/ParseInf.c
index 989add7e9c0b0802cdcbf0990a8c9fcfdf9e0ef4..de0ffd85c7c7a10fc480bb5bd4e103808a702393 100644 (file)
--- a/Tools/Source/TianoTools/Common/ParseInf.c
+++ b/Tools/Source/TianoTools/Common/ParseInf.c
@@ -19,11 +19,11 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include "ParseInf.h"\r

 #include <assert.h>\r
 #include <string.h>\r
 #include <ctype.h>\r
 #include <stdlib.h>\r
 #include <assert.h>\r
 #include <string.h>\r
 #include <ctype.h>\r
 #include <stdlib.h>\r

+#include "ParseInf.h"\r

 \r
 #ifndef _MAX_PATH\r
 #define _MAX_PATH 500\r
 \r
 #ifndef _MAX_PATH\r
 #define _MAX_PATH 500\r

diff --git a/Tools/Source/TianoTools/Common/ParseInf.h b/Tools/Source/TianoTools/Common/ParseInf.h
index 5691e531943e075788561e4b312ae612226eea73..ae10b6f63139c85fdbafe1e7c2193af5940cfefe 100644 (file)
--- a/Tools/Source/TianoTools/Common/ParseInf.h
+++ b/Tools/Source/TianoTools/Common/ParseInf.h
@@ -22,11 +22,10 @@ Abstract:
 #ifndef _EFI_PARSE_INF_H\r
 #define _EFI_PARSE_INF_H\r
 \r
 #ifndef _EFI_PARSE_INF_H\r
 #define _EFI_PARSE_INF_H\r
 \r

-/* #include "TianoCommon.h" */\r
-#include <Base.h>\r

 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r

-#include <UefiBaseTypes.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r

 \r
 //\r
 // Common data structures\r
 \r
 //\r
 // Common data structures\r

diff --git a/Tools/Source/TianoTools/Common/SimpleFileParsing.c b/Tools/Source/TianoTools/Common/SimpleFileParsing.c
index 3ee3349d1a8af292ea6e0ee0f61385b2899f364e..73b74cd0ffd92aa5bbc08346a5a6b05fb6c7711a 100644 (file)
--- a/Tools/Source/TianoTools/Common/SimpleFileParsing.c
+++ b/Tools/Source/TianoTools/Common/SimpleFileParsing.c
@@ -24,9 +24,6 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r

-/*\r
-#include "Tiano.h"\r
-*/\r

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

diff --git a/Tools/Source/TianoTools/Common/SimpleFileParsing.h b/Tools/Source/TianoTools/Common/SimpleFileParsing.h
index ea1f5a0adce4393a3d30382c50a013ee298f1c85..7cf25a6bf8d0e84b556a10fc47be341478a5a6d6 100644 (file)
--- a/Tools/Source/TianoTools/Common/SimpleFileParsing.h
+++ b/Tools/Source/TianoTools/Common/SimpleFileParsing.h
@@ -19,12 +19,11 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #ifndef _SIMPLE_FILE_PARSING_H_\r
 #define _SIMPLE_FILE_PARSING_H_\r
 \r
 #ifndef _SIMPLE_FILE_PARSING_H_\r
 #define _SIMPLE_FILE_PARSING_H_\r
 \r

+#include <Common/UefiBaseTypes.h>\r
+\r

 #define T_CHAR  char\r
 \r
 STATUS\r
 #define T_CHAR  char\r
 \r
 STATUS\r

diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml
index 56535944a047ec9b2ea522b4e754839c3f3fce57..749df92bcaf235c148bef58755cc9c61fe5893b7 100644 (file)
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -60,20 +60,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r

-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\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_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r

-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="ToolsLibrary" depends="init">\r
   </target>\r
 \r
   <target name="ToolsLibrary" depends="init">\r


@@ -83,7 +83,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         optimize="speed">\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
         optimize="speed">\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <fileset dir="${basedir}/Common" \r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <fileset dir="${basedir}/Common" \r

diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.c b/Tools/Source/TianoTools/CompressDll/CompressDll.c
index 783587f6540c09fdf37d13dfa39aae7d13a7303a..dd0e209dcc40c677f8102e094d225c803e46faad 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/CompressDll.c
+++ b/Tools/Source/TianoTools/CompressDll/CompressDll.c
@@ -32,14 +32,14 @@ JNIEXPORT jbyteArray JNICALL  Java_org_tianocore_framework_tasks_Compress_CallCo
    //\r
 \r
    Result = Compress (\r
    //\r
 \r
    Result = Compress (\r

-                         (char*) InputBuffer, \r
-                         SourceSize,  \r
-                         DestBuffer,\r
-                         &DestSize\r
-                         );\r
+        (char*) InputBuffer, \r
+        SourceSize,  \r
+        DestBuffer,\r
+        &DestSize\r
+        );\r

 \r
    if (Result = EFI_BUFFER_TOO_SMALL) {\r
 \r
    if (Result = EFI_BUFFER_TOO_SMALL) {\r

-          DestBuffer = malloc (DestSize);\r
+     DestBuffer = malloc (DestSize);\r

    }\r
 \r
    //\r
    }\r
 \r
    //\r


@@ -47,10 +47,10 @@ JNIEXPORT jbyteArray JNICALL  Java_org_tianocore_framework_tasks_Compress_CallCo
    //\r
    Result = Compress(\r
               (char*) InputBuffer, \r
    //\r
    Result = Compress(\r
               (char*) InputBuffer, \r

-                         SourceSize,  \r
-                         DestBuffer,\r
-                         &DestSize  \r
-          );\r
+        SourceSize,  \r
+        DestBuffer,\r
+        &DestSize  \r
+     );\r

 \r
    //\r
    // new a MV array to store the return compressed buffer\r
 \r
    //\r
    // new a MV array to store the return compressed buffer\r


@@ -80,7 +80,7 @@ DllMainCRTStartup(
     void*   Reserved    \r
 )\r
 {\r
     void*   Reserved    \r
 )\r
 {\r

-       return TRUE;\r
+  return TRUE;\r

 }\r
 #else\r
 #ifdef __GNUC__\r
 }\r
 #else\r
 #ifdef __GNUC__\r

diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index c3af125d1bc4ee5c237795ec2bbd4195abd2281c..93873c9932d6c8ce339f16fb8e886592e2f40783 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -10,22 +10,29 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
 <project default="GenTool" basedir=".">\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
 <project default="GenTool" basedir=".">\r

-  <!--EDK GenDepex Tool\r
-  Copyright (c) 2006, Intel Corporation-->\r
+<!--\r
+    EDK GenDepex Tool\r
+  Copyright (c) 2006, Intel Corporation\r
+-->\r
+\r

   <property environment="env"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="ToolName" value="CompressDll"/>\r
   <property name="LibName" value="CompressDll"/>\r
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>\r
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>\r
   <property environment="env"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <property name="ToolName" value="CompressDll"/>\r
   <property name="LibName" value="CompressDll"/>\r
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>\r
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>\r

+\r

   <taskdef resource="cpptasks.tasks"/>\r
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <taskdef resource="cpptasks.tasks"/>\r
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r

+\r

   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>\r

+\r

   <target name="GenTool" depends="init,Lib" >\r
     <echo message="Building the EDK Tool: ${ToolName}"/>\r
   </target>\r
   <target name="GenTool" depends="init,Lib" >\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
   <target name="init">\r
     <echo message="The EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r


@@ -83,7 +90,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
       <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
       <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r


@@ -94,12 +100,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\r
   </target>\r
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\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
   <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
   <target name="cleanall" depends="init">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>\r
     <delete dir="${BUILD_DIR}">\r

diff --git a/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c b/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
index 055c187985a06451f35c11d7f7aaf2aa9bf5af77..d0718fa3765e8ca78e23879e88d867341418bc75 100644 (file)
--- a/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
+++ b/Tools/Source/TianoTools/CreateMtFile/CreateMtFile.c
@@ -23,8 +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 "UefiBaseTypes.h"\r
-#include "Base.h"\r
+\r
+#include <Common/UefiBaseTypes.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
index 8d96e394b8139b87846142f1525c6a96ae69f7e4..337c255f05128418257bd381721ebf38a6470333 100644 (file)
--- a/Tools/Source/TianoTools/CreateMtFile/build.xml
+++ b/Tools/Source/TianoTools/CreateMtFile/build.xml
@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c b/Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c
index ca0ea17ce6ead8fa741f0cd7edd3cf8e8bc1a051..0dc66128c9792d278dcc49e9fec58f009d89ebbb 100644 (file)
--- a/Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c
+++ b/Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c
@@ -19,8 +19,7 @@ Abstract:
   \r
 --*/\r
 \r
   \r
 --*/\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r

 \r
 EFI_STATUS\r
 SetCustomizedCompressionType (\r
 \r
 EFI_STATUS\r
 SetCustomizedCompressionType (\r

diff --git a/Tools/Source/TianoTools/CustomizedCompress/build.xml b/Tools/Source/TianoTools/CustomizedCompress/build.xml
index 07e55950d5d976bb6a0254c336fb898918b0cdd5..21be49a5c62a4eb5809808bb683b91c702142457 100644 (file)
--- a/Tools/Source/TianoTools/CustomizedCompress/build.xml
+++ b/Tools/Source/TianoTools/CustomizedCompress/build.xml
@@ -59,23 +59,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <property name="HOST_ARCH" value="IA32" />\r
-               <ToolChainSetup confPath="${WORKSPACE}/Tools/Conf" />\r
-    <echo message="Compiler: ${CC}"/>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+\r
+    <echo message="ToolChain: ${ToolChain}"/>\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_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r

-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\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_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r

-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="ToolsLibrary" depends="init">\r
   </target>\r
 \r
   <target name="ToolsLibrary" depends="init">\r


@@ -91,7 +90,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
     </cc>\r
     <if>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
     </cc>\r
     <if>\r

diff --git a/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c b/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
index 5964eb544cbfc1febf6ab2f17ea4492979970b8d..8655545192ea1757b03a6e366eac2d35977d9e63 100644 (file)
--- a/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
+++ b/Tools/Source/TianoTools/EfiCompress/EfiCompressMain.c
@@ -25,8 +25,9 @@ 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 <UefiBaseTypes.h>\r
-#include <Base.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+\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
index b8bf7f54152b91985a48d47eb663bf45e30cd59f..f582b7bc29b9cafb100d32bc5a4adcc167f8c6c0 100644 (file)
--- a/Tools/Source/TianoTools/EfiCompress/build.xml
+++ b/Tools/Source/TianoTools/EfiCompress/build.xml
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/EfiRom/EfiRom.c b/Tools/Source/TianoTools/EfiRom/EfiRom.c
index 5fb99ab35d29a7cd95623efeac1e525a218c9c79..235084caf2bf2d2c88eb7c00549e1c02a6ac0812 100644 (file)
--- a/Tools/Source/TianoTools/EfiRom/EfiRom.c
+++ b/Tools/Source/TianoTools/EfiRom/EfiRom.c
@@ -25,24 +25,15 @@ Abstract:
 #include <string.h>\r
 #include <stdlib.h>\r
 \r
 #include <string.h>\r
 #include <stdlib.h>\r
 \r

-//\r
-// Includes for EFI 1.1 build\r
-//\r
-// #include "Tiano.h"        // required defines for Compress.h\r
-// #include "EfiImage.h"   // for PE32 structure definitions\r
-// #include "Compress.h"   // for compression function\r
-// Includes for Tiano build\r
-//\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
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>  // for PE32 structure definitions\r
+#include <Common/MultiPhase.h>\r
+\r
+#include <IndustryStandard/pci22.h>  // for option ROM header structures\r
+\r
+#include "EfiCompress.h"\r
+#include "CommonLib.h"\r

 \r
 \r

-//\r
-// END include differences\r
-//\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
index 956614fcab52b9500433b4bd3e9c6a6b21772369..ee07603e8c38a8da34c71a000216a38b37bee625 100644 (file)
--- a/Tools/Source/TianoTools/EfiRom/build.xml
+++ b/Tools/Source/TianoTools/EfiRom/build.xml
@@ -93,11 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/IndustryStandard"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/FlashMap/FlashDefFile.c b/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
index a4de90136ee01795fa76b9db19b2c50deba1086a..561c2d7f6f0d47ae09645fde7ed485f4727e2be3 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
+++ b/Tools/Source/TianoTools/FlashMap/FlashDefFile.c
@@ -24,16 +24,15 @@ 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
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/MultiPhase.h>\r

 \r
 #include "EfiUtilityMsgs.h"\r
 #include "FlashDefFile.h"\r
 #include "SimpleFileParsing.h"\r
 #include "Symbols.h"\r
 \r
 #include "EfiUtilityMsgs.h"\r
 #include "FlashDefFile.h"\r
 #include "SimpleFileParsing.h"\r
 #include "Symbols.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 ce20157795a0d03111186780fc0b6d75a45b7194..bf07c2df220aa901f1ba98de0c47a8552d684240 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/FlashMap.c
+++ b/Tools/Source/TianoTools/FlashMap/FlashMap.c
@@ -24,8 +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

-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
+\r
+#include <Common/UefiBaseTypes.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/Symbols.c b/Tools/Source/TianoTools/FlashMap/Symbols.c
index b83f1501805814f8141076ddf92d07631e0003a0..347cb8919d200c93163508091e65538e0a8be4ea 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/Symbols.c
+++ b/Tools/Source/TianoTools/FlashMap/Symbols.c
@@ -29,10 +29,9 @@ Abstract:
 //\r
 #include <ctype.h>\r
 \r
 //\r
 #include <ctype.h>\r
 \r

-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r

 \r
 \r

+#include "CommonLib.h"\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
index 169ca6bc6862d2e4b2d79f92a4e69021c1be5bab..7b2ac0ce8fa2e693e8842147032cae4634833a0e 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/build.xml
+++ b/Tools/Source/TianoTools/FlashMap/build.xml
@@ -98,10 +98,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/FwImage/build.xml b/Tools/Source/TianoTools/FwImage/build.xml
index dc493855ab4a7597a351b3c1aced2df3965bd116..6bccbd2d5ac8a8b50dace11f0b9037c4be095358 100644 (file)
--- a/Tools/Source/TianoTools/FwImage/build.xml
+++ b/Tools/Source/TianoTools/FwImage/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init">\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r


@@ -91,10 +91,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/FwImage/fwimage.c b/Tools/Source/TianoTools/FwImage/fwimage.c
index e2e0d49b9f4b711d6789d4cbd98ee42cfb9615da..b8fd1e1c33e80f78a98e91215004c34a60da3128 100644 (file)
--- a/Tools/Source/TianoTools/FwImage/fwimage.c
+++ b/Tools/Source/TianoTools/FwImage/fwimage.c
@@ -19,7 +19,8 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include <WinNtInclude.h>\r
+#include "WinNtInclude.h"\r
+\r

 #ifndef __GNUC__\r
 #include <windows.h>\r
 #endif\r
 #ifndef __GNUC__\r
 #include <windows.h>\r
 #endif\r


@@ -28,11 +29,11 @@ Abstract:
 #include <string.h>\r
 #include <time.h>\r
 \r
 #include <string.h>\r
 #include <time.h>\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <CommonLib.h>\r
-#include <EfiImage.h>\r
-#include <EfiUtilityMsgs.c>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
+\r
+#include "CommonLib.h"\r
+#include "EfiUtilityMsgs.c"\r

 \r
 #define UTILITY_NAME  "FwImage"\r
 \r
 \r
 #define UTILITY_NAME  "FwImage"\r
 \r

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

-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
-#include "EfiImage.h" // for PE32 structure definitions\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h> // for PE32 structure definitions\r
+\r
+#include "CommonLib.h"\r

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

diff --git a/Tools/Source/TianoTools/GenAcpiTable/build.xml b/Tools/Source/TianoTools/GenAcpiTable/build.xml
index c5179bfe20ac58ee6f24d3a26651cddbd59e269f..31ad365723a4903f349cd84adec86310457b2f05 100644 (file)
--- a/Tools/Source/TianoTools/GenAcpiTable/build.xml
+++ b/Tools/Source/TianoTools/GenAcpiTable/build.xml
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h b/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h
index 574231d093a143de69944d7a4b36bd450b9084c0..1cf976b065455227a42ca203689d6d0c05ba94ec 100644 (file)
--- a/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h
+++ b/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h
@@ -31,8 +31,7 @@ Abstract:
 #include <assert.h>\r
 \r
 /* MDE Headers */\r
 #include <assert.h>\r
 \r
 /* MDE Headers */\r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r

 #include <Common/EfiImage.h>\r
 #include <Common/FirmwareVolumeImageFormat.h>\r
 #include <Common/FirmwareFileSystem.h>\r
 #include <Common/EfiImage.h>\r
 #include <Common/FirmwareVolumeImageFormat.h>\r
 #include <Common/FirmwareFileSystem.h>\r


@@ -40,11 +39,11 @@ Abstract:
 #include <Protocol/GuidedSectionExtraction.h>\r
 \r
 /* Tool Headers */\r
 #include <Protocol/GuidedSectionExtraction.h>\r
 \r
 /* Tool Headers */\r

-#include <CommonLib.h>\r
-#include <Crc32.h>\r
-#include <EfiCompress.h>\r
-#include <EfiUtilityMsgs.h>\r
-#include <ParseInf.h>\r
+#include "CommonLib.h"\r
+#include "Crc32.h"\r
+#include "EfiCompress.h"\r
+#include "EfiUtilityMsgs.h"\r
+#include "ParseInf.h"\r

 \r
 //\r
 // Module Coded to Tiano Coding Conventions\r
 \r
 //\r
 // Module Coded to Tiano Coding Conventions\r

diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.xml b/Tools/Source/TianoTools/GenCRC32Section/build.xml
index c581605352c9c4bd8b2f7bc4cafde6428d5966e0..5b61b6d62e807ef98c3421260622a8b1be1b2d11 100644 (file)
--- a/Tools/Source/TianoTools/GenCRC32Section/build.xml
+++ b/Tools/Source/TianoTools/GenCRC32Section/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init">\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r


@@ -89,10 +89,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         includes="${FileSet}"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
         includes="${FileSet}"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

 \r
     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r

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

-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
-\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/Capsule.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/FirmwareFileSystem.h>  // for FV header GUID\r
+#include <Guid/Capsule.h>\r
+#include <Guid/FirmwareFileSystem.h>  // for FV header GUID\r
+\r
+#include "CommonLib.h"\r

 #include "EfiUtilityMsgs.h"\r
 #include "EfiUtilityMsgs.h"\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
+\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
index b8265154029b07a3534b00ac0697552261b3203b..d05ab1983cb45d33b1566abd5b72406703cd417b 100644 (file)
--- a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/GenDepex/GenDepex.c b/Tools/Source/TianoTools/GenDepex/GenDepex.c
index 608e27ecb50290ec8d5cff37bcb6bc192ac9b466..34857fccf16c672674dc980eabbe625d4029f545 100644 (file)
--- a/Tools/Source/TianoTools/GenDepex/GenDepex.c
+++ b/Tools/Source/TianoTools/GenDepex/GenDepex.c
@@ -728,11 +728,11 @@ Returns:
         Ptrx++;\r
       }\r
 \r
         Ptrx++;\r
       }\r
 \r

-         Ptrx++;\r
+    Ptrx++;\r

       while (*Ptrx != '}') {\r
         Ptrx++;\r
       }\r
       while (*Ptrx != '}') {\r
         Ptrx++;\r
       }\r

-         //\r
+    //\r

       // Absorb the closing }\r
       //\r
       Ptrx++;\r
       // Absorb the closing }\r
       //\r
       Ptrx++;\r

diff --git a/Tools/Source/TianoTools/GenDepex/GenDepex.h b/Tools/Source/TianoTools/GenDepex/GenDepex.h
index cfba0f2011d758411151003f5859a4e3dd675036..b198156baa7d7a65875e6bb70b9ecee7ccd760ce 100644 (file)
--- a/Tools/Source/TianoTools/GenDepex/GenDepex.h
+++ b/Tools/Source/TianoTools/GenDepex/GenDepex.h
@@ -30,9 +30,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __GNUC__\r
 #include <malloc.h>\r
 #endif\r
 #ifndef __GNUC__\r
 #include <malloc.h>\r
 #endif\r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <Dependency.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/Dependency.h>\r

 \r
 #define DEPENDENCY_START            "DEPENDENCY_START"\r
 #define OPERATOR_BEFORE             "BEFORE"\r
 \r
 #define DEPENDENCY_START            "DEPENDENCY_START"\r
 #define OPERATOR_BEFORE             "BEFORE"\r

diff --git a/Tools/Source/TianoTools/GenDepex/build.xml b/Tools/Source/TianoTools/GenDepex/build.xml
index 4cccca4f35361669ef9b579f49333a7da2efd740..dd6cd595094296f1678662ccbd649293116c78c0 100644 (file)
--- a/Tools/Source/TianoTools/GenDepex/build.xml
+++ b/Tools/Source/TianoTools/GenDepex/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init">\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r


@@ -90,12 +90,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         includes="${FileSet}" />\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
         includes="${FileSet}" />\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
     </cc>\r

-       </target>\r
+  </target>\r

 \r
   <target name="clean" depends="init">\r
     <echo message="Removing Intermediate Files Only"/>  \r
 \r
   <target name="clean" depends="init">\r
     <echo message="Removing Intermediate Files Only"/>  \r

diff --git a/Tools/Source/TianoTools/GenFdImage/GenFdImage.h b/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
index d9c268616775119c83b09017b1d742969df85efe..a2c1afb711c0f66204435e542b8f9a180004583b 100644 (file)
--- a/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
+++ b/Tools/Source/TianoTools/GenFdImage/GenFdImage.h
@@ -33,10 +33,9 @@ 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 <assert.h>\r
 #include <assert.h>\r

+\r

 #include "ParseInf.h"\r
 #include "ParseInf.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 ff78aee18d433f3f2324967baf0d8d708199419a..057c1088e870ec3966a78a9a26872c90055c0fb6 100644 (file)
--- a/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
+++ b/Tools/Source/TianoTools/GenFdImage/GenFdImageDll.c
@@ -26,12 +26,11 @@ 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 <assert.h>\r
 #include <assert.h>\r

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

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

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

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

diff --git a/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c b/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c
index 0e93a47cc91bc6e19ba55180ebae2e11d7b3fb5a..1eea09f5fbd268baeb58cd9608cbb51fb0563c07 100644 (file)
--- a/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c
+++ b/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c
@@ -20,17 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include "Base.h"\r
-#include "UefiBaseTypes.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "FirmwareFileSystem.h"\r
-#include "FirmwareVolumeHeader.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "ParseInf.h"\r
-#include "EfiCompress.h"\r
-#include "EfiCustomizedCompress.h"\r
-#include "Crc32.h"\r
-#include "GenFfsFile.h"\r

 #include <stdio.h>\r
 #include <ctype.h>  // for isalpha()\r
 //\r
 #include <stdio.h>\r
 #include <ctype.h>  // for isalpha()\r
 //\r


@@ -41,6 +30,18 @@ Abstract:
 #endif\r
 #include <stdlib.h>\r
 #include <string.h>\r
 #endif\r
 #include <stdlib.h>\r
 #include <string.h>\r

+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+\r
+#include "ParseInf.h"\r
+#include "EfiCompress.h"\r
+#include "EfiCustomizedCompress.h"\r
+#include "Crc32.h"\r
+#include "GenFfsFile.h"\r

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

diff --git a/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h b/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h
index 695809ce4373afd215b32eb5de48e1a67a834db4..f5bc71871661b61dafccdce5d39abf7a47d6c753 100644 (file)
--- a/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h
+++ b/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h
@@ -28,9 +28,9 @@ Abstract:
 //\r
 // External Files Referenced\r
 //\r
 //\r
 // External Files Referenced\r
 //\r

-#include "Base.h"\r
-#include "UefiBaseTypes.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+\r

 #include "MyAlloc.h"\r
 \r
 #endif\r
 #include "MyAlloc.h"\r
 \r
 #endif\r

diff --git a/Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c b/Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c
index d3933db420ea8414a0ac50ba3aae1a5d23e0423e..5fa5a22096e1115e27bb725fe7e7f24b52cb61a4 100644 (file)
--- a/Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c
+++ b/Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c
@@ -24,8 +24,8 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r

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

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

diff --git a/Tools/Source/TianoTools/GenFfsFile/build.xml b/Tools/Source/TianoTools/GenFfsFile/build.xml
index 595523342544108fcc1d4ea92f165b11547c76c6..ccf34c82cd5793ba5cfa751ba4fa3b343cf65a4f 100644 (file)
--- a/Tools/Source/TianoTools/GenFfsFile/build.xml
+++ b/Tools/Source/TianoTools/GenFfsFile/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init">\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r


@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
index 6cc5a0d56fd6357d9ec5291cd69a9420cdfddc5d..379818b7edfab3052ea7fb41ecf13a6cd5e2205e 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
@@ -23,8 +23,6 @@ Abstract:
 //\r
 // Include files\r
 //\r
 //\r
 // Include files\r
 //\r

-#define EFI_SPECIFICATION_VERSION 0x00020000\r
-#define EDK_RELEASE_VERSION       0x00020000\r

 #ifdef __GNUC__\r
 #include <uuid/uuid.h>\r
 #include <sys/stat.h>\r
 #ifdef __GNUC__\r
 #include <uuid/uuid.h>\r
 #include <sys/stat.h>\r


@@ -34,19 +32,21 @@ Abstract:
 #include <io.h>\r
 #endif\r
 #include <assert.h>\r
 #include <io.h>\r
 #endif\r
 #include <assert.h>\r

-#include <Dxe.h>\r
-#include <Library/PeCoffLib.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/Variable.h>\r
+#include <Common/WorkingBlockHeader.h>\r
+#include <Guid/FirmwareFileSystem.h>\r
+\r

 #include "GenFvImageLib.h"\r
 #include "GenFvImageLibInternal.h"\r
 #include "GenFvImageLib.h"\r
 #include "GenFvImageLibInternal.h"\r

-#include <CommonLib.h>\r
-#include <FirmwareVolumeImageFormat.h>\r
-#include <Crc32.h>\r
-#include <EfiUtilityMsgs.h>\r
-#include <FvLib.h>\r
-#include <EfiCompress.h>\r
-#include <Variable.h>\r
-#include <WinNtInclude.h>\r
-#include <WorkingBlockHeader.h>\r
+#include "CommonLib.h"\r
+#include "Crc32.h"\r
+#include "EfiUtilityMsgs.h"\r
+#include "FvLib.h"\r
+#include "EfiCompress.h"\r
+#include "WinNtInclude.h"\r

 \r
 \r
 //\r
 \r
 \r
 //\r

diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
index cc761b8e5a2d868e5720c79e30df3b825cb29394..47a5a3b1b2e6991fffac6bde57a61324f4b0d8fe 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
@@ -26,7 +26,9 @@ Abstract:
 //\r
 // Include files\r
 //\r
 //\r
 // Include files\r
 //\r

-// #include "Efi2WinNT.h"\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+\r

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

diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h b/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
index f38fe1151a8fffe0fc664bd9ec5ff6fb710ef02f..cff3b1aea46b5e37cba645d94862d8a932e89475 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
@@ -26,10 +26,12 @@ Abstract:
 //\r
 // Include files\r
 //\r
 //\r
 // Include files\r
 //\r

-#include "GenFvImageLib.h"\r

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

-#include <CommonLib.h>\r
-#include "FirmwareVolumeHeader.h"\r
+\r
+#include <Common/FirmwareVolumeHeader.h>\r
+\r
+#include "CommonLib.h"\r
+#include "GenFvImageLib.h"\r

 \r
 //\r
 // Private data declarations\r
 \r
 //\r
 // Private data declarations\r

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index cc2141d3bb8c5a8351f8a4fa1bb1c4c3b3f42093..15fbf7cb35d0b4cd5753cf21cf5a5d1168665b2d 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -123,14 +123,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/ToBeRemoved"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
+\r

       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
       <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r
       <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
       <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
       <syslibset libs="RpcRT4" unless="gcc"/>\r

diff --git a/Tools/Source/TianoTools/GenSection/GenSection.c b/Tools/Source/TianoTools/GenSection/GenSection.c
index 8ae0a9c4ce3c71c83a6930b32704d62bc7adf599..353b1a398599c9cadf203e47c34409cb9988fc6f 100644 (file)
--- a/Tools/Source/TianoTools/GenSection/GenSection.c
+++ b/Tools/Source/TianoTools/GenSection/GenSection.c
@@ -19,22 +19,21 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include "FirmwareVolumeImageFormat.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Protocol/GuidedSectionExtraction.h>\r
+\r

 #include "CommonLib.h"\r
 #include "EfiCompress.h"\r
 #include "EfiCustomizedCompress.h"\r
 #include "Crc32.h"\r
 #include "EfiUtilityMsgs.h"\r
 #include "CommonLib.h"\r
 #include "EfiCompress.h"\r
 #include "EfiCustomizedCompress.h"\r
 #include "Crc32.h"\r
 #include "EfiUtilityMsgs.h"\r

-\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <string.h>\r
-\r

 #include "GenSection.h"\r
 \r
 #include "GenSection.h"\r
 \r

-#include <GuidedSectionExtraction.h>\r

 \r
 #define UTILITY_NAME            "GenSection"\r
 \r
 \r
 #define UTILITY_NAME            "GenSection"\r
 \r

diff --git a/Tools/Source/TianoTools/GenSection/GenSection.h b/Tools/Source/TianoTools/GenSection/GenSection.h
index 847b3eba0850f07f395b024d4b7c5c6918455441..36064632db25fa3c114f4f0d1ecb6ea8547e6a4c 100644 (file)
--- a/Tools/Source/TianoTools/GenSection/GenSection.h
+++ b/Tools/Source/TianoTools/GenSection/GenSection.h
@@ -28,9 +28,8 @@ Abstract:
 //\r
 // External Files Referenced\r
 //\r
 //\r
 // External Files Referenced\r
 //\r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include "FirmwareVolumeImageFormat.h"\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r

 \r
 typedef struct {\r
   EFI_GUID_DEFINED_SECTION  GuidSectionHeader;\r
 \r
 typedef struct {\r
   EFI_GUID_DEFINED_SECTION  GuidSectionHeader;\r

diff --git a/Tools/Source/TianoTools/GenSection/build.xml b/Tools/Source/TianoTools/GenSection/build.xml
index 18935d3ce8796c73354d8ce856d1548a6901dbd7..d56a933b3433b1dc8d8ebd6667c45c6abd8733eb 100644 (file)
--- a/Tools/Source/TianoTools/GenSection/build.xml
+++ b/Tools/Source/TianoTools/GenSection/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init">\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r


@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

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

-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h> // for PE32 structure definitions\r

 \r
 \r

-#include "EfiImage.h" // for PE32 structure definitions\r
+#include "CommonLib.h"\r

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

diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/Source/TianoTools/GenTEImage/build.xml
index 472160f6733c822cb7fa1db2ea514447ad1c1f97..ac45f5ed4c227e9679151e44deded18906405b6a 100644 (file)
--- a/Tools/Source/TianoTools/GenTEImage/build.xml
+++ b/Tools/Source/TianoTools/GenTEImage/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init">\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r


@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/GuidChk/GuidList.c b/Tools/Source/TianoTools/GuidChk/GuidList.c
index 0e8afde72c5c7dc591cbfd786c1e142ad08820f7..bb6a44d85e63322cbf37478845f24ec5ec0f01f4 100644 (file)
--- a/Tools/Source/TianoTools/GuidChk/GuidList.c
+++ b/Tools/Source/TianoTools/GuidChk/GuidList.c
@@ -39,14 +39,12 @@ Notes:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <UgaDraw.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Guid/Apriori.h>\r
+#include <Guid/AcpiTableStorage.h>\r
+\r

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

-#include <Apriori.h>\r
-#include <AcpiTableStorage.h>\r
-// #include <Bmp.h>\r

 \r
 #define GUID_XREF(varname, guid) { \\r
     #varname, #guid, guid \\r
 \r
 #define GUID_XREF(varname, guid) { \\r
     #varname, #guid, guid \\r

diff --git a/Tools/Source/TianoTools/GuidChk/UtilsMsgs.c b/Tools/Source/TianoTools/GuidChk/UtilsMsgs.c
index b9fcab0f72f4c9e961a175b371a23840e03659d9..8aa343fc19d9caee0c779f0d569c54813c7bddbe 100644 (file)
--- a/Tools/Source/TianoTools/GuidChk/UtilsMsgs.c
+++ b/Tools/Source/TianoTools/GuidChk/UtilsMsgs.c
@@ -25,8 +25,8 @@ Abstract:
 #include <ctype.h>\r
 #include <stdarg.h>\r
 \r
 #include <ctype.h>\r
 #include <stdarg.h>\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
+\r

 #include "EfiUtilityMsgs.h"\r
 \r
 #define MAX_LINE_LEN  200\r
 #include "EfiUtilityMsgs.h"\r
 \r
 #define MAX_LINE_LEN  200\r

diff --git a/Tools/Source/TianoTools/GuidChk/build.xml b/Tools/Source/TianoTools/GuidChk/build.xml
index 478edc6189966d66849a5be9407926a449c2464f..b5c64d34b05b0e0c53bd291093446f63537b9c99 100644 (file)
--- a/Tools/Source/TianoTools/GuidChk/build.xml
+++ b/Tools/Source/TianoTools/GuidChk/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init" unless="gcc">\r
   </target>\r
 \r
   <target name="Tool" depends="init" unless="gcc">\r


@@ -93,12 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Guid"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
-                       <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

 \r
     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r

diff --git a/Tools/Source/TianoTools/MakeDeps/MakeDeps.c b/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
index 96ce31e29bca72a33ad637ab59178eec02f1b7ed..de1afea62f04c60f5f43d33ef45b1425a237f17b 100755 (executable)
--- a/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
+++ b/Tools/Source/TianoTools/MakeDeps/MakeDeps.c
@@ -25,10 +25,10 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
+#include <Common/UefiBaseTypes.h>\r
+\r

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

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

 \r
 //\r
 // Structure to maintain a linked list of strings\r
 \r
 //\r
 // Structure to maintain a linked list of strings\r

diff --git a/Tools/Source/TianoTools/MakeDeps/build.xml b/Tools/Source/TianoTools/MakeDeps/build.xml
index 05bf75bc3a7b6f3fd8a68c40b07635b7a83c6395..54988762b242e7da93edf119c2f495b1ae57ac12 100755 (executable)
--- a/Tools/Source/TianoTools/MakeDeps/build.xml
+++ b/Tools/Source/TianoTools/MakeDeps/build.xml
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/ModifyInf/build.xml b/Tools/Source/TianoTools/ModifyInf/build.xml
index aadd8231887dde390a035e926ff5c539d59a8613..baa7bedaa34f918c98300ccb305bd68f1daaff1d 100644 (file)
--- a/Tools/Source/TianoTools/ModifyInf/build.xml
+++ b/Tools/Source/TianoTools/ModifyInf/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init">\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r


@@ -92,10 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

 \r
     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r

diff --git a/Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c b/Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c
index b41a3a0e3bff1896cae8293651ea831de7e2e0d2..b90d7625f0c34f894f29ef371beab1fceb6b19c1 100644 (file)
--- a/Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c
+++ b/Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c
@@ -22,11 +22,9 @@ Revision History
 --*/\r
 \r
 \r
 --*/\r
 \r
 \r

-#define EFI_SPECIFICATION_VERSION    0x00000000\r
-#define EDK_RELEASE_VERSION          0x00020000\r
-#include <Base.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r

 #include <Library/PeCoffLib.h>\r
 #include <Library/PeCoffLib.h>\r

-#include <Library/BaseMemoryLib.h>\r

 \r
 STATIC\r
 RETURN_STATUS\r
 \r
 STATIC\r
 RETURN_STATUS\r


@@ -600,11 +598,11 @@ Returns:
     //\r
     RelocDir = &TeHdr->DataDirectory[0];\r
     RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(\r
     //\r
     RelocDir = &TeHdr->DataDirectory[0];\r
     RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(\r

-                                               ImageContext->ImageAddress + \r
-                                               RelocDir->VirtualAddress +\r
-                                               sizeof(EFI_TE_IMAGE_HEADER) - \r
-                                               TeHdr->StrippedSize\r
-                                               );\r
+                                    ImageContext->ImageAddress + \r
+                                    RelocDir->VirtualAddress +\r
+                                    sizeof(EFI_TE_IMAGE_HEADER) - \r
+                                    TeHdr->StrippedSize\r
+                                    );\r

     RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);\r
   }\r
   \r
     RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);\r
   }\r
   \r


@@ -620,10 +618,10 @@ Returns:
       FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);\r
     } else {\r
       FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +\r
       FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);\r
     } else {\r
       FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +\r

-                             RelocBase->VirtualAddress +\r
-                             sizeof(EFI_TE_IMAGE_HEADER) - \r
-                             TeHdr->StrippedSize\r
-                             );\r
+                    RelocBase->VirtualAddress +\r
+                    sizeof(EFI_TE_IMAGE_HEADER) - \r
+                    TeHdr->StrippedSize\r
+                    );\r

     }\r
 \r
     if ((CHAR8 *) RelocEnd < (CHAR8 *) ((UINTN) ImageContext->ImageAddress) ||\r
     }\r
 \r
     if ((CHAR8 *) RelocEnd < (CHAR8 *) ((UINTN) ImageContext->ImageAddress) ||\r


@@ -836,9 +834,9 @@ Returns:
     TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);\r
 \r
     FirstSection = (EFI_IMAGE_SECTION_HEADER *) (\r
     TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);\r
 \r
     FirstSection = (EFI_IMAGE_SECTION_HEADER *) (\r

-                     (UINTN)ImageContext->ImageAddress +\r
-                     sizeof(EFI_TE_IMAGE_HEADER)\r
-                     );\r
+          (UINTN)ImageContext->ImageAddress +\r
+          sizeof(EFI_TE_IMAGE_HEADER)\r
+          );\r

     NumberOfSections  = (UINTN) (TeHdr->NumberOfSections);\r
 \r
   }\r
     NumberOfSections  = (UINTN) (TeHdr->NumberOfSections);\r
 \r
   }\r


@@ -933,9 +931,9 @@ Returns:
                                                                 );\r
   } else {\r
     ImageContext->EntryPoint =  (PHYSICAL_ADDRESS) (\r
                                                                 );\r
   } else {\r
     ImageContext->EntryPoint =  (PHYSICAL_ADDRESS) (\r

-                                  (UINTN)ImageContext->ImageAddress +\r
-                                  (UINTN)TeHdr->AddressOfEntryPoint +\r
-                                  (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -\r
+                       (UINTN)ImageContext->ImageAddress +\r
+                       (UINTN)TeHdr->AddressOfEntryPoint +\r
+                       (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -\r

           (UINTN) TeHdr->StrippedSize\r
       );\r
   }\r
           (UINTN) TeHdr->StrippedSize\r
       );\r
   }\r


@@ -976,11 +974,11 @@ Returns:
                     );\r
     } else {\r
       DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(\r
                     );\r
     } else {\r
       DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(\r

-                                                        ImageContext->ImageAddress +\r
-                                                        ImageContext->DebugDirectoryEntryRva +\r
-                                                        sizeof(EFI_TE_IMAGE_HEADER) -\r
-                                                        TeHdr->StrippedSize\r
-                                                        );\r
+                                               ImageContext->ImageAddress +\r
+                                               ImageContext->DebugDirectoryEntryRva +\r
+                                               sizeof(EFI_TE_IMAGE_HEADER) -\r
+                                               TeHdr->StrippedSize\r
+                                               );\r

     }\r
 \r
     if (DebugEntry != NULL) {\r
     }\r
 \r
     if (DebugEntry != NULL) {\r


@@ -999,9 +997,9 @@ Returns:
           ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);\r
         } else {\r
           ImageContext->CodeView = (VOID *)(\r
           ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);\r
         } else {\r
           ImageContext->CodeView = (VOID *)(\r

-                                     (UINTN)ImageContext->ImageAddress +\r
-                                     (UINTN)TempDebugEntryRva +\r
-                                     (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -\r
+                      (UINTN)ImageContext->ImageAddress +\r
+                      (UINTN)TempDebugEntryRva +\r
+                      (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -\r

                 (UINTN) TeHdr->StrippedSize\r
             );\r
         }\r
                 (UINTN) TeHdr->StrippedSize\r
             );\r
         }\r

diff --git a/Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h b/Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h
index 0ad71d34bd7947a34a1340c648604d57f5fac604..9528e6bff577353544991b89cd3ea2a17f7df8da 100644 (file)
--- a/Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h
+++ b/Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h
@@ -1,19 +1,19 @@
 /** @file\r
 /** @file\r

-       EFI image format for PE32+. Please note some data structures are different\r
-       for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64\r
+  EFI image format for PE32+. Please note some data structures are different\r
+  for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64\r

 \r
 \r

-       @bug Fix text - doc as defined in MSFT EFI specification.\r
+  @bug Fix text - doc as defined in MSFT EFI specification.\r

 \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
+  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
 \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
+  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
 \r

-       Module Name:    EfiImage.h\r
+  Module Name:  EfiImage.h\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c b/Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c
index 0af4340fcba077fb0a4a458f1dfd54bc824355b6..f58e8d0364fbdf4f77ab166a25557ed7f38cd7a7 100644 (file)
--- a/Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c
+++ b/Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c
@@ -21,15 +21,7 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-\r
-#define EFI_SPECIFICATION_VERSION    0x00000000\r
-#define EDK_RELEASE_VERSION          0x00020000\r
-#include <Base.h>\r
-#include <Library/PeCoffLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-\r
-\r
-\r
+#include <Common/UefiBaseTypes.h>\r

 \r
 RETURN_STATUS\r
 PeCoffLoaderRelocateImageEx (\r
 \r
 RETURN_STATUS\r
 PeCoffLoaderRelocateImageEx (\r

diff --git a/Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c b/Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c
index 2a58a62f6d2aa8ddf2a3aec7888bbaeae53e4271..3f3989908dac76578bb732973d56850cd224006c 100644 (file)
--- a/Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c
+++ b/Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c
@@ -22,11 +22,9 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#define EFI_SPECIFICATION_VERSION    0x00000000\r
-#define EDK_RELEASE_VERSION          0x00020000\r
-#include <Base.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r

 #include <Library/PeCoffLib.h>\r
 #include <Library/PeCoffLib.h>\r

-#include <Library/BaseMemoryLib.h>\r

 \r
 \r
 \r
 \r
 \r
 \r

diff --git a/Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c b/Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c
index 6bcae272e7a8b6a0369bd194209dc1888d2a4998..1e6cc34745cc0f70d85e05e42d86e474250ff29c 100644 (file)
--- a/Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c
+++ b/Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c
@@ -22,11 +22,9 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#define EFI_SPECIFICATION_VERSION    0x00000000\r
-#define EDK_RELEASE_VERSION          0x00020000\r
-#include <Base.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r

 #include <Library/PeCoffLib.h>\r
 #include <Library/PeCoffLib.h>\r

-#include <Library/BaseMemoryLib.h>\r

 \r
 \r
 \r
 \r
 \r
 \r

diff --git a/Tools/Source/TianoTools/PeCoffLoader/build.xml b/Tools/Source/TianoTools/PeCoffLoader/build.xml
index b9d0f11354eebb6a7a653a5f792ed98a2bf08a7c..bd275209dc7881b8dedfa772c995452b4d4424ed 100644 (file)
--- a/Tools/Source/TianoTools/PeCoffLoader/build.xml
+++ b/Tools/Source/TianoTools/PeCoffLoader/build.xml
@@ -125,11 +125,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r


@@ -150,11 +146,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r


@@ -175,11 +167,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r

diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
index 7dc95d60afd4182abb9a0ecb8afe680c32643e4e..7b48b67d2464c54927421f098ce4454716b52ba5 100644 (file)
--- a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
+++ b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
@@ -22,19 +22,18 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
 #include <stdio.h>\r
 #include <string.h>\r

-#include "CommonLib.h"\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Library/PeCoffLib.h>\r
+\r

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

-\r

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

-#include "FirmwareFileSystem.h"\r
-#include "PeCoffLib.h"\r
-\r

 #include "PeiRebaseExe.h"\r
 \r
 EFI_STATUS\r
 #include "PeiRebaseExe.h"\r
 \r
 EFI_STATUS\r

diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
index b9e71f4ed985e542387cc5be6cffe623e70c6a33..58e1a0cd35ad29611fbf5aec3d655f28f9fb7234 100644 (file)
--- a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
+++ b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.h
@@ -23,10 +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 "FirmwareFileSystem.h"\r
-#include "FirmwareVolumeHeader.h"\r
-#include "MultiPhase.h"\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/MultiPhase.h>\r

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

diff --git a/Tools/Source/TianoTools/PeiRebase/build.xml b/Tools/Source/TianoTools/PeiRebase/build.xml
index 187d5d69456e770d99719f539f6e94a70de5963f..af30cfe745769c1f73e2393068a4f36e39f29dd5 100644 (file)
--- a/Tools/Source/TianoTools/PeiRebase/build.xml
+++ b/Tools/Source/TianoTools/PeiRebase/build.xml
@@ -63,22 +63,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="PeiRebase_Ia32" depends="init">\r
   </target>\r
 \r
   <target name="PeiRebase_Ia32" depends="init">\r


@@ -92,11 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ia32"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_Ia32"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r


@@ -111,11 +108,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_Ipf"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_Ipf"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r


@@ -130,11 +124,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress PeCoffLoader_X64"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools PeCoffLoader_X64"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c
index 5cb03f03983f8f2f9a5c31a0164eb5ec0605520f..1afe112e850f371cadd24858dac5a69bf7bec642 100644 (file)
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/SecApResetVectorFixup.c
@@ -314,7 +314,7 @@ Returns:
     Error (NULL, 0, 0, "The position to place Ap reset vector is not in E and F segment!", NULL);\r
     free ((VOID *)FileBufferRaw);\r
     return STATUS_ERROR; \r
     Error (NULL, 0, 0, "The position to place Ap reset vector is not in E and F segment!", NULL);\r
     free ((VOID *)FileBufferRaw);\r
     return STATUS_ERROR; \r

-  }    \r
+  }    \r

   //\r
   // Fix up Ap reset vector and calculate the IPI vector\r
   //\r
   //\r
   // Fix up Ap reset vector and calculate the IPI vector\r
   //\r

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

-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include "EfiImage.h"\r
-#include <FirmwareVolumeImageFormat.h>\r
-#include "FirmwareFileSystem.h"\r
-#include "FirmwareVolumeHeader.h"\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+\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
index 06622cee5d15df7c03a25741818157c6103cdc77..e065f7cc8206fa397342e5d3eeaf7230317e63b5 100644 (file)
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

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

-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
-#include "EfiImage.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "EfiUtilityMsgs.c"\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/EfiImage.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r

 \r
 \r

+#include "EfiUtilityMsgs.c"\r

 #include "SecFixup.h"\r
 \r
 VOID\r
 #include "SecFixup.h"\r
 \r
 VOID\r

diff --git a/Tools/Source/TianoTools/SecFixup/build.xml b/Tools/Source/TianoTools/SecFixup/build.xml
index aab82023716cc1f5806526179e2e863280189d36..e5e01f7adeb28450ec6d6d69206e5c6458c1f89a 100644 (file)
--- a/Tools/Source/TianoTools/SecFixup/build.xml
+++ b/Tools/Source/TianoTools/SecFixup/build.xml
@@ -93,10 +93,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/SetStamp/build.xml b/Tools/Source/TianoTools/SetStamp/build.xml
index f1be1e01b6515df0f3ac0a5fa1ea2f7a80774790..65a975a62db1938aba6d780a3706e26a67a4a49c 100644 (file)
--- a/Tools/Source/TianoTools/SetStamp/build.xml
+++ b/Tools/Source/TianoTools/SetStamp/build.xml
@@ -61,22 +61,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
       </echo>\r
     </else>\r
     </if>\r

-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\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
         <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
+      </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
           <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
+        </then>\r
+      </elseif>\r
+    </if>\r

   </target>\r
 \r
   <target name="Tool" depends="init">\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r


@@ -92,10 +92,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-                       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r

 \r
     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r

diff --git a/Tools/Source/TianoTools/SplitFile/build.xml b/Tools/Source/TianoTools/SplitFile/build.xml
index 0ed83128602e2688dd6ffe7c0903ca7c921fc77d..aea77d7ab5e3c82744377d5f6287e989e7592718 100644 (file)
--- a/Tools/Source/TianoTools/SplitFile/build.xml
+++ b/Tools/Source/TianoTools/SplitFile/build.xml
@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/StrGather/StrGather.c b/Tools/Source/TianoTools/StrGather/StrGather.c
index 1fc204d14796964f6cc7aa6c88c1b9879a17256f..f909b34bb34aa119d7ba7210145fef86e1a93df1 100644 (file)
--- a/Tools/Source/TianoTools/StrGather/StrGather.c
+++ b/Tools/Source/TianoTools/StrGather/StrGather.c
@@ -24,9 +24,9 @@ Abstract:
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r
 #include <stdlib.h>\r
 #include <ctype.h>\r
 \r

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

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

diff --git a/Tools/Source/TianoTools/StrGather/StringDB.c b/Tools/Source/TianoTools/StrGather/StringDB.c
index 353fabb68226f42b0158ff6c140f19bf2cb4d5e4..3a6a5a4ef05b6200551c3729652e11cb189564a4 100644 (file)
--- a/Tools/Source/TianoTools/StrGather/StringDB.c
+++ b/Tools/Source/TianoTools/StrGather/StringDB.c
@@ -23,18 +23,17 @@ Abstract:
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <ctype.h>  // for tolower()\r
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <ctype.h>  // for tolower()\r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <MultiPhase.h>\r
-#include <BaseLib.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h>  // for EFI_UGA_PIXEL definition\r
+#include <Protocol/Hii.h>\r
+\r

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

-#include "InternalFormRepresentation.h"\r

 \r
 \r

-// #include EFI_PROTOCOL_DEFINITION (Hii)\r
-#include <UgaDraw.h>\r
-#include <Hii.h>\r

 \r
 #define STRING_OFFSET RELOFST\r
 \r
 \r
 #define STRING_OFFSET RELOFST\r
 \r

diff --git a/Tools/Source/TianoTools/StrGather/build.xml b/Tools/Source/TianoTools/StrGather/build.xml
index 389701d8459839d5540b8e432e89dddbe7734140..8d2ce83a8b0aa89d79982312b4a7e5d4effb95eb 100644 (file)
--- a/Tools/Source/TianoTools/StrGather/build.xml
+++ b/Tools/Source/TianoTools/StrGather/build.xml
@@ -95,11 +95,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress String"/>\r
+      <libset dir="${LIB_DIR}" libs="CommonTools String"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/String/PrintLib.c b/Tools/Source/TianoTools/String/PrintLib.c
index 868a73eb6cfdd092a70c2badc1dd7d581f3a975b..1c56edb31ed936ca1d8f213cab2f3ec2df27171d 100644 (file)
--- a/Tools/Source/TianoTools/String/PrintLib.c
+++ b/Tools/Source/TianoTools/String/PrintLib.c
@@ -14,10 +14,10 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <PrintLib.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Library/PrintLib.h>\r
+\r
+#include "CommonLib.h"\r

 #include "PrintLibInternal.h"\r
 \r
 typedef struct {\r
 #include "PrintLibInternal.h"\r
 \r
 typedef struct {\r

diff --git a/Tools/Source/TianoTools/String/PrintLibInternal.c b/Tools/Source/TianoTools/String/PrintLibInternal.c
index a475815375f71669d6ce826a7b9ae0f85f183e17..4dad38429e2ab37424d519e64ba73de03b9f1377 100644 (file)
--- a/Tools/Source/TianoTools/String/PrintLibInternal.c
+++ b/Tools/Source/TianoTools/String/PrintLibInternal.c
@@ -14,11 +14,10 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <PrintLib.h>\r
-#include <BaseLib.h>\r
-#include <CommonLib.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Library/PrintLib.h>\r
+\r
+#include "CommonLib.h"\r

 #include "PrintLibInternal.h"\r
 \r
 static CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};\r
 #include "PrintLibInternal.h"\r
 \r
 static CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};\r

diff --git a/Tools/Source/TianoTools/String/String.c b/Tools/Source/TianoTools/String/String.c
index 10051806ad59e80e38b045a5218f69d74b7f63e8..0e4993a4be429a310a705c913d0e14ee78cff505 100644 (file)
--- a/Tools/Source/TianoTools/String/String.c
+++ b/Tools/Source/TianoTools/String/String.c
@@ -15,13 +15,10 @@
 **/\r
 \r
 #include <assert.h>\r
 **/\r
 \r
 #include <assert.h>\r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <BaseLib.h>\r
-#include <PcdLib.h>\r
-#include <CommonLib.h>\r
-#define _gPcd_FixedAtBuild_PcdMaximumUnicodeStringLength   0\r
-#define _gPcd_FixedAtBuild_PcdMaximumAsciiStringLength   0\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+\r
+#include "CommonLib.h"\r

 \r
 /**\r
   Copies one Null-terminated Unicode string to another Null-terminated Unicode\r
 \r
 /**\r
   Copies one Null-terminated Unicode string to another Null-terminated Unicode\r


@@ -34,8 +31,6 @@
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r

 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r
 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r


@@ -87,8 +82,6 @@ StrCpy (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r

 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r
 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r


@@ -130,7 +123,6 @@ StrnCpy (
     Length--;\r
   }\r
 \r
     Length--;\r
   }\r
 \r

-  // ZeroMem (Destination, Length * sizeof (*Destination));\r

   memset (Destination, 0, Length * sizeof (*Destination));\r
   return ReturnValue;\r
 }\r
   memset (Destination, 0, Length * sizeof (*Destination));\r
   return ReturnValue;\r
 }\r


@@ -142,8 +134,6 @@ StrnCpy (
   Unicode string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
   Unicode string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and String contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r

 \r
   @param  String  Pointer to a Null-terminated Unicode string.\r
 \r
 \r
   @param  String  Pointer to a Null-terminated Unicode string.\r
 \r


@@ -161,13 +151,7 @@ StrLen (
   ASSERT (String != NULL);\r
 \r
   for (Length = 0; *String != L'\0'; String++, Length++) {\r
   ASSERT (String != NULL);\r
 \r
   for (Length = 0; *String != L'\0'; String++, Length++) {\r

-    //\r
-    // If PcdMaximumUnicodeStringLength is not zero,\r
-    // length should not more than PcdMaximumUnicodeStringLength\r
-    //\r
-    if (FixedPcdGet32 (PcdMaximumUnicodeStringLength) != 0) {\r
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumUnicodeStringLength));\r
-    }\r
+    ;\r

   }\r
   return Length;\r
 }\r
   }\r
   return Length;\r
 }\r


@@ -180,8 +164,6 @@ StrLen (
   string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
   string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and String contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r

 \r
   @param  String  Pointer to a Null-terminated Unicode string.\r
 \r
 \r
   @param  String  Pointer to a Null-terminated Unicode string.\r
 \r


@@ -209,10 +191,6 @@ StrSize (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r

 \r
   @param  FirstString   Pointer to a Null-terminated Unicode string.\r
   @param  SecondString  Pointer to a Null-terminated Unicode string.\r
 \r
   @param  FirstString   Pointer to a Null-terminated Unicode string.\r
   @param  SecondString  Pointer to a Null-terminated Unicode string.\r


@@ -229,7 +207,7 @@ StrCmp (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength\r
+  // ASSERT both strings should never be zero\r

   //\r
   ASSERT (StrSize (FirstString) != 0);\r
   ASSERT (StrSize (SecondString) != 0);\r
   //\r
   ASSERT (StrSize (FirstString) != 0);\r
   ASSERT (StrSize (SecondString) != 0);\r


@@ -254,10 +232,6 @@ StrCmp (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and FirstString contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and SecondString contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r

 \r
   @param  FirstString   Pointer to a Null-terminated Unicode string.\r
   @param  SecondString  Pointer to a Null-terminated Unicode string.\r
 \r
   @param  FirstString   Pointer to a Null-terminated Unicode string.\r
   @param  SecondString  Pointer to a Null-terminated Unicode string.\r


@@ -280,8 +254,7 @@ StrnCmp (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // ASSERT both strings are less long than PcdMaximumUnicodeStringLength.\r
-  // Length tests are performed inside StrLen().\r
+  // ASSERT both strings should never be zero\r

   //\r
   ASSERT (StrSize (FirstString) != 0);\r
   ASSERT (StrSize (SecondString) != 0);\r
   //\r
   ASSERT (StrSize (FirstString) != 0);\r
   ASSERT (StrSize (SecondString) != 0);\r


@@ -310,13 +283,6 @@ StrnCmp (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination\r
-  and Source results in a Unicode string with more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r

 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r
 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r


@@ -335,7 +301,6 @@ StrCat (
 \r
   //\r
   // Size of the resulting string should never be zero.\r
 \r
   //\r
   // Size of the resulting string should never be zero.\r

-  // PcdMaximumUnicodeStringLength is tested inside StrLen().\r

   //\r
   ASSERT (StrSize (Destination) != 0);\r
   return Destination;\r
   //\r
   ASSERT (StrSize (Destination) != 0);\r
   return Destination;\r


@@ -357,13 +322,6 @@ StrCat (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumUnicodeStringLength is not zero, and Destination contains more\r
-  than PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and Source contains more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r
-  If PcdMaximumUnicodeStringLength is not zero, and concatenating Destination\r
-  and Source results in a Unicode string with more than\r
-  PcdMaximumUnicodeStringLength Unicode characters, then ASSERT().\r

 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r
 \r
   @param  Destination Pointer to a Null-terminated Unicode string.\r
   @param  Source      Pointer to a Null-terminated Unicode string.\r


@@ -385,7 +343,6 @@ StrnCat (
 \r
   //\r
   // Size of the resulting string should never be zero.\r
 \r
   //\r
   // Size of the resulting string should never be zero.\r

-  // PcdMaximumUnicodeStringLength is tested inside StrLen().\r

   //\r
   ASSERT (StrSize (Destination) != 0);\r
   return Destination;\r
   //\r
   ASSERT (StrSize (Destination) != 0);\r
   return Destination;\r


@@ -402,8 +359,6 @@ StrnCat (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero and Source contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r

 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r
 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r


@@ -454,8 +409,6 @@ AsciiStrCpy (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero, and Source contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r

 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r
 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r


@@ -508,8 +461,6 @@ AsciiStrnCpy (
   ASCII string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
   ASCII string specified by String.\r
 \r
   If String is NULL, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero and String contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r

 \r
   @param  String  Pointer to a Null-terminated ASCII string.\r
 \r
 \r
   @param  String  Pointer to a Null-terminated ASCII string.\r
 \r


@@ -527,13 +478,7 @@ AsciiStrLen (
   ASSERT (String != NULL);\r
 \r
   for (Length = 0; *String != '\0'; String++, Length++) {\r
   ASSERT (String != NULL);\r
 \r
   for (Length = 0; *String != '\0'; String++, Length++) {\r

-    //\r
-    // If PcdMaximumUnicodeStringLength is not zero,\r
-    // length should not more than PcdMaximumUnicodeStringLength\r
-    //\r
-    if (FixedPcdGet32 (PcdMaximumAsciiStringLength) != 0) {\r
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumAsciiStringLength));\r
-    }\r
+    ;\r

   }\r
   return Length;\r
 }\r
   }\r
   return Length;\r
 }\r


@@ -546,8 +491,6 @@ AsciiStrLen (
   specified by String.\r
 \r
   If String is NULL, then ASSERT().\r
   specified by String.\r
 \r
   If String is NULL, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero and String contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r

 \r
   @param  String  Pointer to a Null-terminated ASCII string.\r
 \r
 \r
   @param  String  Pointer to a Null-terminated ASCII string.\r
 \r


@@ -575,10 +518,6 @@ AsciiStrSize (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more\r
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r

 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r
 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r


@@ -595,7 +534,7 @@ AsciiStrCmp (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength\r
+  // ASSERT both strings should never be zero\r

   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r
   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r


@@ -631,10 +570,6 @@ AsciiToUpper (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more\r
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r

 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r
 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r


@@ -653,7 +588,7 @@ AsciiStriCmp (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength\r
+  // ASSERT both strings should never be zero\r

   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r
   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r


@@ -680,10 +615,6 @@ AsciiStriCmp (
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r
 \r
   If FirstString is NULL, then ASSERT().\r
   If SecondString is NULL, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero and FirstString contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and SecondString contains more\r
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r

 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r
 \r
   @param  FirstString   Pointer to a Null-terminated ASCII string.\r
   @param  SecondString  Pointer to a Null-terminated ASCII string.\r


@@ -701,7 +632,7 @@ AsciiStrnCmp (
   )\r
 {\r
   //\r
   )\r
 {\r
   //\r

-  // ASSERT both strings are less long than PcdMaximumAsciiStringLength\r
+  // ASSERT both strings should never be zero\r

   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r
   //\r
   ASSERT (AsciiStrSize (FirstString));\r
   ASSERT (AsciiStrSize (SecondString));\r


@@ -727,13 +658,6 @@ AsciiStrnCmp (
 \r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
 \r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero and Destination contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and Source contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero and concatenating Destination and\r
-  Source results in a ASCII string with more than PcdMaximumAsciiStringLength\r
-  ASCII characters, then ASSERT().\r

 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r
 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r


@@ -752,7 +676,6 @@ AsciiStrCat (
 \r
   //\r
   // Size of the resulting string should never be zero.\r
 \r
   //\r
   // Size of the resulting string should never be zero.\r

-  // PcdMaximumUnicodeStringLength is tested inside StrLen().\r

   //\r
   ASSERT (AsciiStrSize (Destination) != 0);\r
   return Destination;\r
   //\r
   ASSERT (AsciiStrSize (Destination) != 0);\r
   return Destination;\r


@@ -774,13 +697,6 @@ AsciiStrCat (
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r
   If Destination is NULL, then ASSERT().\r
   If Source is NULL, then ASSERT().\r
   If Source and Destination overlap, then ASSERT().\r

-  If PcdMaximumAsciiStringLength is not zero, and Destination contains more\r
-  than PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero, and Source contains more than\r
-  PcdMaximumAsciiStringLength ASCII characters, then ASSERT().\r
-  If PcdMaximumAsciiStringLength is not zero, and concatenating Destination and\r
-  Source results in a ASCII string with more than PcdMaximumAsciiStringLength\r
-  ASCII characters, then ASSERT().\r

 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r
 \r
   @param  Destination Pointer to a Null-terminated ASCII string.\r
   @param  Source      Pointer to a Null-terminated ASCII string.\r


@@ -802,7 +718,6 @@ AsciiStrnCat (
 \r
   //\r
   // Size of the resulting string should never be zero.\r
 \r
   //\r
   // Size of the resulting string should never be zero.\r

-  // PcdMaximumUnicodeStringLength is tested inside StrLen().\r

   //\r
   ASSERT (AsciiStrSize (Destination) != 0);\r
   return Destination;\r
   //\r
   ASSERT (AsciiStrSize (Destination) != 0);\r
   return Destination;\r

diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/Source/TianoTools/String/build.xml
index 16c8768522b40a078a8677cf54ea27fc0516169f..b77b69069742fa718c1a1e33bd143c26ff521282 100644 (file)
--- a/Tools/Source/TianoTools/String/build.xml
+++ b/Tools/Source/TianoTools/String/build.xml
@@ -116,11 +116,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r

-      <includepath path="${PACKAGE_DIR}/Include"/>\r

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r

diff --git a/Tools/Source/TianoTools/Strip/Strip.c b/Tools/Source/TianoTools/Strip/Strip.c
index 567b526568751afaefe77b325291022c1f78e378..b1538076d117cd6ad11cc18964f39ccc5c173aab 100644 (file)
--- a/Tools/Source/TianoTools/Strip/Strip.c
+++ b/Tools/Source/TianoTools/Strip/Strip.c
@@ -82,7 +82,7 @@ Returns:
 \r
   fseek (InFile, 0, SEEK_SET);\r
 \r
 \r
   fseek (InFile, 0, SEEK_SET);\r
 \r

-  Buffer = malloc (FileSize);\r
+  Buffer = (char *) malloc (FileSize);\r

   if (Buffer == NULL) {\r
     printf ("Error: Out of resources.\n");\r
     return -1;\r
   if (Buffer == NULL) {\r
     printf ("Error: Out of resources.\n");\r
     return -1;\r

diff --git a/Tools/Source/TianoTools/Strip/build.xml b/Tools/Source/TianoTools/Strip/build.xml
index d15141a9cc1a3da45b5b59a759a132d2e9dc2769..56e84ce033dbe07de09fad16183e94e281f076a9 100644 (file)
--- a/Tools/Source/TianoTools/Strip/build.xml
+++ b/Tools/Source/TianoTools/Strip/build.xml
@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/VfrCompile/EfiVfr.h b/Tools/Source/TianoTools/VfrCompile/EfiVfr.h
index f7c534d3368046beebb1eb8bbbe4c0baa7fcfe53..6419ad7e7180d3b712389a3546c9d56f2de8afca 100644 (file)
--- a/Tools/Source/TianoTools/VfrCompile/EfiVfr.h
+++ b/Tools/Source/TianoTools/VfrCompile/EfiVfr.h
@@ -23,11 +23,11 @@ Abstract:
 #ifndef _EFI_VFR_H_\r
 #define _EFI_VFR_H_\r
 \r
 #ifndef _EFI_VFR_H_\r
 #define _EFI_VFR_H_\r
 \r

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

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

+#include <Common/UefiBaseTypes.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+\r

 //\r
 // This number should be incremented with each change to the VFR compiler.\r
 // We write the version to the output list file for debug purposes.\r
 //\r
 // This number should be incremented with each change to the VFR compiler.\r
 // We write the version to the output list file for debug purposes.\r

diff --git a/Tools/Source/TianoTools/VfrCompile/VfrCompile.g b/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
index 3646c5d1cde473a0dbd61a32c080a5b797d6b5d6..db0ba955820901493afc3e98060901da4482955f 100644 (file)
--- a/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
+++ b/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
@@ -21,15 +21,16 @@ Abstract:
 \r
 #header<<\r
 \r
 \r
 #header<<\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <CommonLib.h>\r
-#include <MultiPhase.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h>\r
+#include <Protocol/Hii.h>\r
+\r
+#include "CommonLib.h"\r

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

-#include <UgaDraw.h>\r
-#include <Hii.h>\r

 \r
 #include <ctype.h>\r
 #ifndef __GNUC__\r
 \r
 #include <ctype.h>\r
 #ifndef __GNUC__\r

diff --git a/Tools/Source/TianoTools/VfrCompile/VfrServices.cpp b/Tools/Source/TianoTools/VfrCompile/VfrServices.cpp
index c66d4dfa793293932e98ee0c0d54b815c13d9bd3..359256a358fefd941a4d4573743e6210a84abf59 100644 (file)
--- a/Tools/Source/TianoTools/VfrCompile/VfrServices.cpp
+++ b/Tools/Source/TianoTools/VfrCompile/VfrServices.cpp
@@ -22,15 +22,16 @@ Abstract:
 #include <stdio.h>    // for FILE routines\r
 #include <stdlib.h>   // for malloc() and free()\r
 \r
 #include <stdio.h>    // for FILE routines\r
 #include <stdlib.h>   // for malloc() and free()\r
 \r

-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <MultiPhase.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h>  // for EFI_UGA_PIXEL definition\r
+#include <Protocol/Hii.h>\r
+\r

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

-#include <UgaDraw.h>\r
-#include <Hii.h>\r

 \r
 static const char *mSourceFileHeader[] = {\r
   "//",\r
 \r
 static const char *mSourceFileHeader[] = {\r
   "//",\r

diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml
index 26d07878f7b411f48137a4a43da46adf37fc3f1f..7b73cf6de25315bd0945c4b68bb8cb2884597c94 100644 (file)
--- a/Tools/Source/TianoTools/VfrCompile/build.xml
+++ b/Tools/Source/TianoTools/VfrCompile/build.xml
@@ -77,25 +77,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </then>\r
       </elseif>\r
     </if>\r
         </then>\r
       </elseif>\r
     </if>\r

-               <condition property="CheckDepends">\r
-                 <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">\r
-                         <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" \r
+    <condition property="CheckDepends">\r
+      <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">\r
+        <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" \r

         includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>\r
         includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>\r

-                       </uptodate>\r
-               </condition>\r
+      </uptodate>\r
+    </condition>\r

 \r
     <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">\r
       <os family="mac"/>\r
 \r
     <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">\r
       <os family="mac"/>\r

-       </condition>\r
-               \r
+  </condition>\r
+    \r

     <condition property="gxx_extra_libs" value="stdc++">\r
       <os name="linux"/>\r
     <condition property="gxx_extra_libs" value="stdc++">\r
       <os name="linux"/>\r

-       </condition>\r
-               \r
+  </condition>\r
+    \r

     <condition property="gxx_extra_libs" value="stdc++">\r
       <os family="windows"/>\r
     <condition property="gxx_extra_libs" value="stdc++">\r
       <os family="windows"/>\r

-       </condition>\r
-               \r
+  </condition>\r
+    \r

   </target>\r
 \r
   <target name="Antlr" depends="init" unless="CheckDepends">\r
   </target>\r
 \r
   <target name="Antlr" depends="init" unless="CheckDepends">\r


@@ -122,11 +122,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <fileset dir="${basedir}/Pccts/h" \r
         includes="${FileSetPccts}" />\r
 \r
       <fileset dir="${basedir}/Pccts/h" \r
         includes="${FileSetPccts}" />\r
 \r

-      <includepath path="${env.WORKSPACE}/Tools/Source/TianoTools/Pccts/h"/>\r
+      <includepath path="${PACKAGE_DIR}/Pccts/h"/>\r

       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="${gxx_extra_libs}" if="gcc"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="${gxx_extra_libs}" if="gcc"/>\r

diff --git a/Tools/Source/TianoTools/ZeroDebugData/build.xml b/Tools/Source/TianoTools/ZeroDebugData/build.xml
index 34781cd0b7dbac1724d01f8193c5cb482998da33..fa3e63731e1bdbd2070f29c759cb4ceafd824571 100644 (file)
--- a/Tools/Source/TianoTools/ZeroDebugData/build.xml
+++ b/Tools/Source/TianoTools/ZeroDebugData/build.xml
@@ -93,10 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r

-      <includepath path="${PACKAGE_DIR}/Include/Common"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>\r

       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r

-      <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r

     </cc>\r
   </target>\r
 \r
     </cc>\r
   </target>\r
 \r

diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index 64c8fb92eaaa4429d4297c983f04a30e65e79f33..ca81aae7c5ee921722ad92427fe99159bb6e30d1 100644 (file)
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -65,8 +65,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </else>\r
     </if>\r
 \r
       </else>\r
     </if>\r
 \r

-    <ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />\r
-    \r

     <if>\r
         <isset property="env.TOOL_CHAIN" />\r
       <then>\r
     <if>\r
         <isset property="env.TOOL_CHAIN" />\r
       <then>\r