Sync BaseTools Branch (version r2362) to EDKII main trunk.

Signed-off-by: lgao4
Reviewed-by: jsu1
Reviewed-by: ydliu

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

BaseTools/Source/Python/GenFds/FfsInfStatement.py

@@ -56,6 +56,10 @@ class FfsInfStatement(FfsInfStatementClassObject):
         self.PiSpecVersion = '0x00000000'
         self.InfModule = None
         self.FinalTargetSuffixMap = {}
+        self.CurrentLineNum = None
+        self.CurrentLineContent = None
+        self.FileName = None
+        self.InfFileName = None
 
     ## GetFinalTargetSuffixMap() method
     #
@@ -452,7 +456,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
         Arch = ''
         OutputPath = ''
         (ModulePath, FileName) = os.path.split(self.InfFileName)
-        Index = FileName.find('.')
+        Index = FileName.rfind('.')
         FileName = FileName[0:Index]
         Arch = "NoneArch"
         if self.CurrentArch != None: