BaseTools: Fix the bug that FixedPcdGetPtr failure for CArray Pcd

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenDepex.py

diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source/Python/AutoGen/GenDepex.py
index 37ba7bc72cd25bcc1284ab1ac28aae40e17abf51..5923a75ab7fb8ec3c0aafe420bd18d0376c6c423 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenDepex.py
+++ b/BaseTools/Source/Python/AutoGen/GenDepex.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to generate DEPEX file for module's dependency expression\r
 #\r
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.    The full text of the license may be found at\r
@@ -13,10 +13,10 @@
 ## Import Modules\r
 #\r
 import sys\r
-import os\r
+import Common.LongFilePathOs as os\r
 import re\r
 import traceback\r
-\r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from StringIO import StringIO\r
 from struct import pack\r
 from Common.BuildToolError import *\r
@@ -286,7 +286,7 @@ class DependencyExpression:
         # don't generate depex if only TRUE operand left\r
         if self.ModuleType == 'PEIM' and len(NewOperand) == 1 and NewOperand[0] == 'TRUE':\r
             self.PostfixNotation = []\r
-            return            \r
+            return\r
 \r
         # don't generate depex if all operands are architecture protocols\r
         if self.ModuleType in ['UEFI_DRIVER', 'DXE_DRIVER', 'DXE_RUNTIME_DRIVER', 'DXE_SAL_DRIVER', 'DXE_SMM_DRIVER'] and \\r
@@ -424,7 +424,7 @@ def Main():
         Dpx = DependencyExpression(DxsString, Option.ModuleType, Option.Optimize)\r
         if Option.OutputFile != None:\r
             FileChangeFlag = Dpx.Generate(Option.OutputFile)\r
-            if not FileChangeFlag and DxsFile: \r
+            if not FileChangeFlag and DxsFile:\r
                 #\r
                 # Touch the output file if its time stamp is older than the original\r
                 # DXS file to avoid re-invoke this tool for the dependency check in build rule.\r