## @file\r
# generate flash image\r
#\r
-# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2014, 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
#\r
from optparse import OptionParser\r
import sys\r
-import os\r
+import Common.LongFilePathOs as os\r
import linecache\r
import FdfParser\r
import Common.BuildToolError as BuildToolError\r
from Common.String import *\r
from Common.Misc import DirCache,PathClass\r
from Common.Misc import SaveFileOnChange\r
+from Common.Misc import ClearDuplicatedInf\r
from Common.Misc import GuidStructureStringToGuidString\r
from Common.BuildVersion import gBUILD_VERSION\r
\r
## Version and Copyright\r
versionNumber = "1.0" + ' ' + gBUILD_VERSION\r
__version__ = "%prog Version " + versionNumber\r
-__copyright__ = "Copyright (c) 2007 - 2013, Intel Corporation All rights reserved."\r
+__copyright__ = "Copyright (c) 2007 - 2014, Intel Corporation All rights reserved."\r
\r
## Tool entrance method\r
#\r
FdfFilename = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, FdfFilename)\r
if not os.path.exists(FdfFilename):\r
EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=FdfFilename)\r
- if os.path.normcase (FdfFilename).find(Workspace) != 0:\r
- EdkLogger.error("GenFds", FILE_NOT_FOUND, "FdfFile doesn't exist in Workspace!")\r
\r
GenFdsGlobalVariable.FdfFile = FdfFilename\r
GenFdsGlobalVariable.FdfFileTimeStamp = os.path.getmtime(FdfFilename)\r
if not os.path.exists(ActivePlatform) :\r
EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform doesn't exist!")\r
\r
- if os.path.normcase (ActivePlatform).find(Workspace) != 0:\r
- EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform doesn't exist in Workspace!")\r
-\r
- ActivePlatform = ActivePlatform[len(Workspace):]\r
+ if os.path.normcase (ActivePlatform).find(Workspace) == 0:\r
+ ActivePlatform = ActivePlatform[len(Workspace):]\r
if len(ActivePlatform) > 0 :\r
if ActivePlatform[0] == '\\' or ActivePlatform[0] == '/':\r
ActivePlatform = ActivePlatform[1:]\r
\r
GenFdsGlobalVariable.ActivePlatform = PathClass(NormPath(ActivePlatform), Workspace)\r
\r
- BuildConfigurationFile = os.path.normpath(os.path.join(GenFdsGlobalVariable.WorkSpaceDir, "Conf/target.txt"))\r
+ if (Options.ConfDirectory):\r
+ # Get alternate Conf location, if it is absolute, then just use the absolute directory name\r
+ ConfDirectoryPath = os.path.normpath(Options.ConfDirectory)\r
+ if ConfDirectoryPath.startswith('"'):\r
+ ConfDirectoryPath = ConfDirectoryPath[1:]\r
+ if ConfDirectoryPath.endswith('"'):\r
+ ConfDirectoryPath = ConfDirectoryPath[:-1]\r
+ if not os.path.isabs(ConfDirectoryPath):\r
+ # Since alternate directory name is not absolute, the alternate directory is located within the WORKSPACE\r
+ # This also handles someone specifying the Conf directory in the workspace. Using --conf=Conf\r
+ ConfDirectoryPath = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, ConfDirectoryPath)\r
+ else:\r
+ # Get standard WORKSPACE/Conf, use the absolute path to the WORKSPACE/Conf\r
+ ConfDirectoryPath = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, 'Conf')\r
+ GenFdsGlobalVariable.ConfDir = ConfDirectoryPath\r
+ BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))\r
if os.path.isfile(BuildConfigurationFile) == True:\r
TargetTxtClassObject.TargetTxtClassObject(BuildConfigurationFile)\r
else:\r
EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=BuildConfigurationFile)\r
\r
+ #Set global flag for build mode\r
+ GlobalData.gIgnoreSource = Options.IgnoreSources\r
+\r
if Options.Macros:\r
for Pair in Options.Macros:\r
- Pair.strip('"')\r
+ if Pair.startswith('"'):\r
+ Pair = Pair[1:]\r
+ if Pair.endswith('"'):\r
+ Pair = Pair[:-1]\r
List = Pair.split('=')\r
if len(List) == 2:\r
if List[0].strip() == "EFI_SOURCE":\r
os.environ["WORKSPACE"] = Workspace\r
\r
"""call Workspace build create database"""\r
- BuildWorkSpace = WorkspaceDatabase(None)\r
+ GlobalData.gDatabasePath = os.path.normpath(os.path.join(ConfDirectoryPath, GlobalData.gDatabasePath))\r
+ BuildWorkSpace = WorkspaceDatabase(GlobalData.gDatabasePath)\r
BuildWorkSpace.InitDatabase()\r
\r
#\r
"\nPython",\r
CODE_ERROR,\r
"Tools code failure",\r
- ExtraData="Please send email to edk2-buildtools-devel@lists.sourceforge.net for help, attaching following call stack trace!\n",\r
+ ExtraData="Please send email to edk2-devel@lists.sourceforge.net for help, attaching following call stack trace!\n",\r
RaiseError=False\r
)\r
EdkLogger.quiet(traceback.format_exc())\r
ReturnCode = CODE_ERROR\r
+ finally:\r
+ ClearDuplicatedInf()\r
return ReturnCode\r
\r
gParamCheck = []\r
action="callback", callback=SingleCheckCallback)\r
Parser.add_option("-D", "--define", action="append", type="string", dest="Macros", help="Macro: \"Name [= Value]\".")\r
Parser.add_option("-s", "--specifyaddress", dest="FixedAddress", action="store_true", type=None, help="Specify driver load address.")\r
+ Parser.add_option("--conf", action="store", type="string", dest="ConfDirectory", help="Specify the customized Conf directory.")\r
+ Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")\r
+\r
(Options, args) = Parser.parse_args()\r
return Options\r
\r