Make Logo build following standard build process instead of customize build.

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

diff --git a/EdkNt32Pkg/Logo/Logo.msa b/EdkNt32Pkg/Logo/Logo.msa
index 30708d294e8b7ab1fdf52c650826ca2079dedbbb..6c8eb7758be09a8ba7c69fb38cf8f011e493217b 100644 (file)
--- a/EdkNt32Pkg/Logo/Logo.msa
+++ b/EdkNt32Pkg/Logo/Logo.msa
@@ -2,7 +2,7 @@
 <ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>Logo</ModuleName>\r
-    <ModuleType>USER_DEFINED</ModuleType>\r
+    <ModuleType>BASE</ModuleType>\r
     <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for creating a Logo file.</Abstract>\r
@@ -22,7 +22,6 @@
     <OutputFileBasename>Logo</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <SourceFiles>\r
-    <Filename ToolCode="DUMMY">Logo_build.xml</Filename>\r
     <Filename>Logo.bmp</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r

diff --git a/EdkNt32Pkg/Logo/Logo_build.xml b/EdkNt32Pkg/Logo/Logo_build.xml
deleted file mode 100644 (file)
index 6096015..0000000
--- a/EdkNt32Pkg/Logo/Logo_build.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" ?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<project name="Logo" default="main" basedir="." >\r
-  <!-- Apply external ANT task -->\r
-  <taskdef resource="frameworktasks.tasks" /> \r
-  <taskdef resource="cpptasks.tasks" /> \r
-  <typedef resource="cpptasks.types" /> \r
-  <taskdef resource="net/sf/antcontrib/antlib.xml" />\r
-  <property environment="env" />\r
-  <!-- All Properties --> \r
-  <property name="BASE_NAME" value="Logo" /> \r
-  \r
-  <!-- Default target --> \r
-  <target name="main" depends="sections, output" /> \r
-  \r
-  <target name="sections">\r
-    <OnDependency>\r
-      <sourcefiles>\r
-        <file name="${MODULE_DIR}/logo.bmp"/>\r
-      </sourcefiles>\r
-      <targetfiles>\r
-        <file name="${DEST_DIR_OUTPUT}/Logo.sec"/>\r
-      </targetfiles>\r
-      \r
-      <sequential>\r
-        <gensection inputfile="${MODULE_DIR}/logo.bmp" \r
-          outputfile="${DEST_DIR_OUTPUT}/Logo.sec" \r
-          sectiontype="EFI_SECTION_RAW" />\r
-      </sequential>\r
-    </OnDependency>\r
-  </target>\r
-\r
-  <target name="output" depends="sections">\r
-    <OnDependency>\r
-      <sourcefiles>\r
-        <file name="${DEST_DIR_OUTPUT}/Logo.sec"/>\r
-      </sourcefiles>\r
-      <targetfiles>\r
-        <file name="${BIN_DIR}/${FILE_GUID}-Logo.FFS"/>\r
-      </targetfiles>\r
-\r
-      <sequential>\r
-        <genffsfile BaseName="Logo" \r
-                    ffsATTRIBCHECKSUM="TRUE"\r
-                    ffsFILETYPE="EFI_FV_FILETYPE_FREEFORM" \r
-                    fileGuid="${FILE_GUID}"\r
-                    outputDir="${BIN_DIR}">\r
-          <sectFile fileName="${DEST_DIR_OUTPUT}/Logo.sec"/>\r
-        </genffsfile>\r
-      </sequential>\r
-    </OnDependency>\r
-  </target>\r
-\r
-  <target name="clean">\r
-    <delete includeemptydirs="true">\r
-       <fileset dir="${DEST_DIR_OUTPUT}" excludes="*.xml" includes="**/*"/>\r
-    </delete>\r
-  </target>\r
-\r
-  <target name="cleanall">\r
-    <delete includeemptydirs="true">\r
-       <fileset dir="${DEST_DIR_OUTPUT}" excludes="*.xml" includes="**/*"/>\r
-    </delete>\r
-    <delete includeemptydirs="true">\r
-       <fileset dir="${DEST_DIR_DEBUG}" includes="**/*"/>\r
-    </delete>\r
-  </target>\r
-\r
-</project>\r

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index e41684fa3524babc29a1958d1bbea8e68569a61f..063e5ac32e2b0442f5a315b8fa058bc59dbf37e8 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -4224,7 +4224,7 @@
     <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="7BB28B99-61BB-11D5-9A5D-0090273FC14D">\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
-        <FfsFormatKey>CUSTOM_BUILD</FfsFormatKey>\r
+        <FfsFormatKey>Logo</FfsFormatKey>\r
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
     <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="93B80004-9FB3-11d4-9A3A-0090273FC14D">\r

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 25632730fe56d74916b9b4199678685abb711dc8..0eb9c5742c6cfc8e01197a799ab16029c9a53001 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -1161,6 +1161,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>\r
     </sequential>\r
   </macrodef>\r
+  \r
   <!--\r
     Microcode\r
    -->\r
@@ -1181,7 +1182,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!--\r
     Graphics (bmp, ...)\r
     -->\r
-  <macrodef name="Build_Graphics">\r
+  <macrodef name="Build_BMP">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/> \r
     <attribute name="FILEEXT" default="bmp"/>\r
@@ -1195,6 +1196,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>\r
     </sequential>\r
   </macrodef> \r
+\r
+  <!--\r
+    build EFI file\r
+  -->\r
   <macrodef name="Build_EFI">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r