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

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

Revision: 2028
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2028&view=rev
Author:   gikidy
Date:     2010-08-27 01:09:17 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
Fix no filename issue while generate VPD data. 

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

Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2010-08-25 08:26:54 UTC (rev 2027)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2010-08-27 01:09:17 UTC (rev 2028)
@@ -518,7 +518,7 @@
                     EdkLogger.error("build", FILE_WRITE_FAILURE, "Fail to create FV folder under %s" % self.BuildDir)
                     
             VpdFileName = self.Platform.VpdFileName           
-            if VpdFileName == None :
+            if VpdFileName == None or VpdFileName == "" :
                 VpdFilePath = os.path.join(FvPath, "%s.txt" % self.Platform.VpdToolGuid)
             else :
                 VpdFilePath = os.path.join(FvPath, "%s.txt" % VpdFileName)  
@@ -542,7 +542,7 @@
                     
             # Process VPD map file generated by third party BPDG tool
             if NeedProcessVpdMapFile:
-                if VpdFileName == None :
+                if VpdFileName == None or VpdFileName == "" :
                     VpdMapFilePath = os.path.join(self.BuildDir, "FV", "%s.map" % self.Platform.VpdToolGuid)
                 else :
                     VpdMapFilePath = os.path.join(self.BuildDir, "FV", "%s.map" % VpdFileName)

Modified: trunk/BaseTools/Source/Python/Common/VpdInfoFile.py
===================================================================
--- trunk/BaseTools/Source/Python/Common/VpdInfoFile.py	2010-08-25 08:26:54 UTC (rev 2027)
+++ trunk/BaseTools/Source/Python/Common/VpdInfoFile.py	2010-08-27 01:09:17 UTC (rev 2028)
@@ -215,7 +215,7 @@
     assert VpdFilePath != None and os.path.exists(VpdFilePath), "Invalid parameter VpdFileName"
     
     OutputDir = os.path.dirname(VpdFilePath)
-    if (VpdFileName == None) :
+    if (VpdFileName == None or VpdFileName == "") :
         FileName = os.path.basename(VpdFilePath)
         BaseName, ext = os.path.splitext(FileName)
         OutputMapFileName = os.path.join(OutputDir, "%s.map" % BaseName)


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