Remove USER_DEFINED in IncludePkgHeader in spd files as it does not make sense to specify package include header file for a custom build type module. Package creator has no a priori knowledge about what header file will be needed by the USER_DEFINED module customers created in dependent package.

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

1 files changed, 34 insertions, 0 deletions

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 71c8f9b85a..71fd062596 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -930,7 +930,41 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </OnDependency>

     </sequential>

   </macrodef> 

+ <!--

+      Build ACPI Bin File

+    -->

+  <macrodef name="Build_ACPIBIN">

+    <attribute name="FILEPATH"/>

+    <attribute name="FILENAME"/>

+    <attribute name="FILEEXT" default="bin"/>

+

+    <element name="EXTRA.INC" optional="yes"/>

+    <element name="EXTRA.ARG" optional="yes"/>

+    

+    <sequential>

+      <mkdir dir="${DEST_DIR_OUTPUT}"/>

+

+      <OnDependency>

+        <sourcefiles>

+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>

+        </sourcefiles>

+        <targetfiles>

+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>

+        </targetfiles>

+

+        <sequential>

+          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" tofile="${DEST_DIR_OUTPUT}/@{FILENAME}.acpi" />

+  

+          <exec executable="attrib">

+            <arg line="-r ${DEST_DIR_OUTPUT}/@{FILENAME}.acpi"/>

+          </exec>

 

+          <EFI_SECTION_RAW FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="acpi"/>

+        </sequential>

+      </OnDependency>

+    </sequential>

+  </macrodef> 

+  

   <!--

     DUMMY - for skipping the source file which should not be built

     -->