Added a new source file type "x86_asm_autogen" to allow assembly source to use macros...

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

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 6f55b5d5be42e92a733b37e53f8e581c16c08add..748f527f5826a2c0553f9f84590f41f85c6d2401 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,12 +227,12 @@ 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
@@ -245,6 +245,90 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </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="([^_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
+        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
@@ -318,16 +402,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
 \r
         <sequential>\r
-      \r
+\r
           <cc userdefine="on">\r
             <command type="ASM" includepathDelimiter="-I">\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="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
             </command>\r
           </cc>\r
@@ -352,6 +436,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
@@ -376,33 +461,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
@@ -426,30 +508,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
@@ -526,7 +608,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
@@ -546,7 +628,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
@@ -564,7 +646,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
@@ -628,7 +710,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
@@ -637,11 +719,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
@@ -717,7 +799,7 @@ 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
+          <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
@@ -764,7 +846,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
@@ -779,10 +861,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
@@ -809,7 +891,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
@@ -839,7 +921,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
@@ -853,13 +935,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
@@ -890,8 +972,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
@@ -936,12 +1018,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
@@ -964,13 +1046,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
@@ -982,13 +1064,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
@@ -1016,8 +1098,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
@@ -1031,13 +1113,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
@@ -1049,13 +1131,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
@@ -1067,17 +1149,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
@@ -1101,14 +1183,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
@@ -1127,7 +1209,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
@@ -1144,8 +1226,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
@@ -1158,8 +1240,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

diff --git a/Tools/Conf/msft_tools.txt b/Tools/Conf/msft_tools.txt
index cc0cf081b07f753aa07abc6f5e1931587176285f..ef73615ea06c4446961e6d3239e318ac7eeb1b73 100644 (file)
--- a/Tools/Conf/msft_tools.txt
+++ b/Tools/Conf/msft_tools.txt
@@ -1,8 +1,8 @@
 ASL = "/nologo"\r
 \r
-IA32_CC = "/nologo", "/W3", "/WX", "/GX", "/Gy", "/Gs-", "/c", "/D EFI32", "/D UNICODE"\r
+IA32_CC = "/nologo", "/W3", "/WX", "/GX", "/Gy", "/O1i", "/GL", "/Gs-", "/c", "/D EFI32", "/D UNICODE"\r
 IA32_LIB = "/NOLOGO"\r
 IA32_LINK = "/NOLOGO", "/SUBSYSTEM:CONSOLE", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:I386", "/ALIGN:32", "/DLL", "/LTCG"\r
 IA32_ASM = "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32"\r
-IA32_ASMLINK = \r
-IA32_PP = "/P"\r
+IA32_ASMLINK =\r
+IA32_PP = "/nologo", "/P", "/TC"\r

diff --git a/Tools/Conf/winddk_tools.txt b/Tools/Conf/winddk_tools.txt
index 062d974eaa88284f27be5df6f30e536460d7353f..b87adc59ae45b55dd4faee319991b43cce2f50a6 100644 (file)
--- a/Tools/Conf/winddk_tools.txt
+++ b/Tools/Conf/winddk_tools.txt
@@ -2,18 +2,18 @@ IA32_CC = "/nologo", "/X", "/W4", "/WX", "/GX", "/Gy", "/GS-", "/c", "/D EFI32"
 IA32_LIB = "/NOLOGO"\r
 IA32_LINK = "/NOLOGO", "/SUBSYSTEM:CONSOLE", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:I386", "/ALIGN:32", "/DLL"\r
 IA32_ASM = "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32"\r
-IA32_PP = "/P"\r
+IA32_PP = "/nologo", "/P", "/TC"\r
 \r
-x64_CC = "/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64"\r
+x64_CC = "/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64", "/O1i"\r
 x64_LIB = "/NOLOGO"\r
 x64_LINK = "/NOLOGO", "/Machine:AMD64", "/ALIGN:32", "/DLL", "/NODEFAULTLIB", "/OPT:REF"\r
 x64_ASM = "/nologo", "/W3", "/WX", "/c", "/DEFI32"\r
-x64_ASMLINK = \r
-x64_PP = "/P"\r
+x64_ASMLINK =\r
+x64_PP = "/nologo", "/P", "/TC"\r
 \r
-IPF_CC = "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64"\r
+IPF_CC = "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64", "/O1i"\r
 IPF_PP = "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "-P", "-C", "/D EFI_MONOSHELL", "/D EFI64"\r
 IPF_LIB = "/NOLOGO"\r
 IPF_LINK = "/NOLOGO", "/SUBSYSTEM:CONSOLE", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:IA64"\r
-IPF_ASM = "-N us", "-X explicit", "-M ilp64", "-N so", "-W4" \r
-IPF_PP = "/P"\r
+IPF_ASM = "-N us", "-X explicit", "-M ilp64", "-N so", "-W4"\r
+IPF_PP = "/nologo", "/P", "/TC"\r