BaseTools: skip updating temporary variable.

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / AprioriSection.py

diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/Source/Python/GenFds/AprioriSection.py
index bb40d756c8a772d5720206f96214946a131fb6e5..92a74670ed25eb76dfa982e9c3917fd28b63b3c9 100644 (file)
--- a/BaseTools/Source/Python/GenFds/AprioriSection.py
+++ b/BaseTools/Source/Python/GenFds/AprioriSection.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process APRIORI file data and generate PEI/DXE APRIORI file\r
 #\r
-#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -16,7 +16,7 @@
 # Import Modules\r
 #\r
 from struct import *\r
-import os\r
+import Common.LongFilePathOs as os\r
 import StringIO\r
 import FfsFileStatement\r
 from GenFdsGlobalVariable import GenFdsGlobalVariable\r
@@ -47,7 +47,7 @@ class AprioriSection (AprioriSectionClassObject):
     #   @param  Dict        dictionary contains macro and its value\r
     #   @retval string      Generated file name\r
     #\r
-    def GenFfs (self, FvName, Dict = {}):\r
+    def GenFfs (self, FvName, Dict = {}, IsMakefile = False):\r
         DXE_GUID = "FC510EE7-FFDC-11D4-BD41-0080C73C8881"\r
         PEI_GUID = "1B45CC0A-156A-428A-AF62-49864DA0E6E6"\r
         Buffer = StringIO.StringIO('')\r
@@ -66,6 +66,7 @@ class AprioriSection (AprioriSectionClassObject):
                                     AprioriFileGuid + FvName + '.Ffs')\r
 \r
         Dict.update(self.DefineVarDict)\r
+        InfFileName = None\r
         for FfsObj in self.FfsList :\r
             Guid = ""\r
             if isinstance(FfsObj, FfsFileStatement.FileStatement):\r
@@ -74,16 +75,16 @@ class AprioriSection (AprioriSectionClassObject):
                 InfFileName = NormPath(FfsObj.InfFileName)\r
                 Arch = FfsObj.GetCurrentArch()\r
 \r
-                if Arch != None:\r
+                if Arch is not None:\r
                     Dict['$(ARCH)'] = Arch\r
                 InfFileName = GenFdsGlobalVariable.MacroExtend(InfFileName, Dict, Arch)\r
 \r
-                if Arch != None:\r
-                    Inf = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClass(InfFileName, GenFdsGlobalVariable.WorkSpaceDir), Arch]\r
+                if Arch is not None:\r
+                    Inf = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClass(InfFileName, GenFdsGlobalVariable.WorkSpaceDir), Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
                     Guid = Inf.Guid\r
 \r
                 else:\r
-                    Inf = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClass(InfFileName, GenFdsGlobalVariable.WorkSpaceDir), 'COMMON']\r
+                    Inf = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClass(InfFileName, GenFdsGlobalVariable.WorkSpaceDir), 'COMMON', GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
                     Guid = Inf.Guid\r
 \r
                     self.BinFileList = Inf.Module.Binaries\r
@@ -110,9 +111,14 @@ class AprioriSection (AprioriSectionClassObject):
 \r
         RawSectionFileName = os.path.join( OutputAprFilePath, \\r
                                        AprioriFileGuid + FvName + '.raw' )\r
-        GenFdsGlobalVariable.GenerateSection(RawSectionFileName, [OutputAprFileName], 'EFI_SECTION_RAW')\r
+        MakefilePath = None\r
+        if IsMakefile:\r
+            if not InfFileName:\r
+                return None\r
+            MakefilePath = InfFileName, Arch\r
+        GenFdsGlobalVariable.GenerateSection(RawSectionFileName, [OutputAprFileName], 'EFI_SECTION_RAW', IsMakefile=IsMakefile)\r
         GenFdsGlobalVariable.GenerateFfs(AprFfsFileName, [RawSectionFileName],\r
-                                         'EFI_FV_FILETYPE_FREEFORM', AprioriFileGuid)\r
+                                        'EFI_FV_FILETYPE_FREEFORM', AprioriFileGuid, MakefilePath=MakefilePath)\r
 \r
         return AprFfsFileName\r
 \r