- added process to generate *local.lib and let the .dll be generated from it other...

- added <copy> task to GenEfi macro to copy generated .efi file to the same directory as .dll file

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

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index b3a6ff1c3a3b4541fea03bbd7fb19f3fe3a03e54..93adcaeefed6bdfb326b0cd9a45fdc38b1f2af79 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -674,16 +674,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
 \r
         <sequential>\r
         </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
           <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
               <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
             </command>\r
           </cc>\r
         </sequential>\r


@@ -711,6 +719,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>\r
           <fwimage componenttype="${COMPONENT_TYPE}" outImage="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" \r
                    peImage="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" time="0"/>\r
         <sequential>\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
         </sequential>\r
       </OnDependency>\r
     </sequential>\r