SF.net SVN: edk2-buildtools:[2467] trunk/BaseTools/Source/Python

[<gi...@us...>]

Revision: 2467
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2467&view=rev
Author:   gikidy
Date:     2011-12-13 08:53:07 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Fix an issue of help information on build arch is not accurate.
Signed-off-by: gikidy
Reviewed-by: lgao4

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

Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2011-12-13 05:47:26 UTC (rev 2466)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2011-12-13 08:53:07 UTC (rev 2467)
@@ -173,7 +173,8 @@
     #   @param  SkuId                   SKU id from command line
     #
     def _Init(self, WorkspaceDir, ActivePlatform, Target, Toolchain, ArchList, MetaFileDb,
-              BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=None, Fvs=None, Caps=None, SkuId='', UniFlag=None):
+              BuildConfig, ToolDefinition, FlashDefinitionFile='', Fds=None, Fvs=None, Caps=None, SkuId='', UniFlag=None, 
+              Progress=None, BuildModule=None):
         if Fds is None:
             Fds = []
         if Fvs is None:
@@ -236,8 +237,25 @@
         # parse FDF file to get PCDs in it, if any
         if not self.FdfFile:
             self.FdfFile = self.Platform.FlashDefinition
+        
+        EdkLogger.info("")
+        if self.ArchList:
+            EdkLogger.info('%-16s = %s' % ("Architecture(s)", ' '.join(self.ArchList)))
+        EdkLogger.info('%-16s = %s' % ("Build target", self.BuildTarget))
+        EdkLogger.info('%-16s = %s' % ("Toolchain",self.ToolChain))        
+        
+        EdkLogger.info('\n%-24s = %s' % ("Active Platform", self.Platform))
+        if BuildModule:
+            EdkLogger.info('%-24s = %s' % ("Active Module", BuildModule))
+        
+        if self.FdfFile:
+            EdkLogger.info('%-24s = %s' % ("Flash Image Definition", self.FdfFile))
+
         EdkLogger.verbose("\nFLASH_DEFINITION = %s" % self.FdfFile)
-
+        
+        if Progress:
+            Progress.Start("\nProcessing meta-data")
+        
         if self.FdfFile:
             #
             # Mark now build in AutoGen Phase

Modified: trunk/BaseTools/Source/Python/build/build.py
===================================================================
--- trunk/BaseTools/Source/Python/build/build.py	2011-12-13 05:47:26 UTC (rev 2466)
+++ trunk/BaseTools/Source/Python/build/build.py	2011-12-13 08:53:07 UTC (rev 2467)
@@ -745,17 +745,8 @@
         EdkLogger.quiet("%-16s = %s" % ("EDK_TOOLS_PATH", os.environ["EDK_TOOLS_PATH"]))
 
         EdkLogger.info("")
-        if self.ArchList:
-            EdkLogger.info('%-16s = %s' % ("Architecture(s)", ' '.join(self.ArchList)))
-        EdkLogger.info('%-16s = %s' % ("Build target", ' '.join(self.BuildTargetList)))
-        EdkLogger.info('%-16s = %s' % ("Toolchain", ' '.join(self.ToolChainList)))
 
-        EdkLogger.info('\n%-16s = %s' % ("Active Platform", self.PlatformFile))
-        if self.ModuleFile:
-            EdkLogger.info('%-16s = %s' % ("Active Module", self.ModuleFile))
-
         os.chdir(self.WorkspaceDir)
-        self.Progress.Start("\nProcessing meta-data")
 
     ## Load configuration
     #
@@ -1241,7 +1232,8 @@
                         self.FvList,
                         self.CapList,
                         self.SkuId,
-                        self.UniFlag
+                        self.UniFlag,
+                        self.Progress
                         )
                 self.Fdf = Wa.FdfFile
                 self.LoadFixAddress = Wa.Platform.LoadFixAddress
@@ -1316,7 +1308,9 @@
                         self.FvList,
                         self.CapList,
                         self.SkuId,
-                        self.UniFlag
+                        self.UniFlag,
+                        self.Progress,
+                        self.ModuleFile
                         )
                 self.Fdf = Wa.FdfFile
                 self.LoadFixAddress = Wa.Platform.LoadFixAddress
@@ -1401,7 +1395,8 @@
                         self.FvList,
                         self.CapList,
                         self.SkuId,
-                        self.UniFlag
+                        self.UniFlag,
+                        self.Progress
                         )
                 self.Fdf = Wa.FdfFile
                 self.LoadFixAddress = Wa.Platform.LoadFixAddress

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