SF.net SVN: edk2-buildtools:[2420] trunk/BaseTools/Source/Python/AutoGen/ GenMake.py

[<yi...@us...>]

Revision: 2420
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2420&view=rev
Author:   yingke
Date:     2011-11-21 07:00:55 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Remove duplicated macro definition options for GenFds command line.
Signed-off-by: yingke
Reviewed-by: jsu1

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/AutoGen/GenMake.py

Modified: trunk/BaseTools/Source/Python/AutoGen/GenMake.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/GenMake.py	2011-11-21 03:29:22 UTC (rev 2419)
+++ trunk/BaseTools/Source/Python/AutoGen/GenMake.py	2011-11-21 07:00:55 UTC (rev 2420)
@@ -1321,16 +1321,16 @@
             # macros passed to GenFds
             MacroList.append('"%s=%s"' % ("EFI_SOURCE", GlobalData.gEfiSource.replace('\\', '\\\\')))
             MacroList.append('"%s=%s"' % ("EDK_SOURCE", GlobalData.gEdkSource.replace('\\', '\\\\')))
-            for MacroName in GlobalData.gGlobalDefines:
-                if GlobalData.gGlobalDefines[MacroName] != "":
-                    MacroList.append('"%s=%s"' % (MacroName, GlobalData.gGlobalDefines[MacroName].replace('\\', '\\\\')))
+            MacroDict = {}
+            MacroDict.update(GlobalData.gGlobalDefines)
+            MacroDict.update(GlobalData.gCommandLineDefines)
+            MacroDict.pop("EFI_SOURCE", "dummy")
+            MacroDict.pop("EDK_SOURCE", "dummy")
+            for MacroName in MacroDict:
+                if MacroDict[MacroName] != "":
+                    MacroList.append('"%s=%s"' % (MacroName, MacroDict[MacroName].replace('\\', '\\\\')))
                 else:
                     MacroList.append('"%s"' % MacroName)
-            for MacroName in GlobalData.gCommandLineDefines:
-                if GlobalData.gCommandLineDefines[MacroName] != "":
-                    MacroList.append('"%s=%s"' % (MacroName, GlobalData.gCommandLineDefines[MacroName].replace('\\', '\\\\')))
-                else:
-                    MacroList.append('"%s"' % MacroName)                
         else:
             FdfFileList = []
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.