Fix a bug for token number set in FPD can not exceed 2^31. The fixing is using Long...

[mirror_edk2.git] / Tools / Conf / BuildMacro.xml

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index b8d3cd5032338f5baf130f5aa171751d344a1e79..7790c4cffe5f1315504c5ee05edf9e17cb4d1611 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -73,7 +73,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!--\r
         for library generation later\r
         -->\r
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> \r
+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
     </sequential>\r
   </macrodef>\r
 \r
@@ -118,14 +118,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <includepath path="${MODULE_DIR}"/>\r
               <includepath path="${MODULE_DIR}/${ARCH}"/>\r
               <EXTRA.INC/>\r
-    \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
+\r
               <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
@@ -134,7 +134,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <!--\r
         for library generation later\r
         -->\r
-      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> \r
+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
     </sequential>\r
   </macrodef>\r
 \r
@@ -158,12 +158,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
 \r
         <sequential>\r
-          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \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="${DEST_DIR_DEBUG}" />\r
               <includepath path="${WORKSPACE_DIR}"/>\r
               <includepath path="${MODULE_DIR}"/>\r
               <includepath path="${MODULE_DIR}/${ARCH}"/>\r
@@ -173,15 +173,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <outputFile value="@{FILENAME}.@{FILEEXT}.i"/>\r
             </command>\r
           </cc>\r
-    \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
+          <delete file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.c" />\r
         </sequential>\r
       </OnDependency>\r
     </sequential>\r
   </macrodef>\r
-  \r
+\r
 <!-- Usage Example\r
    <Build_C_Code\r
      FILEPATH="."\r
@@ -227,15 +227,103 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <includepath path="${MODULE_DIR}"/>\r
               <includepath path="${MODULE_DIR}/${ARCH}"/>\r
               <EXTRA.INC/>\r
-      \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
+\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
+    Build x86 assembly with C preprocessing on AutoGen.h\r
+    -->\r
+  <macrodef name="Build_x86_asm_autogen">\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
+    <sequential>\r
+      <mkdir dir="${DEST_DIR_DEBUG}/@{FILEPATH}"/>\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="${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
+      </if>\r
+\r
+      <OnDependency>\r
+        <sourcefiles>\r
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\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
+          <cc userdefine="on">\r
+            <command type="CC" workdir="${DEST_DIR_DEBUG}/@{FILEPATH}">\r
+              <includepath path="${WORKSPACE_DIR}"/>\r
+              <includepath path="${MODULE_DIR}"/>\r
+              <includepath path="${MODULE_DIR}/${ARCH}"/>\r
+              <EXTRA.INC/>\r
+              <argument value="${PP_FLAGS}"/>\r
+              <argument value="/FI${DEST_DIR_DEBUG}/AutoGen.h"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
+          <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
+                         match="^(#line +1 +.*@{FILEPATH}/@{FILENAME}\.@{FILEEXT}&quot;).+\1"\r
+                         replace="; Source: ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
+                         flags="gs"/>\r
+          <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
+                         match="^(#line .*)$"\r
+                         replace="; \1"\r
+                         byline="true"/>\r
+          <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
+                         match="([^_a-zA-Z])0x([0-9a-fA-F]+)"\r
+                         replace="\10\2h"\r
+                         flags="g"\r
+                         byline="true"/>\r
+          <move file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
+                tofile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\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
+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
+            </command>\r
+          </cc>\r
         </sequential>\r
       </OnDependency>\r
       <!--\r
@@ -282,6 +370,64 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </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
+\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="${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
     IPF Assembly\r
     -->\r
@@ -294,6 +440,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
 \r
     <sequential>\r
+      <mkdir dir="${DEST_DIR_DEBUG}/@{FILEPATH}"/>\r
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>\r
 \r
       <if>\r
@@ -318,33 +465,30 @@ 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
+            <command type="CC" workdir="${DEST_DIR_DEBUG}/@{FILEPATH}">\r
               <includepath path="${WORKSPACE_DIR}"/>\r
               <includepath path="${MODULE_DIR}"/>\r
               <includepath path="${MODULE_DIR}/${ARCH}"/>\r
               <EXTRA.INC/>\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
+          <move file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.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
+\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
+\r
               <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.pro"/>\r
             </command>\r
           </cc>\r
@@ -368,30 +512,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
     <sequential>\r
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>\r
-  \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
+\r
           <argument value="${ASM_FLAGS}"/>\r
           <EXTRA.ARG/>\r
           <!-- <argument value="-o ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/> -->\r
           <OutputFile File="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
-  \r
+\r
           <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
         </command>\r
       </cc>\r
-  \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
   <!--\r
     [Build.Ia32.Makefile,Build.Ipf.Makefile,Build.Ebc.Makefile]\r
     [Build.Ia32.Custom_Makefile,Build.Ipf.Custom_Makefile,Build.Ebc.Custom_Makefile]\r
@@ -468,7 +612,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <targetfiles>\r
           <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb"/>\r
         </targetfiles>\r
-        \r
+\r
         <sequential>\r
           <strgather commandtype="scan" outputdatabase="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.sdb" verbose="read">\r
             <skipext name=".uni"/>\r
@@ -488,7 +632,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.hpk"/>\r
           <file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>\r
         </targetfiles>\r
-        \r
+\r
         <sequential>\r
           <strgather basename="@{FILENAME}Strings" commandtype="dump"\r
                      outputdefines="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}StrDefs.h"\r
@@ -506,7 +650,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <targetfiles>\r
           <file name="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj"/>\r
         </targetfiles>\r
-        \r
+\r
         <sequential>\r
           <cc userdefine="on">\r
             <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">\r
@@ -570,7 +714,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <includepath path="${MODULE_DIR}/${ARCH}"/>\r
             <EXTRA.INC/>\r
           </vfrcompile>\r
-    \r
+\r
           <cc userdefine="on">\r
             <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">\r
               <includepath path="${WORKSPACE_DIR}"/>\r
@@ -579,11 +723,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <argument value="${CC_FLAGS}"/>\r
               <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj"/>\r
               <EXTRA.ARG/>\r
-    \r
+\r
               <fileset casesensitive="off" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.c"/>\r
             </command>\r
           </cc>\r
-    \r
+\r
           <delete file="@{FILENAME}.i"/>\r
         </sequential>\r
       </OnDependency>\r
@@ -616,16 +760,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
 \r
         <sequential>\r
+          <cc userdefine="on">\r
+            <command type="LIB">\r
+              <argument value="${LIB_FLAGS}"/>\r
+              <FileList dir="" files="${OBJECTS}"/>\r
+              <LIB.ARG/>\r
+              <OutputFile value="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib"/>\r
+            </command>\r
+          </cc>\r
           <cc userdefine="on">\r
             <command type="LINK">\r
               <argument value="${LINK_FLAGS}"/>\r
-              <libset libs="${LIBS}"/>\r
+              <libset libs="${LIBS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib"/>\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
+              <!-- <FileList dir="" files="${OBJECTS}"/> -->\r
             </command>\r
           </cc>\r
         </sequential>\r
@@ -651,8 +803,15 @@ 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
+          <if>\r
+            <equals arg1="${COMPONENT_TYPE}" arg2="SEC"/>\r
+            <then>\r
+              <var name="COMPONENT_TYPE" value="SECURITY_CORE"/>\r
+            </then>\r
+          </if>\r
+          <fwimage componenttype="${COMPONENT_TYPE}" outImage="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"\r
                    peImage="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" time="0"/>\r
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />\r
         </sequential>\r
       </OnDependency>\r
     </sequential>\r
@@ -697,7 +856,7 @@ 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
@@ -712,10 +871,10 @@ 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
-          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" \r
-                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.pe32" \r
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"\r
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.pe32"\r
                       sectiontype="EFI_SECTION_PE32"/>\r
-    \r
+\r
           <POST.PROCESS/>\r
         </sequential>\r
       </OnDependency>\r
@@ -742,7 +901,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <then>\r
           <PRE.PROCESS/>\r
-          <gensection outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ver" \r
+          <gensection outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ver"\r
                       versionnum="@{VERSION}"\r
                       sectiontype="EFI_SECTION_VERSION"/>\r
           <POST.PROCESS/>\r
@@ -772,7 +931,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <then>\r
           <PRE.PROCESS/>\r
           <gensection interfacestring="@{UI}"\r
-                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ui" \r
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.ui"\r
                       sectiontype="EFI_SECTION_USER_INTERFACE"/>\r
           <POST.PROCESS/>\r
         </then>\r
@@ -786,13 +945,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <attribute name="FILEPATH"/>\r
       <attribute name="FILENAME"/>\r
       <attribute name="FILEEXT" default=""/>\r
-  \r
+\r
       <element name="EXTRA.INC" optional="yes"/>\r
       <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
+\r
       <sequential>\r
-        <gensection inputfile="" \r
-                    outputfile="" \r
+        <gensection inputfile=""\r
+                    outputfile=""\r
                     sectiontype="EFI_SECTION_FREEFORM_SUBTYPE_GUID"/>\r
       </sequential>\r
     </macrodef>\r
@@ -823,8 +982,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"/>\r
             </targetfiles>\r
             <sequential>\r
-              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex" \r
-                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx" \r
+              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"\r
+                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"\r
                           sectiontype="EFI_SECTION_DXE_DEPEX"/>\r
             </sequential>\r
           </OnDependency>\r
@@ -869,12 +1028,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             </targetfiles>\r
 \r
             <sequential>\r
-              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex" \r
-                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx" \r
+              <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}.depex"\r
+                          outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.dpx"\r
                           sectiontype="EFI_SECTION_PEI_DEPEX"/>\r
             </sequential>\r
           </OnDependency>\r
-          \r
+\r
         </then>\r
         <else>\r
           <if>\r
@@ -897,13 +1056,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <attribute name="FILEPATH"/>\r
       <attribute name="FILENAME"/>\r
       <attribute name="FILEEXT" default=""/>\r
-  \r
+\r
       <element name="EXTRA.INC" optional="yes"/>\r
       <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
+\r
       <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \r
+        <gensection inputfile="${BIN_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32"\r
                     sectiontype="EFI_SECTION_PIC"/>\r
       </sequential>\r
     </macrodef>\r
@@ -915,13 +1074,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <attribute name="FILEPATH"/>\r
       <attribute name="FILENAME"/>\r
       <attribute name="FILEEXT" default=""/>\r
-  \r
+\r
       <element name="EXTRA.INC" optional="yes"/>\r
       <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
+\r
       <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \r
+        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}"\r
+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32"\r
                     sectiontype="EFI_SECTION_PE32"/>\r
       </sequential>\r
     </macrodef>\r
@@ -949,8 +1108,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <PRE.PROCESS/>\r
-          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}" \r
-                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.sec" \r
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.@{FILEEXT}"\r
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"\r
                       sectiontype="EFI_SECTION_RAW"/>\r
           <POST.PROCESS/>\r
         </sequential>\r
@@ -964,13 +1123,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <attribute name="FILEPATH"/>\r
       <attribute name="FILENAME"/>\r
       <attribute name="FILEEXT" default=""/>\r
-  \r
+\r
       <element name="EXTRA.INC" optional="yes"/>\r
       <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
+\r
       <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \r
+        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}"\r
+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32"\r
                     sectiontype="EFI_SECTION_PE32"/>\r
       </sequential>\r
     </macrodef>\r
@@ -982,13 +1141,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <attribute name="FILEPATH"/>\r
       <attribute name="FILENAME"/>\r
       <attribute name="FILEEXT" default=""/>\r
-  \r
+\r
       <element name="EXTRA.INC" optional="yes"/>\r
       <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
+\r
       <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \r
+        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}"\r
+                    outputfile="${BIN_DIR}/@{FILENAME}.pe32"\r
                     sectiontype="EFI_SECTION_PE32"/>\r
       </sequential>\r
     </macrodef>\r
@@ -1000,17 +1159,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <attribute name="FILEPATH"/>\r
       <attribute name="FILENAME"/>\r
       <attribute name="FILEEXT" default=""/>\r
-  \r
+\r
       <element name="EXTRA.INC" optional="yes"/>\r
       <element name="EXTRA.ARG" optional="yes"/>\r
-  \r
+\r
       <sequential>\r
-        <gensection inputfile="${BIN_DIR}/@{FILENAME}.@{FILEEXT}" \r
-                    outputfile="${BIN_DIR}/@{FILENAME}.pe32" \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
     EFI_SECTION_FIRMWARE_VOLUME_IMAGE\r
@@ -1034,14 +1193,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <PRE.PROCESS/>\r
-    \r
-          <copy file="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
-                tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
+\r
+          <copy file="${FV_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
+                tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
                 overwrite="true"/>\r
-          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
-                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}fv.sec" \r
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}fv.sec"\r
                       sectiontype="EFI_SECTION_FIRMWARE_VOLUME_IMAGE"/>\r
-    \r
+\r
           <POST.PROCESS/>\r
         </sequential>\r
       </OnDependency>\r
@@ -1060,7 +1219,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
 \r
     <sequential>\r
-      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>\r
     </sequential>\r
   </macrodef>\r
@@ -1077,8 +1236,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
 \r
     <sequential>\r
-      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" /> \r
-      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
+      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" />\r
+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>\r
     </sequential>\r
   </macrodef>\r
@@ -1091,8 +1250,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
 \r
     <sequential>\r
-      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" /> \r
-      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" \r
+      <mkdir dir="${MODULE_DIR}/@{FILEPATH}" />\r
+      <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
         tofile="${DEST_DIR_OUTPUT}/${BASE_NAME}.efi"/>\r
     </sequential>\r
   </macrodef>\r