X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FConf%2FBuildMacro.xml;h=0eb9c5742c6cfc8e01197a799ab16029c9a53001;hp=280a1c088abe6cc8e257fa6a7135302595c8963b;hb=d61237595f61d2292f72a590684f5b4b054c6409;hpb=50017606db147109ab6fd7f17db56d4ae37760bc

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 280a1c088a..0eb9c5742c 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -14,9 +14,70 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     Macro for intialize some properties. This Macro build will be called before source file build.  
     -->
   <macrodef name="Build_Init">
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+    
     <sequential>
       <var name="OBJECTS" value="" />
       <var name="SDB_FILES" value="" />
+
+      <if>
+        <and>
+          <isset property="PCH"/>
+          <not>
+            <equals arg1="${PCH}" arg2=""/>
+          </not>
+        </and>
+        <then>
+          <if>
+            <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>
+            <then>
+              <makedeps DepsFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep">
+                <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
+                <EXTRA.INC/>
+              </makedeps>
+            </then>
+          </if>
+    
+          <OnDependency>
+            <sourcefiles>
+              <file ListFile="${DEST_DIR_OUTPUT}/AutoGen.h.dep"/>
+            </sourcefiles>
+            <targetfiles>
+              <file Name="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>
+            </targetfiles>
+    
+            <sequential>
+              <!-- Generate pre-compiled header -->
+              <cc userdefine="on">
+                <command type="CC" cmd="${PCH}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
+                  outputFile="${DEST_DIR_OUTPUT}/AutoGen.h.obj">
+                  <EXTRA.INC/>
+                  <argument value="${PCH_FLAGS}"/>
+                  <EXTRA.ARG/>
+                  <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/AutoGen.h"/>
+                </command>
+              </cc>
+
+              <if>
+                <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+                <then>
+                  <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_DEBUG}/AutoGen.h.gch" overwrite="true"/>
+                </then>
+              </if>
+            </sequential>
+          </OnDependency>
+
+          <if>
+            <not>
+              <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+            </not>
+            <then>
+              <var name="OBJECTS" value="${OBJECTS} AutoGen.h.obj"/>
+            </then>
+          </if>
+        </then>
+      </if>
     </sequential>
   </macrodef>
 
@@ -60,25 +121,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
 
         <sequential>
-          <!-- Use pre-compiled header if available -->
-          <if>
-            <and>
-              <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-              <available file="${DEST_DIR_DEBUG}/AutoGen.pch"/>
-            </and>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /Yu${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_DEBUG}/AutoGen.pch"/>
-            </then>
-            <else>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS}"/>
-            </else>
-          </if>
-
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
-              outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+              outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}">
               <EXTRA.INC/>
-              <argument value="${LOCAL_CC_FLAGS}"/>
+              <argument value="${CC_FLAGS}"/>
               <EXTRA.ARG/>
               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
@@ -132,22 +179,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
 
         <sequential>
-          <!-- Generate pre-compiled header -->
-          <if>
-            <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /Yc${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_DEBUG}/AutoGen.pch"/>
-            </then>
-            <else>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS}"/>
-            </else>
-          </if>
-
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
-                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${CC_DPATH}">
               <EXTRA.INC/>
-              <argument value="${LOCAL_CC_FLAGS}"/>
+              <argument value="${CC_FLAGS}"/>
               <EXTRA.ARG/>
               <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
@@ -192,7 +228,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}"
-                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i">
+                     outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.i" dpath="${CC_DPATH}">
               <EXTRA.INC/>
               <argument value="${PP_FLAGS}"/>
               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
@@ -274,7 +310,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <sequential>
           <cc userdefine="on">
-            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}">
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}" dpath="${PP_DPATH}">
               <EXTRA.INC.1/>
               <argument value="${PP_FLAGS}"/>
               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
@@ -297,7 +333,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
           <cc userdefine="on">
             <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"
-                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${ASM_DPATH}">
               <EXTRA.INC.1/>
       
               <argument value="${ASM_FLAGS}"/>
@@ -348,7 +384,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>
           <cc userdefine="on">
             <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"
-                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
+                outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" dpath="${ASM_DPATH}">
               <EXTRA.INC.1/>
       
               <argument value="${ASM_FLAGS}"/>
@@ -391,6 +427,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <then>
           <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">
             <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
             <EXTRA.INC.1/>
           </makedeps>
         </then>
@@ -406,16 +443,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <sequential>
           <cc userdefine="on">
-            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}">
+            <command type="PP" cmd="${APP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${APP_FAMILY}" dpath="${APP_DPATH}">
               <EXTRA.INC.1/>
-              <argument value="${PP_FLAGS}"/>
+              <argument value="${APP_FLAGS}"/>
               <fileset casesensitive="on" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
             </command>
           </cc>
       
           <cc userdefine="on">
             <command type="ASM" cmd="${ASM}" workdir="${DEST_DIR_OUTPUT}" family="${ASM_FAMILY}"
-                includepathDelimiter="-I" outputDelimiter="-o"
+                includepathDelimiter="-I" outputDelimiter="-o" dpath="${ASM_DPATH}"
                 outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj">
               <EXTRA.INC.1/>
               <argument value="${ASM_FLAGS}"/>
@@ -451,7 +488,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <mkdir dir="${DEST_DIR_OUTPUT}/@{FILEPATH}"/>
   
       <cc userdefine="on">
-        <command type="ASM" includepathDelimiter="-I">
+        <command type="ASM" includepathDelimiter="-I" dpath="${ASM_DPATH}">
           <includepath path="${WORKSPACE_DIR}"/>
           <includepath path="${MODULE_DIR}"/>
           <includepath path="${MODULE_DIR}/${ARCH}"/>
@@ -491,7 +528,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>
           <cc userdefine="on">
             <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"
-                outputFile="${BIN_DIR}/@{FILENAME}.lib">
+                outputFile="${BIN_DIR}/@{FILENAME}.lib" dpath="${SLINK_DPATH}">
               <argument value="${SLINK_FLAGS}"/>
 
               <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>
@@ -600,25 +637,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
         
         <sequential>
-          <!-- Use pre-compiled header if available -->
-          <if>
-            <and>
-              <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-              <available file="${DEST_DIR_DEBUG}/AutoGen.pch"/>
-            </and>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /Yc${DEST_DIR_DEBUG}/AutoGen.h /Yu${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_DEBUG}/AutoGen.pch"/>
-            </then>
-            <else>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS}"/>
-            </else>
-          </if>
-
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"
-                     includepathDelimiter="-I"
+                     includepathDelimiter="-I" dpath="${CC_DPATH}"
                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj">
-              <argument value="${LOCAL_CC_FLAGS}"/>
+              <argument value="${CC_FLAGS}"/>
               <EXTRA.INC />
               <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}Strings.c"/>
             </command>
@@ -658,6 +681,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <then>
           <makedeps DepsFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}.dep">
             <input file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+            <input file="${DEST_DIR_DEBUG}/AutoGen.h"/>
             <EXTRA.INC/>
           </makedeps>
         </then>
@@ -676,25 +700,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             <EXTRA.INC/>
           </vfrcompile>
     
-          <!-- Use pre-compiled header if available -->
-          <if>
-            <and>
-              <equals arg1="${CC_FAMILY}" arg2="MSFT" casesensitive="false"/>
-              <available file="${DEST_DIR_DEBUG}/AutoGen.pch"/>
-            </and>
-            <then>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS} /Yu${DEST_DIR_DEBUG}/AutoGen.h /Fp${DEST_DIR_DEBUG}/AutoGen.pch"/>
-            </then>
-            <else>
-              <var name="LOCAL_CC_FLAGS" value="${CC_FLAGS}"/>
-            </else>
-          </if>
-
           <cc userdefine="on">
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" 
-                     includepathDelimiter="-I" family="${CC_FAMILY}"
+                     includepathDelimiter="-I" family="${CC_FAMILY}" dpath="${CC_DPATH}"
                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >
-              <argument value="${LOCAL_CC_FLAGS}"/>
+              <argument value="${CC_FLAGS}"/>
               <EXTRA.INC/>
               <EXTRA.ARG/>
               <fileset casesensitive="on" file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.c"/>
@@ -727,7 +737,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>
 
     <sequential>
-      <echo message="Ignoring ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+      <echo message="Ignoring ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" level="info" />
     </sequential>
   </macrodef>
 
@@ -759,7 +769,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <sequential>
           <cc userdefine="on">
-            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"
+            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}" dpath="${SLINK_DPATH}"
                 outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib">
               <argument value="${SLINK_FLAGS}"/>
 
@@ -768,11 +778,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </cc>
           <cc userdefine="on">
             <command type="DLINK" cmd="${DLINK}" family="${DLINK_FAMILY}"
-                     outputFile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll" >
+                     outputFile="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll" dpath="${DLINK_DPATH}" >
               <argument value="${DLINK_FLAGS}"/>
-              <libset libs="${LIBS}"/>
-              <libset libs="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib"/>
-              <libset libs="${DLINK_SPATH}" />
+              <libset libs="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib ${LIBS} ${DLINK_SPATH}"/>
               <LINK.ARG/>
             </command>
           </cc>
@@ -862,7 +870,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${BIN_DIR}/@{FILENAME}.efi" />
           <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />          
           <genteimage Dump="false" Verbose="false" OutputDir="" OutputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" InputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>
-          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.te" tofile="${BIN_DIR}/@{FILENAME}.te" />
           <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" 
                       outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.tes" 
                       sectiontype="EFI_SECTION_TE"/>
@@ -908,7 +915,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
         <sequential>
           <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${BIN_DIR}/@{FILENAME}.efi" />
-          
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />
           <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" 
                       outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.pe32" 
                       sectiontype="EFI_SECTION_PE32"/>
@@ -916,7 +923,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <POST.PROCESS/>
         </sequential>
       </OnDependency>
-      <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />
     </sequential>
   </macrodef>
 
@@ -1155,6 +1161,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>
     </sequential>
   </macrodef>
+  
   <!--
     Microcode
    -->
@@ -1175,7 +1182,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!--
     Graphics (bmp, ...)
     -->
-  <macrodef name="Build_Graphics">
+  <macrodef name="Build_BMP">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/> 
     <attribute name="FILEEXT" default="bmp"/>
@@ -1189,6 +1196,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>
     </sequential>
   </macrodef> 
+
+  <!--
+    build EFI file
+  -->
   <macrodef name="Build_EFI">
     <attribute name="FILEPATH"/>
     <attribute name="FILENAME"/>