Revision: 16849
http://sourceforge.net/p/edk2/code/16849
Author: vanjeff
Date: 2015-02-13 02:33:26 +0000 (Fri, 13 Feb 2015)
Log Message:
-----------
Add missing when wync BaseTools from main trunk r16831.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/16831
Modified Paths:
--------------
branches/UDK2014.SP1/BaseTools/Source/Python/build/build.py
Modified: branches/UDK2014.SP1/BaseTools/Source/Python/build/build.py
===================================================================
--- branches/UDK2014.SP1/BaseTools/Source/Python/build/build.py 2015-02-13
02:14:12 UTC (rev 16848)
+++ branches/UDK2014.SP1/BaseTools/Source/Python/build/build.py 2015-02-13
02:33:26 UTC (rev 16849)
@@ -1,7 +1,8 @@
## @file
# build a platform or a module
#
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
+# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
@@ -931,14 +932,9 @@
makefile =
GenMake.BuildFile(AutoGenObject)._FILE_NAME_[GenMake.gMakeType]
- # genfds
- if Target == 'fds':
- LaunchCommand(AutoGenObject.GenFdsCommand,
AutoGenObject.MakeFileDir)
- return True
-
# run
if Target == 'run':
- RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir,
'IA32'))
+ RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir,
GlobalData.gGlobalDefines['ARCH']))
Command = '.\SecMain'
os.chdir(RunDir)
LaunchCommand(Command, RunDir)
@@ -1054,6 +1050,14 @@
(AutoGenObject.BuildTarget,
AutoGenObject.ToolChain, AutoGenObject.Arch),
ExtraData=str(AutoGenObject))
+ # build modules
+ if BuildModule:
+ if Target != 'fds':
+ BuildCommand = BuildCommand + [Target]
+ LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
+ self.CreateAsBuiltInf()
+ return True
+
# genfds
if Target == 'fds':
LaunchCommand(AutoGenObject.GenFdsCommand,
AutoGenObject.MakeFileDir)
@@ -1061,19 +1065,12 @@
# run
if Target == 'run':
- RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir,
'IA32'))
+ RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir,
GlobalData.gGlobalDefines['ARCH']))
Command = '.\SecMain'
os.chdir(RunDir)
LaunchCommand(Command, RunDir)
return True
- # build modules
- BuildCommand = BuildCommand + [Target]
- if BuildModule:
- LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
- self.CreateAsBuiltInf()
- return True
-
# build library
if Target == 'libraries':
pass
@@ -1453,13 +1450,12 @@
# Rebase module to the preferred memory address before
GenFds
#
self._CollectModuleMapBuffer(MapBuffer, ModuleList)
- if self.Fdf:
- #
- # create FDS again for the updated EFI image
- #
- self._Build("fds", Wa)
if self.Fdf:
#
+ # create FDS again for the updated EFI image
+ #
+ self._Build("fds", Wa)
+ #
# Create MAP file for all platform FVs after GenFds.
#
self._CollectFvMapBuffer(MapBuffer, Wa, ModuleList)
@@ -1548,11 +1544,11 @@
# Rebase module to the preferred memory address before
GenFds
#
self._CollectModuleMapBuffer(MapBuffer, ModuleList)
- #
- # create FDS again for the updated EFI image
- #
- self._Build("fds", Wa)
#
+ # create FDS again for the updated EFI image
+ #
+ self._Build("fds", Wa)
+ #
# Create MAP file for all platform FVs after GenFds.
#
self._CollectFvMapBuffer(MapBuffer, Wa, ModuleList)
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
