]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Conf/BuildMacro.xml
projects / mirror_edk2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added back of preprocessing of asm files
[mirror_edk2.git] / Tools / Conf / BuildMacro.xml
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index b3a6ff1c3a3b4541fea03bbd7fb19f3fe3a03e54..569608245336c58e63c1bcdb5726acb14aa85682 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -16,15 +16,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!--\r
     C Code\r
     -->\r
-  <macrodef name="Build_C_Code">\r
+  <macrodef name="Build_CCode">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r
     <attribute name="FILEEXT" default="c"/>\r
-\r
+    \r
     <element name="EXTRA.INC" optional="yes"/>\r
     <element name="EXTRA.ARG" optional="yes"/>\r
-\r
+    \r
     <sequential>\r
+      <var name="FILE_BASENAME" value="@{FILENAME}" />\r
+      <var name="FILE_PATH" value="@{FILEPATH}" />\r
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>\r
 \r
       <if>\r
@@ -33,9 +35,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">\r
             <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>\r
-            <includepath path="${WORKSPACE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}/${ARCH}"/>\r
             <EXTRA.INC/>\r
           </makedeps>\r
         </then>\r
@@ -51,29 +50,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
-            <command type="CC" workdir="${DEST_DIR_OUTPUT}">\r
-              <includepath path="${WORKSPACE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"\r
+              outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">\r
               <EXTRA.INC/>\r
-\r
               <argument value="${CC_FLAGS}"/>\r
               <EXTRA.ARG/>\r
-              <!-- <argument value="/FI${DEST_DIR_DEBUG}/AutoGen.h" /> -->\r
-              <includeFile value="${DEST_DIR_DEBUG}/AutoGen.h"/>\r
-              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->\r
-              <outputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
-\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
         </sequential>\r
       </OnDependency>\r
-\r
-      <!--\r
-        for library generation later\r
-        -->\r
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> \r
     </sequential>\r
   </macrodef>\r
 \r
@@ -87,6 +73,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
 \r
     <sequential>\r
+      <var name="FILE_BASENAME" value="@{FILENAME}" />\r
+      <var name="FILE_PATH" value="@{FILEPATH}" />\r
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>\r
 \r
       <if>\r
@@ -95,9 +83,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">\r
             <input file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>\r
-            <includepath path="${WORKSPACE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}/${ARCH}"/>\r
             <EXTRA.INC/>\r
           </makedeps>\r
         </then>\r
@@ -113,40 +98,31 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
-            <command type="CC" workdir="${DEST_DIR_OUTPUT}">\r
-              <includepath path="${WORKSPACE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"\r
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">\r
               <EXTRA.INC/>\r
-    \r
               <argument value="${CC_FLAGS}"/>\r
               <EXTRA.ARG/>\r
-              <!-- <argument value="/FI${DEST_DIR_DEBUG}/AutoGen.h" />  -->\r
-              <includeFile value="${DEST_DIR_DEBUG}/AutoGen.h"/>\r
-              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->\r
-              <outputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
-    \r
               <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
         </sequential>\r
       </OnDependency>\r
-      <!--\r
-        for library generation later\r
-        -->\r
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> \r
     </sequential>\r
   </macrodef>\r
 \r
-  <macrodef name="Build_Dependency_File">\r
+  <macrodef name="Build_DPX">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r
     <attribute name="FILEEXT" default="dxs"/>\r
 \r
     <element name="EXTRA.INC" optional="yes"/>\r
     <element name="EXTRA.ARG" optional="yes"/>\r
+        \r
 \r
     <sequential>\r
+      <var name="FILE_BASENAME" value="@{FILENAME}" />\r
+      <var name="FILE_PATH" value="@{FILEPATH}" />\r
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>\r
 \r
       <OnDependency>\r
@@ -154,50 +130,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
         </sourcefiles>\r
         <targetfiles>\r
-          <file name="${DEST_DIR_OUTPUT}/${BASE_NAME}.@{FILEEXT}.depex"/>\r
+          <file name="${DEST_DIR_OUTPUT}/${BASE_NAME}.depex"/>\r
         </targetfiles>\r
 \r
         <sequential>\r
-          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
-                tofile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>\r
 \r
           <cc userdefine="on">\r
-            <command type="CC" workdir=".">\r
-              <includepath path="${DEST_DIR_DEBUG}" /> \r
-              <includepath path="${WORKSPACE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}">\r
               <EXTRA.INC/>\r
               <argument value="${PP_FLAGS}"/>\r
-              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>\r
-              <outputFile value="@{FILENAME}.@{FILEEXT}.i"/>\r
+              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
     \r
-          <gendepex inputFile="@{FILENAME}.@{FILEEXT}.i" outputFile="${DEST_DIR_OUTPUT}/${BASE_NAME}.@{FILEEXT}.depex"/>\r
-          <delete file="@{FILENAME}.@{FILEEXT}.i" />\r
-          <delete file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c" /> \r
+          <gendepex inputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.i" outputFile="${DEST_DIR_OUTPUT}/${BASE_NAME}.depex"/>\r
         </sequential>\r
       </OnDependency>\r
     </sequential>\r
   </macrodef>\r
   \r
-<!-- Usage Example\r
-   <Build_C_Code\r
-     FILEPATH="."\r
-     FILENAME="${SOURCE_NAME}"\r
-     FILEEXT="c">\r
-     <EXTRA.INC>\r
-       <includepath path="${PACKAGE_DIR}/Include"/>\r
-       <includepath path="${PACKAGE_DIR}/Include/${ARCH}"/>\r
-     </EXTRA.INC>\r
-\r
-     <EXTRA.ARG>\r
-       <argument value="/D EFI_DEBUG /D EFI_WHATEVER_FLAG"/>\r
-     </EXTRA.ARG>\r
-   </Build_C_Code>\r
-  -->\r
+  <macrodef name="Build_ASM">\r
+    <attribute name="FILEPATH"/>\r
+    <attribute name="FILENAME"/>\r
+    <attribute name="FILEEXT" default="asm"/>\r
 \r
+    <element name="EXTRA.INC" optional="yes"/>\r
+    <element name="EXTRA.ARG" optional="yes"/>\r
+    \r
+    <!-- Dispath ASM file, there are three type. \r
+         asm,s   -   Build_Assembly\r
+         S       -   Build_Ipf_Assembly -->\r
+    <sequential>\r
+           <if>\r
+             <or>\r
+               <equals arg1="@{FILEEXT}" arg2="asm" />\r
+               <equals arg1="@{FILEEXT}" arg2="s" />\r
+             </or>\r
+             <then>\r
+               <Build_Assembly FILEPATH="@{FILEPATH}" FILENAME="@{FILENAME}" FILEEXT="@{FILEEXT}">\r
+            <EXTRA.INC.1><EXTRA.INC /></EXTRA.INC.1>\r
+            <EXTRA.ARG.1><EXTRA.ARG /></EXTRA.ARG.1>\r
+          </Build_Assembly>\r
+             </then>\r
+             <elseif>\r
+               <equals arg1="@{FILEEXT}" arg2="S" />\r
+               <then>\r
+                 <Build_IPF_Assembly_Code FILEPATH="@{FILEPATH}" FILENAME="@{FILENAME}" FILEEXT="@{FILEEXT}">\r
+                   <EXTRA.INC.1><EXTRA.INC /></EXTRA.INC.1>\r
+              <EXTRA.ARG.1><EXTRA.ARG /></EXTRA.ARG.1>\r
+            </Build_IPF_Assembly_Code>\r
+               </then>\r
+             </elseif>\r
+           </if>\r
+    </sequential>\r
+  </macrodef>\r
+  \r
   <!--\r
     IA32/x64 Assembly\r
     -->\r
@@ -206,10 +193,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <attribute name="FILENAME"/>\r
     <attribute name="FILEEXT" default="asm"/>\r
 \r
-    <element name="EXTRA.INC" optional="yes"/>\r
-    <element name="EXTRA.ARG" optional="yes"/>\r
+    <element name="EXTRA.INC.1" optional="yes"/>\r
+    <element name="EXTRA.ARG.1" optional="yes"/>\r
 \r
     <sequential>\r
+      <var name="FILE_BASENAME" value="@{FILENAME}" />\r
+      <var name="FILE_PATH" value="@{FILEPATH}" />\r
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>\r
 \r
       <OnDependency>\r
@@ -222,121 +211,41 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
-            <command type="ASM">\r
-              <includepath path="${WORKSPACE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
-              <EXTRA.INC/>\r
-      \r
-              <argument value="${ASM_FLAGS}"/>\r
-              <EXTRA.ARG/>\r
-              <argument value="/Fl${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.lst"/>\r
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
-      \r
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}">\r
+              <EXTRA.INC.1/>\r
+              <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
-        </sequential>\r
-      </OnDependency>\r
-      <!--\r
-        for library generation later\r
-        -->\r
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
-    </sequential>\r
-  </macrodef>\r
-\r
-  <!--\r
-    Library    private HashMap map = new HashMap();\r
-    -->\r
-  <macrodef name="Build_Library">\r
-    <attribute name="FILENAME" />\r
-    <attribute name="FILEEXT" default="obj"/>\r
-\r
-    <element name="EXTRA.INC" optional="yes"/>\r
-    <element name="EXTRA.ARG" optional="yes"/>\r
 \r
-    <sequential>\r
-      <mkdir dir="${BIN_DIR}"/>\r
+          <replaceregexp file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"\r
+                         match="^(#line +1 +.*@{FILEPATH}/@{FILENAME}\.@{FILEEXT}&quot;).+\1"\r
+                         replace=";"\r
+                         flags="gs"/>\r
+          <replaceregexp file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"\r
+                         match="^(#line .*)$"\r
+                         replace="; \1"\r
+                         byline="true"/>\r
+          <replaceregexp file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"\r
+                         match="([^_a-zA-Z])0x([0-9a-fA-F]+)"\r
+                         replace="\10\2h"\r
+                         flags="g"\r
+                         byline="true"/>\r
 \r
-      <OnDependency>\r
-        <sourcefiles>\r
-          <file list="${OBJECTS}"/>\r
-        </sourcefiles>\r
-        <targetfiles>\r
-          <file name="${BIN_DIR}/@{FILENAME}.lib"/>\r
-        </targetfiles>\r
-\r
-        <sequential>\r
-          <!--  <echo>re-generate library</echo> -->\r
           <cc userdefine="on">\r
-            <command type="LIB">\r
-              <argument value="${LIB_FLAGS}"/>\r
-              <!--<argument value="${OBJECTS}"/>-->\r
-              <FileList dir="" files="${OBJECTS}"/>\r
-              <!-- <argument value="/out:${BIN_DIR}/@{FILENAME}.lib"/> -->\r
-              <OutputFile value="${BIN_DIR}/@{FILENAME}.lib"/>\r
-            </command>\r
-          </cc>\r
-        </sequential>\r
-      </OnDependency>\r
-    </sequential>\r
-  </macrodef>\r
-\r
-  <!--\r
-    GCC Assembly\r
-    -->\r
-  <macrodef name="Build_GCC_Assembly_Code">\r
-    <attribute name="FILEPATH"/>\r
-    <attribute name="FILENAME"/>\r
-    <attribute name="FILEEXT" default="s"/>\r
-\r
-    <element name="EXTRA.INC" optional="yes"/>\r
-    <element name="EXTRA.ARG" optional="yes"/>\r
-\r
-    <sequential>\r
-      <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>\r
-\r
-      <if>\r
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
-        <then>\r
-          <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">\r
-            <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
-            <includepath path="${WORKSPACE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}/${ARCH}"/>\r
-            <EXTRA.INC/>\r
-          </makedeps>\r
-        </then>\r
-      </if>\r
-\r
-      <OnDependency>\r
-        <sourcefiles>\r
-          <file listfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep"/>\r
-        </sourcefiles>\r
-        <targetfiles>\r
-          <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
-        </targetfiles>\r
-\r
-        <sequential>\r
-      \r
-          <cc userdefine="on">\r
-            <command type="ASM" includepathDelimiter="-I">\r
-              <EXTRA.INC/>\r
+            <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"\r
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">\r
+              <EXTRA.INC.1/>\r
       \r
               <argument value="${ASM_FLAGS}"/>\r
-              <EXTRA.ARG/>\r
-              <!-- <argument value="-o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->\r
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
+              <EXTRA.ARG.1/>\r
       \r
-              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
+              <!-- fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/ -->\r
+              <fileset casesensitive="off" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"/>\r
             </command>\r
           </cc>\r
         </sequential>\r
       </OnDependency>\r
-      <!--\r
-        for library generation later\r
-        -->\r
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
     </sequential>\r
   </macrodef>\r
 \r
@@ -348,8 +257,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <attribute name="FILENAME"/>\r
     <attribute name="FILEEXT" default="s"/>\r
 \r
-    <element name="EXTRA.INC" optional="yes"/>\r
-    <element name="EXTRA.ARG" optional="yes"/>\r
+    <element name="EXTRA.INC.1" optional="yes"/>\r
+    <element name="EXTRA.ARG.1" optional="yes"/>\r
 \r
     <sequential>\r
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>\r
@@ -359,10 +268,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <then>\r
           <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">\r
             <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
-            <includepath path="${WORKSPACE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}/${ARCH}"/>\r
-            <EXTRA.INC/>\r
+            <EXTRA.INC.1/>\r
           </makedeps>\r
         </then>\r
       </if>\r
@@ -376,42 +282,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
 \r
         <sequential>\r
-          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
-                tofile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>\r
           <cc userdefine="on">\r
-            <command type="CC" workdir="."> \r
-              <includepath path="${WORKSPACE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
-              <EXTRA.INC/>\r
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}">\r
+              <EXTRA.INC.1/>\r
               <argument value="${PP_FLAGS}"/>\r
-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c"/>\r
+              <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
-          <move file="@{FILENAME}.@{FILEEXT}.i" \r
-                tofile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pro"/>\r
       \r
           <cc userdefine="on">\r
-            <command type="ASM" includepathDelimiter="-I">\r
-              <includepath path="${WORKSPACE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
-              <EXTRA.INC/>\r
-      \r
+            <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"\r
+                includepathDelimiter="-I" outputDelimiter="-o"\r
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">\r
+              <EXTRA.INC.1/>\r
               <argument value="${ASM_FLAGS}"/>\r
-              <EXTRA.ARG/>\r
-              <!-- <argument value="-o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->\r
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
-      \r
-              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pro"/>\r
+              <EXTRA.ARG.1/>\r
+              <fileset casesensitive="off" file="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i"/>\r
             </command>\r
           </cc>\r
         </sequential>\r
       </OnDependency>\r
-      <!--\r
-        for library generation later\r
-        -->\r
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
     </sequential>\r
   </macrodef>\r
 \r
@@ -442,35 +332,48 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
         </command>\r
       </cc>\r
-  \r
-      <!--\r
-        for library generation later\r
-        -->\r
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
     </sequential>\r
   </macrodef>\r
   \r
-  <!--\r
-    [Build.Ia32.Makefile,Build.Ipf.Makefile,Build.Ebc.Makefile]\r
-    [Build.Ia32.Custom_Makefile,Build.Ipf.Custom_Makefile,Build.Ebc.Custom_Makefile]\r
+  \r
+    <!--\r
+    Library    private HashMap map = new HashMap();\r
     -->\r
-  <macrodef name="Build_Custom_Build">\r
-    <attribute name="FILEPATH"/>\r
-    <attribute name="FILENAME"/>\r
-    <attribute name="FILEEXT" default="c"/>\r
+  <macrodef name="Build_Library">\r
+    <attribute name="FILENAME" />\r
+    <attribute name="FILEEXT" default="obj"/>\r
+    \r
+    <sequential>\r
+      <var name="FILE_BASENAME" value="@{FILENAME}" />\r
+      <var name="FILE_PATH" value="." />\r
+      <mkdir dir="${BIN_DIR}"/>\r
 \r
-    <element name="EXTRA.INC" optional="yes"/>\r
-    <element name="EXTRA.ARG" optional="yes"/>\r
+      <OnDependency>\r
+        <sourcefiles>\r
+          <file list="${OBJECTS}"/>\r
+        </sourcefiles>\r
+        <targetfiles>\r
+          <file name="${BIN_DIR}/@{FILENAME}.lib"/>\r
+        </targetfiles>\r
 \r
-    <sequential>\r
+        <sequential>\r
+          <cc userdefine="on">\r
+            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"\r
+                outputFile="${BIN_DIR}/@{FILENAME}.lib">\r
+              <argument value="${SLINK_FLAGS}"/>\r
 \r
+              <fileset casesensitive="off" dir="${DEST_DIR_OUTPUT}" includes="**/*.obj"/>\r
+            </command>\r
+          </cc>\r
+        </sequential>\r
+      </OnDependency>\r
     </sequential>\r
   </macrodef>\r
 \r
   <!--\r
     Unicode -> .sdb\r
     -->\r
-  <macrodef name="Build_Unicode">\r
+  <macrodef name="Build_UNI">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r
     <attribute name="FILEEXT" default="uni"/>\r
@@ -492,9 +395,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>\r
           <strgather commandtype="parse" newdatabase="true">\r
             <database name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>\r
-            <includepath path="${WORKSPACE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}/${ARCH}"/>\r
             <EXTRA.INC/>\r
             <EXTRA.ARG/>\r
             <inputfile name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
@@ -502,7 +402,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </sequential>\r
       </OnDependency>\r
 \r
-      <bl name="SDB_FILES" value="${SDB_FILES}, ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>\r
+      <var name="SDB_FILES" value="${SDB_FILES}, ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>\r
     </sequential>\r
   </macrodef>\r
 \r
@@ -518,6 +418,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
 \r
     <sequential>\r
+      <var name="FILE_BASENAME" value="@{FILENAME}" />\r
+      <var name="FILE_PATH" value="@{FILEPATH}" />\r
       <OnDependency>\r
         <sourcefiles>\r
           <file list="${SDB_FILES}"/>\r
@@ -567,28 +469,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         \r
         <sequential>\r
           <cc userdefine="on">\r
-            <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">\r
-              <includepath path="${WORKSPACE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
-\r
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"\r
+                     includepathDelimiter="-I"\r
+                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj">\r
               <argument value="${CC_FLAGS}"/>\r
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>\r
-\r
+              <EXTRA.INC />\r
               <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>\r
             </command>\r
           </cc>\r
         </sequential>\r
       </OnDependency>\r
 \r
-      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>\r
     </sequential>\r
   </macrodef>\r
 \r
   <!--\r
     Vfr\r
     -->\r
-  <macrodef name="Build_Vfr">\r
+  <macrodef name="Build_VFR">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r
     <attribute name="FILEEXT" default="vfr"/>\r
@@ -604,10 +502,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <then>\r
           <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">\r
             <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
-            <!-- <input file="${DEST_DIR_DEBUG}/AutoGen.h"/> -->\r
-            <includepath path="${WORKSPACE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}/${ARCH}"/>\r
             <EXTRA.INC/>\r
           </makedeps>\r
         </then>\r
@@ -623,29 +517,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <vfrcompile createIfrBinFile="on" createListFile="on" outPutDir="${DEST_DIR_DEBUG}/@{FILEPATH}" vfrFile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}">\r
-            <includepath path="${WORKSPACE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}"/>\r
-            <includepath path="${MODULE_DIR}/${ARCH}"/>\r
             <EXTRA.INC/>\r
           </vfrcompile>\r
     \r
           <cc userdefine="on">\r
-            <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">\r
-              <includepath path="${WORKSPACE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}"/>\r
-              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
+            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" \r
+                     includepathDelimiter="-I"\r
+                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >\r
               <argument value="${CC_FLAGS}"/>\r
-              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
+              <EXTRA.INC/>\r
               <EXTRA.ARG/>\r
-    \r
               <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.c"/>\r
             </command>\r
           </cc>\r
-    \r
-          <delete file="@{FILENAME}.i"/>\r
+          <delete file="${PLATFORM_DIR}/@{FILENAME}.i" />\r
         </sequential>\r
       </OnDependency>\r
-      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
     </sequential>\r
   </macrodef>\r
 \r
@@ -664,9 +551,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="LINK.ARG" optional="yes"/>\r
 \r
     <sequential>\r
+      <var name="FILE_BASENAME" value="@{FILENAME}" />\r
+      <var name="FILE_PATH" value="@{FILEPATH}" />\r
       <OnDependency>\r
         <sourcefiles>\r
-          <file list="${OBJECTS}"/>\r
+          <!--fileset casesensitive="off" dir="${DEST_DIR_OUTPUT}" includes="**/*.obj" /-->\r
           <file list="${LIBS}"/>\r
         </sourcefiles>\r
         <targetfiles>\r
@@ -675,15 +564,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
-            <command type="LINK">\r
-              <argument value="${LINK_FLAGS}"/>\r
+            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"\r
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib">\r
+              <argument value="${SLINK_FLAGS}"/>\r
+\r
+              <fileset casesensitive="off" dir="${DEST_DIR_OUTPUT}" includes="**/*.obj"/>\r
+            </command>\r
+          </cc>\r
+          <cc userdefine="on">\r
+            <command type="DLINK" cmd="${DLINK}" family="${DLINK_FAMILY}"\r
+                     outputFile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll" >\r
+              <argument value="${DLINK_FLAGS}"/>\r
               <libset libs="${LIBS}"/>\r
+              <libset libs="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib"/>\r
+              <libset libs="${DLINK_SPATH}" />\r
               <LINK.ARG/>\r
-              <EntryPoint value="_ModuleEntryPoint"/>\r
-              <map value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.map"/>\r
-              <pdb value="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pdb"/>\r
-              <OutputFile value="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>\r
-              <FileList dir="" files="${OBJECTS}"/>\r
             </command>\r
           </cc>\r
         </sequential>\r
@@ -709,7 +604,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
 \r
         <sequential>\r
-          <fwimage componenttype="${COMPONENT_TYPE}" outImage="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" \r
+          <!-- -->\r
+          <fwimage componentType="${MODULE_TYPE}" outImage="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" \r
                    peImage="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" time="0"/>\r
         </sequential>\r
       </OnDependency>\r
@@ -734,7 +630,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!--\r
     EFI_SECTION_PE32\r
     -->\r
-  <macrodef name="EFI_SECTION_PE32">\r
+\r
+  <macrodef name="EFI_SECTION_TE">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r
     <attribute name="FILEEXT" default="" />\r
@@ -744,10 +641,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
     <sequential>\r
       <PRE.PROCESS/>\r
-\r
       <if>\r
         <not>\r
-          <equals arg1="${OBJECTS}" arg2=""/>\r
+          <equals arg1="${LIBS}" arg2=""/>\r
         </not>\r
 \r
         <then>\r
@@ -755,11 +651,64 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <LIB.ARG></LIB.ARG>\r
             <LINK.ARG></LINK.ARG>\r
           </GenDll>\r
-    \r
+\r
           <GenEfi FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="dll"/>\r
         </then>\r
       </if>\r
 \r
+      <OnDependency>\r
+        <sourcefiles>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>\r
+        </sourcefiles>\r
+        <targetfiles>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.tes"/>\r
+        </targetfiles>\r
+\r
+        <sequential>\r
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${BIN_DIR}/@{FILENAME}.efi" />\r
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />          \r
+          <genteimage Dump="false" Verbose="false" OutputDir="" OutputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" InputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>\r
+          <!-- \r
+          <exec executable="${GENTEIMAGE}">\r
+            <arg line="-o ${DEST_DIR_OUTPUT}/@{FILENAME}.te ${DEST_DIR_OUTPUT}/@{FILENAME}.efi" />\r
+          </exec>\r
+          -->\r
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.te" tofile="${BIN_DIR}/@{FILENAME}.te" />\r
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" \r
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.tes" \r
+                      sectiontype="EFI_SECTION_TE"/>\r
+          <POST.PROCESS/>\r
+        </sequential>\r
+      </OnDependency>\r
+    </sequential>\r
+  </macrodef>\r
+\r
+  <macrodef name="EFI_SECTION_PE32">\r
+    <attribute name="FILEPATH"/>\r
+    <attribute name="FILENAME"/>\r
+    <attribute name="FILEEXT" default="" />\r
+\r
+    <element name="PRE.PROCESS" optional="yes"/>\r
+    <element name="POST.PROCESS" optional="yes"/>\r
+\r
+    <sequential>\r
+      <PRE.PROCESS/>\r
+      <if>\r
+        <not>\r
+          <!-- TBD ${OBJECTS} -->\r
+          <equals arg1="${LIBS}" arg2=""/>\r
+        </not>\r
+\r
+        <then>\r
+          <GenDll FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="">\r
+            <LIB.ARG></LIB.ARG>\r
+            <LINK.ARG></LINK.ARG>\r
+          </GenDll>\r
+\r
+          <GenEfi FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="dll"/>\r
+        </then>\r
+      </if>\r
+      \r
       <OnDependency>\r
         <sourcefiles>\r
           <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>\r
@@ -770,6 +719,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${BIN_DIR}/@{FILENAME}.efi" />\r
+          \r
           <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" \r
                       outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.pe32" \r
                       sectiontype="EFI_SECTION_PE32"/>\r
@@ -777,6 +727,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <POST.PROCESS/>\r
         </sequential>\r
       </OnDependency>\r
+      <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />\r
     </sequential>\r
   </macrodef>\r
 \r
@@ -871,17 +822,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <PRE.PROCESS/>\r
 \r
       <if>\r
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>\r
+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"/>\r
         <then>\r
           <OnDependency>\r
             <sourcefiles>\r
-              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>\r
+              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"/>\r
             </sourcefiles>\r
             <targetfiles>\r
               <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>\r
             </targetfiles>\r
             <sequential>\r
-              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex" \r
+              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.depex" \r
                           outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx" \r
                           sectiontype="EFI_SECTION_DXE_DEPEX"/>\r
             </sequential>\r
@@ -916,18 +867,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>\r
       <PRE.PROCESS/>\r
       <if>\r
-        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>\r
+        <available type="file" file="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"/>\r
         <then>\r
           <OnDependency>\r
             <sourcefiles>\r
-              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"/>\r
+              <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.depex"/>\r
             </sourcefiles>\r
             <targetfiles>\r
               <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>\r
             </targetfiles>\r
 \r
             <sequential>\r
-              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex" \r
+              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.depex" \r
                           outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx" \r
                           sectiontype="EFI_SECTION_PEI_DEPEX"/>\r
             </sequential>\r
@@ -967,23 +918,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </macrodef>\r
     -->\r
 \r
-  <!--\r
+  <!-- \r
     EFI_SECTION_TE\r
-    <macrodef name="EFI_SECTION_TE">\r
-      <attribute name="FILEPATH"/>\r
-      <attribute name="FILENAME"/>\r
-      <attribute name="FILEEXT" default=""/>\r
-  \r
-      <element name="EXTRA.INC" optional="yes"/>\r
-      <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
-      <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \r
-                    sectiontype="EFI_SECTION_PE32"/>\r
-      </sequential>\r
-    </macrodef>\r
-    -->\r
+  -->\r
+\r
 \r
   <!--\r
     EFI_SECTION_RAW\r
@@ -1016,60 +954,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </sequential>\r
   </macrodef>\r
 \r
-  <!--\r
-    EFI_SECTION_COMPRESSION\r
-    <macrodef name="EFI_SECTION_COMPRESSION">\r
-      <attribute name="FILEPATH"/>\r
-      <attribute name="FILENAME"/>\r
-      <attribute name="FILEEXT" default=""/>\r
-  \r
-      <element name="EXTRA.INC" optional="yes"/>\r
-      <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
-      <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \r
-                    sectiontype="EFI_SECTION_PE32"/>\r
-      </sequential>\r
-    </macrodef>\r
-    -->\r
-\r
-  <!--\r
-    EFI_SECTION_GUID_DEFINED\r
-    <macrodef name="EFI_SECTION_GUID_DEFINED">\r
-      <attribute name="FILEPATH"/>\r
-      <attribute name="FILENAME"/>\r
-      <attribute name="FILEEXT" default=""/>\r
-  \r
-      <element name="EXTRA.INC" optional="yes"/>\r
-      <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
-      <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \r
-                    sectiontype="EFI_SECTION_PE32"/>\r
-      </sequential>\r
-    </macrodef>\r
-    -->\r
-\r
-  <!--\r
-    EFI_SECTION_COMPATIBILITY16\r
-    <macrodef name="EFI_SECTION_COMPATIBILITY16">\r
-      <attribute name="FILEPATH"/>\r
-      <attribute name="FILENAME"/>\r
-      <attribute name="FILEEXT" default=""/>\r
-  \r
-      <element name="EXTRA.INC" optional="yes"/>\r
-      <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
-      <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \r
-                    sectiontype="EFI_SECTION_PE32"/>\r
-      </sequential>\r
-    </macrodef>\r
-  \r
-    -->\r
   <!--\r
     EFI_SECTION_FIRMWARE_VOLUME_IMAGE\r
     -->\r
@@ -1139,7 +1023,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>\r
     </sequential>\r
-  </macrodef>\r
+  </macrodef> \r
   <macrodef name="Build_EFI">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r
EFI Development Kit II mirror for PVE