Removed EdkFatPkg from tree - will put this up under a separate project on the websit...

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

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 372703ef820c2df056ffea6a1314572abbbaaebf..fc1d46c34ec9c9f92911f34792d8dd62e284eaa5 100644 (file)
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -167,123 +167,18 @@ Java Tools:
  \r
 -------------------------------------------------------------------------------\r
 Quick Start\r
  \r
 -------------------------------------------------------------------------------\r
 Quick Start\r

------------\r
-For editing text files under Windows, use the Wordpad application.  Notepad\r
-does not handle UNIX style newline characters properly.\r
-\r
-Copy the target.template file in the Tools/Conf directory to target.txt, which\r
-must also be in the Tools/Conf directory.\r
-\r
-Edit the text file, target.txt, located in the Tools/Conf directory. This \r
-file contains options for setting the active platform and restricting the build. \r
-The restictions are used to limit the build output by specifying build target(s), \r
-tagname(s) and architecture(s) to less than the full set of possible options. \r
-\r
-The ACTIVE_PLATFORM must be set unless the current working directory contains one\r
-or more FPD files.  All other options need not be set, however by unsetting these\r
-options (by removing the line from the file, or leaving the Value empty) will \r
-result in all available build possibilites when typing build.  By default EDK II\r
-can build a matrix of binaries, using different target types, tool chain tags and \r
-architectures.  Options to target.txt file are as follows:\r
-\r
-ACTIVE_PLATFORM =  Value   RECOMMENDED\r
-  Where Value is the WORKSPACE relative path and filename of a Framework Platform \r
-  Definition (FPD) File.  Example:\r
-\r
-ACTIVE_PLATFORM = MdePkg/MdePkg.fpd\r
-\r
-TARGET = Value             OPTIONAL\r
-  Where Value is a list of one or more of the following: DEBUG, RELEASE or a User\r
-  Defined Target type, such as PERF. Example: \r
-\r
-TARGET = DEBUG RELEASE\r
-\r
-TARGET_ARCH = Value        OPTIONAL\r
-  Where Value is a list of one or more supported Architectures: IA32, X64, IPF or\r
-  EBC.  Example: \r
-\r
-TARGET_ARCH = IA32 X64 EBC\r
-\r
-TOOL_CHAIN_CONF = Value    OPTIONAL\r
-  Where Value is the Filename of an alternate tools_def.txt file created by the\r
-  user.  The alternate tools_def.txt files must be in the Tools/Conf directory.\r
-  These tool definitions are scoped to the WORKSPACE (location of the EDK \r
-  installation) and cannot be shared between WORKSPACES. (You can copy the files\r
-  from one workspace to another.) Example: \r
-\r
-TOOL_CHAIN_CONF = alfred.txt\r
-\r
-TOOL_CHAIN_TAG = Value     OPTIONAL\r
-  Where Value is a list of TagName entries as defined in the tools_def.txt file.\r
-  The TagName can be used to specify different versions of a compiler, i.e., \r
-  gcc 4.0 and gcc 4.1 which will allow you to build binaries with both tool chains \r
-  during the same build - useful during testing of a new compiler tool chain, or \r
-  for changing compiler flags to check out performance with a different set of \r
-  flags than flags used for production.  Example:\r
-\r
-TOOL_CHAIN_TAG = GCC40 GCC41\r
-\r
-To clear a restriction, just remove any data after the equal sign.  To clear\r
-the TARGET_ARCH limitation that was set above, enter: \r
-\r
-TARGET_ARCH =\r
-\r
------------\r
-Copy the tools_def.template file in Tools/Conf to tools_def.txt in the same\r
-directory.\r
-\r
-Edit the tools definition file, tools_def.txt, also located in the Tools/Conf \r
-directory. This file contains the names of the compiler tool chains and the \r
-location of the compiler binaries.  It has been pre-populated with the standard \r
-location for the Microsoft tool chains and includes the standard location of \r
-the Intel C Compiler for EFI Byte Code (EBC.)  In addition, EDK II provides\r
-support for Cygwin, Linux and OS X GCC compiler tool chains.  A script has been\r
-provided in the Tools/gcc directory as well as instructions in obtaining and\r
-building a version of GCC that has been tested.  The tools_def.txt file has\r
-the GCC binary locations that are created using this script.\r
-\r
-Both target.txt and tools_def.txt files are formatted as Property = Value, \r
-which must appear on a single line.  Spanning a Value entry over multiple\r
-lines is not supported at this time.  In the target.txt file, the Property is\r
-a single, uppercase word with underscore characters. These Property names are\r
-fixed by the build system.  The tools_def.txt file's Property is an underscore\r
-delimited coding, which supports some user defined values.  The coding for\r
-the Property is:  TARGET_TAGNAME_ARCH_COMMAND_ATTR  The Value, is either a \r
-full path, full path and filename or a reserved word.\r
-\r
-TARGET  - DEBUG and RELEASE are predefined, however the user may define one or\r
-          more of their own TARGET types in this file.\r
-\r
-TAGNAME - HOST, MSFT, GCC, INTC are predefined, however the user may define \r
-          one or more of their own TAGNAME keywords in this file.\r
-\r
-ARCH    - EDK II supports IA32, X64, IPF and EBC at this time.\r
-\r
-COMMAND - Predefined command codes are listed in the tools_def.txt file, however\r
-          the user can specify additional command codes for their one, non-\r
-          standard tools.\r
-\r
-ATTR    - Predefined Attributes are listed in the tools_def.txt file.\r
-\r
-NOTE: The TAGNAME: HOST is reserved and MUST be defined in order to build the\r
-      included Tiano tools from their C source files.  These tools have been\r
-      built and tested using both Microsoft and GCC tool chains.\r
-NOTE: The "*" symbol may be used as a wildcard character in most of these\r
-      fields, refer to the tools_def.txt and the "EDK II Build and Packaging\r
-      Architecture Specification" for more details.\r
-\r
-\r

 -----------\r
 Follow the instructions at https://edk2.tianocore.org/servlets/ProjectSource to\r
 checkout the entire EDK II source tree.\r
 \r
 In a command window, change to the top level directory of the Edk II sources.\r
 -----------\r
 Follow the instructions at https://edk2.tianocore.org/servlets/ProjectSource to\r
 checkout the entire EDK II source tree.\r
 \r
 In a command window, change to the top level directory of the Edk II sources.\r

-  Set the WORKSPACE environment variable, e.g.:\r

 \r
 \r

-    c:\> set WORKSPACE=C:\MyWork\Edk2\r
+If the active compiler tool chain is GCC, you must set the\r
+environment variable, TOOL_CHAIN to "gcc" before running the\r
+edksetup script.  Example: export TOOL_CHAIN=gcc\r

 \r
 To test your tool chain setup and to build the Supplied Tools, execute:\r
 \r
 To test your tool chain setup and to build the Supplied Tools, execute:\r

-    c:\MyWork\Edk2\> edksetup\r
+    c:\MyWork\edkii\> edksetup ForceBuild\r

 \r
 On Unix systems you must source the edksetup.sh file to load the correct\r
 settings into your shell.\r
 \r
 On Unix systems you must source the edksetup.sh file to load the correct\r
 settings into your shell.\r


@@ -296,12 +191,23 @@ this document.)
             This configures the environment to include the TianoTools and the\r
             Java applications and libraries.\r
 \r
             This configures the environment to include the TianoTools and the\r
             Java applications and libraries.\r
 \r

-If you are confident that none of the tool tool sources have changed, and you\r
-only want to set up the workspace environment you may execute:\r
-   c:\MyWork\Edk2\> edksetup skip\r
+Any changes to the tool source code or XML Schema documents will require that\r
+you run:\r
+   c:\MyWork\edkii\> edksetup ForceBuild\r
+\r
+You will need to set the WORKSPACE environment variable, or run the edksetup\r
+script (without any arguments) any time you want to build.\r
+\r
+  Set the WORKSPACE environment variable, e.g.:\r
+\r
+    c:\> set WORKSPACE=C:\MyWork\edkii\r
+\r
+You may need to edit the text files, Tools/Conf/target.txt and/or\r
+Tools/Conf/tools_def.txt (created by edksetup,) using your favorite \r
+text editor to point to the tools you want to use to build EDK II binaries.\r

 \r
 Once this is completed, you are ready to test the Build, by executing:\r
 \r
 Once this is completed, you are ready to test the Build, by executing:\r

-    c:\MyWork\Edk2\> build\r
+    c:\MyWork\edkii\> build\r

 \r
 This command builds active platform specified in text file target.txt. If \r
 active platform is not specified, go to sub-directory which contains FPD files and\r
 \r
 This command builds active platform specified in text file target.txt. If \r
 active platform is not specified, go to sub-directory which contains FPD files and\r


@@ -315,7 +221,7 @@ After running the setup command, you can build individual platforms.
   In the command window, \r
   1. Set active platform in target.txt, and type "build" in whatever directory;\r
   2. or cd to the platform (FPD file) that you want to build, and just type:\r
   In the command window, \r
   1. Set active platform in target.txt, and type "build" in whatever directory;\r
   2. or cd to the platform (FPD file) that you want to build, and just type:\r

-    c:\MyWork\Edk2\EdkNt32Pkg\> build\r
+    c:\MyWork\edkii\EdkNt32Pkg\> build\r

 \r
   Note that active platform with the high priority to build, that means active \r
   platform will be built even if exists FPD file under current directory. More \r
 \r
   Note that active platform with the high priority to build, that means active \r
   platform will be built even if exists FPD file under current directory. More \r


@@ -335,7 +241,7 @@ Individual Module Builds
 After running the setup command, you can build individual modules.\r
   In the command window, cd to the module that you want to build, and just\r
   type:\r
 After running the setup command, you can build individual modules.\r
   In the command window, cd to the module that you want to build, and just\r
   type:\r

-    c:\MyWork\Edk2\MdePkg\Library\BaseLib\> build\r
+    c:\MyWork\edkii\MdePkg\Library\BaseLib\> build\r

 \r
   Note active platform must be set for individual module build. \r
 \r
 \r
   Note active platform must be set for individual module build. \r
 \r

diff --git a/Tools/Conf/FrameworkDatabase.db b/Tools/Conf/FrameworkDatabase.db
index 6ebbb0ae807e34918efd8f11cdd9803012e51704..e96ed8acec95201d3856cfe6a8531c48ef17495a 100644 (file)
--- a/Tools/Conf/FrameworkDatabase.db
+++ b/Tools/Conf/FrameworkDatabase.db
@@ -3,9 +3,9 @@
   <FdbHeader>\r
     <DatabaseName>FrameworkDatabase</DatabaseName>\r
     <GuidValue>5ce32c23-6448-43ab-b509-a9deae3aae65</GuidValue>\r
   <FdbHeader>\r
     <DatabaseName>FrameworkDatabase</DatabaseName>\r
     <GuidValue>5ce32c23-6448-43ab-b509-a9deae3aae65</GuidValue>\r

-    <Version>0.3</Version>\r
+    <Version>0.5</Version>\r

     <Abstract>The Framework Module Development Packaging System Database</Abstract>\r
     <Abstract>The Framework Module Development Packaging System Database</Abstract>\r

-    <Description>This Database tracks the Basename, Version, Guid and Path for all packages installed in this workspace.</Description>\r
+    <Description>This Database tracks all packages and platforms installed in this workspace.</Description>\r

     <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>\r
     <License>\r
       All rights reserved.\r
     <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>\r
     <License>\r
       All rights reserved.\r


@@ -18,22 +18,17 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </FdbHeader>\r
   <PackageList>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </FdbHeader>\r
   <PackageList>\r

-    <Filename>EdkFatBinPkg/EdkFatBinPkg.spd</Filename>\r
-    <Filename>EdkFatPkg/EdkFatPkg.spd</Filename>\r
+    <Filename>MdePkg/MdePkg.spd</Filename>\r
+    <Filename>Tools/Tools.spd</Filename>\r

     <Filename>EdkModulePkg/EdkModulePkg.spd</Filename>\r
     <Filename>EdkModulePkg/EdkModulePkg.spd</Filename>\r

-\r

     <Filename>EdkNt32Pkg/EdkNt32Pkg.spd</Filename>\r
     <Filename>EdkNt32Pkg/EdkNt32Pkg.spd</Filename>\r

+    <Filename>EdkFatBinPkg/EdkFatBinPkg.spd</Filename>\r

     <Filename>EdkShellBinPkg/EdkShellBinPkg.spd</Filename>\r
     <Filename>EdkShellBinPkg/EdkShellBinPkg.spd</Filename>\r

-    <Filename>MdePkg/MdePkg.spd</Filename>\r
-    <!--\r
-    <Filename>Tools/Tools.spd</Filename>\r
-    -->\r

   </PackageList>\r
   <PlatformList>\r
   </PackageList>\r
   <PlatformList>\r

-    <Filename>EdkNt32Pkg/Nt32.fpd</Filename>\r
-    <Filename>EdkModulePkg/EdkModulePkg-All-Archs.fpd</Filename>\r
-    <Filename>EdkModulePkg/EdkModulePkg.fpd</Filename>\r

     <Filename>MdePkg/MdePkg.fpd</Filename>\r
     <Filename>MdePkg/MdePkg.fpd</Filename>\r

+    <Filename>EdkModulePkg/EdkModulePkg.fpd</Filename>\r
+    <Filename>EdkNt32Pkg/Nt32.fpd</Filename>\r

   </PlatformList>\r
   <FarList>\r
     <Filename>hello.world</Filename>\r
   </PlatformList>\r
   <FarList>\r
     <Filename>hello.world</Filename>\r

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 3da28a453e7fd85b4509b4a18f114740508ce493..3bd4ce6f0d5eafff2a29a899cdbe5cab20c2cbb6 100644 (file)
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -1,3 +1,15 @@
+#\r
+#  Copyright (c) 2006, Intel Corporation\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution.  The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+\r

 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>\r
 \r
 #Default values\r
 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>\r
 \r
 #Default values\r


@@ -12,11 +24,6 @@
 *_MSFT_*_ASL_NAME       = iasl.exe\r
 *_MSFT_*_PP_NAME        = cl.exe\r
 \r
 *_MSFT_*_ASL_NAME       = iasl.exe\r
 *_MSFT_*_PP_NAME        = cl.exe\r
 \r

-# HOST definitions\r
-#*_MSFT_HOST_*_PATH = C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\r
-#*_MSFT_HOST_CC_NAME = icl.exe\r
-\r
-\r

 # IA32 definitions\r
 *_MSFT_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
 *_MSFT_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r
 # IA32 definitions\r
 *_MSFT_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
 *_MSFT_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86\r