import re\r
import os.path as path\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
-\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
from Common.BuildToolError import *\r
from Common.Misc import *\r
from Common.String import *\r
#\r
MODULE_NAME = ${module_name}\r
MODULE_GUID = ${module_guid}\r
+MODULE_NAME_GUID = ${module_name_guid}\r
MODULE_VERSION = ${module_version}\r
MODULE_TYPE = ${module_type}\r
MODULE_FILE = ${module_file}\r
MODULE_FILE_BASE_NAME = ${module_file_base_name}\r
BASE_NAME = $(MODULE_NAME)\r
MODULE_RELATIVE_DIR = ${module_relative_directory}\r
+PACKAGE_RELATIVE_DIR = ${package_relative_directory}\r
MODULE_DIR = $(WORKSPACE)${separator}${module_relative_directory}\r
\r
MODULE_ENTRY_POINT = ${module_entry_point}\r
Command = self._MAKE_TEMPLATE_[self._FileType] % {"file":os.path.join(D, MakefileName)}\r
LibraryMakeCommandList.append(Command)\r
\r
+ package_rel_dir = self._AutoGenObject.SourceDir\r
+ current_dir = self.Macros["WORKSPACE"]\r
+ found = False\r
+ while not found and os.sep in package_rel_dir:\r
+ index = package_rel_dir.index(os.sep)\r
+ current_dir = mws.join(current_dir, package_rel_dir[:index])\r
+ for fl in os.listdir(current_dir):\r
+ if fl.endswith('.dec'):\r
+ found = True\r
+ break\r
+ package_rel_dir = package_rel_dir[index + 1:]\r
+\r
MakefileTemplateDict = {\r
"makefile_header" : self._FILE_HEADER_[self._FileType],\r
"makefile_path" : os.path.join("$(MODULE_BUILD_DIR)", MakefileName),\r
\r
"module_name" : self._AutoGenObject.Name,\r
"module_guid" : self._AutoGenObject.Guid,\r
+ "module_name_guid" : self._AutoGenObject._GetUniqueBaseName(),\r
"module_version" : self._AutoGenObject.Version,\r
"module_type" : self._AutoGenObject.ModuleType,\r
"module_file" : self._AutoGenObject.MetaFile.Name,\r
"module_file_base_name" : self._AutoGenObject.MetaFile.BaseName,\r
"module_relative_directory" : self._AutoGenObject.SourceDir,\r
- "module_extra_defines" : ["%s = %s" % (k, v) for k,v in self._AutoGenObject.Module.Defines.iteritems()],\r
+ "package_relative_directory": package_rel_dir,\r
+ "module_extra_defines" : ["%s = %s" % (k, v) for k, v in self._AutoGenObject.Module.Defines.iteritems()],\r
\r
"architecture" : self._AutoGenObject.Arch,\r
"toolchain_tag" : self._AutoGenObject.ToolChain,\r
NewFile = self.PlaceMacro(str(F), self.Macros)\r
# In order to use file list macro as dependency\r
if T.GenListFile:\r
- self.ListFileMacros[T.ListFileMacro].append(str(F))\r
+ # gnu tools need forward slash path separater, even on Windows\r
+ self.ListFileMacros[T.ListFileMacro].append(str(F).replace ('\\', '/'))\r
self.FileListMacros[T.FileListMacro].append(NewFile)\r
elif T.GenFileListMacro:\r
self.FileListMacros[T.FileListMacro].append(NewFile)\r
#\r
MODULE_NAME = ${module_name}\r
MODULE_GUID = ${module_guid}\r
+MODULE_NAME_GUID = ${module_name_guid}\r
MODULE_VERSION = ${module_version}\r
MODULE_TYPE = ${module_type}\r
MODULE_FILE = ${module_file}\r
\r
"module_name" : self._AutoGenObject.Name,\r
"module_guid" : self._AutoGenObject.Guid,\r
+ "module_name_guid" : self._AutoGenObject._GetUniqueBaseName(),\r
"module_version" : self._AutoGenObject.Version,\r
"module_type" : self._AutoGenObject.ModuleType,\r
"module_file" : self._AutoGenObject.MetaFile,\r
self.IntermediateDirectoryList = []\r
self.ModuleBuildDirectoryList = []\r
self.LibraryBuildDirectoryList = []\r
+ self.LibraryMakeCommandList = []\r
\r
# Compose a dict object containing information used to do replacement in template\r
def _CreateTemplateDict(self):\r
Command = self._MAKE_TEMPLATE_[self._FileType] % {"file":Makefile}\r
LibraryMakefileList.append(Makefile)\r
LibraryMakeCommandList.append(Command)\r
+ self.LibraryMakeCommandList = LibraryMakeCommandList\r
\r
ModuleMakefileList = []\r
ModuleMakeCommandList = []\r
def GetModuleBuildDirectoryList(self):\r
DirList = []\r
for ModuleAutoGen in self._AutoGenObject.ModuleAutoGenList:\r
- DirList.append(os.path.join(self._AutoGenObject.BuildDir, ModuleAutoGen.BuildDir))\r
+ if not ModuleAutoGen.IsBinaryModule:\r
+ DirList.append(os.path.join(self._AutoGenObject.BuildDir, ModuleAutoGen.BuildDir))\r
return DirList\r
\r
## Get the root directory list for intermediate files of all libraries build\r
def GetLibraryBuildDirectoryList(self):\r
DirList = []\r
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r
- DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
+ if not LibraryAutoGen.IsBinaryModule:\r
+ DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
return DirList\r
\r
_TemplateDict = property(_CreateTemplateDict)\r
#\r
class TopLevelMakefile(BuildFile):\r
## template used to generate toplevel makefile\r
- _TEMPLATE_ = TemplateString('''\\r
-${makefile_header}\r
-\r
-#\r
-# Platform Macro Definition\r
-#\r
-PLATFORM_NAME = ${platform_name}\r
-PLATFORM_GUID = ${platform_guid}\r
-PLATFORM_VERSION = ${platform_version}\r
-\r
-#\r
-# Build Configuration Macro Definition\r
-#\r
-TOOLCHAIN = ${toolchain_tag}\r
-TOOLCHAIN_TAG = ${toolchain_tag}\r
-TARGET = ${build_target}\r
-\r
-#\r
-# Build Directory Macro Definition\r
-#\r
-BUILD_DIR = ${platform_build_directory}\r
-FV_DIR = ${platform_build_directory}${separator}FV\r
-\r
-#\r
-# Shell Command Macro\r
-#\r
-${BEGIN}${shell_command_code} = ${shell_command}\r
-${END}\r
-\r
-MAKE = ${make_path}\r
-MAKE_FILE = ${makefile_path}\r
-\r
-#\r
-# Default target\r
-#\r
-all: modules fds\r
-\r
-#\r
-# Initialization target: print build information and create necessary directories\r
-#\r
-init:\r
-\t-@\r
-\t${BEGIN}-@${create_directory_command}\r
-\t${END}\r
-#\r
-# library build target\r
-#\r
-libraries: init\r
-${BEGIN}\t@cd $(BUILD_DIR)${separator}${arch} && "$(MAKE)" $(MAKE_FLAGS) libraries\r
-${END}\t@cd $(BUILD_DIR)\r
-\r
-#\r
-# module build target\r
-#\r
-modules: init\r
-${BEGIN}\t@cd $(BUILD_DIR)${separator}${arch} && "$(MAKE)" $(MAKE_FLAGS) modules\r
-${END}\t@cd $(BUILD_DIR)\r
-\r
-#\r
-# Flash Device Image Target\r
-#\r
-fds: init\r
-\t-@cd $(FV_DIR)\r
-${BEGIN}\tGenFds -f ${fdf_file} -o $(BUILD_DIR) -t $(TOOLCHAIN) -b $(TARGET) -p ${active_platform} -a ${build_architecture_list} ${extra_options}${END}${BEGIN} -r ${fd} ${END}${BEGIN} -i ${fv} ${END}${BEGIN} -C ${cap} ${END}${BEGIN} -D ${macro} ${END}\r
-\r
-#\r
-# run command for emulator platform only\r
-#\r
-run:\r
-\tcd $(BUILD_DIR)${separator}IA32 && ".${separator}SecMain"\r
-\tcd $(BUILD_DIR)\r
-\r
-#\r
-# Clean intermediate files\r
-#\r
-clean:\r
-${BEGIN}\t-@${sub_build_command} clean\r
-${END}\t@cd $(BUILD_DIR)\r
-\r
-#\r
-# Clean all generated files except to makefile\r
-#\r
-cleanall:\r
-${BEGIN}\t${cleanall_command}\r
-${END}\r
-\r
-#\r
-# Clean all library files\r
-#\r
-cleanlib:\r
-${BEGIN}\t-@${sub_build_command} cleanlib\r
-${END}\t@cd $(BUILD_DIR)\n\r
-''')\r
+ _TEMPLATE_ = TemplateString('''${BEGIN}\tGenFds -f ${fdf_file} --conf=${conf_directory} -o ${platform_build_directory} -t ${toolchain_tag} -b ${build_target} -p ${active_platform} -a ${build_architecture_list} ${extra_options}${END}${BEGIN} -r ${fd} ${END}${BEGIN} -i ${fv} ${END}${BEGIN} -C ${cap} ${END}${BEGIN} -D ${macro} ${END}''')\r
\r
## Constructor of TopLevelMakefile\r
#\r
if GlobalData.gCaseInsensitive:\r
ExtraOption += " -c"\r
\r
+ if GlobalData.gIgnoreSource:\r
+ ExtraOption += " --ignore-sources"\r
+\r
MakefileName = self._FILE_NAME_[self._FileType]\r
SubBuildCommandList = []\r
for A in PlatformInfo.ArchList:\r
"platform_guid" : PlatformInfo.Guid,\r
"platform_version" : PlatformInfo.Version,\r
"platform_build_directory" : PlatformInfo.BuildDir,\r
+ "conf_directory" : GlobalData.gConfDirectory,\r
\r
"toolchain_tag" : PlatformInfo.ToolChain,\r
"build_target" : PlatformInfo.BuildTarget,\r
def GetModuleBuildDirectoryList(self):\r
DirList = []\r
for ModuleAutoGen in self._AutoGenObject.ModuleAutoGenList:\r
- DirList.append(os.path.join(self._AutoGenObject.BuildDir, ModuleAutoGen.BuildDir))\r
+ if not ModuleAutoGen.IsBinaryModule:\r
+ DirList.append(os.path.join(self._AutoGenObject.BuildDir, ModuleAutoGen.BuildDir))\r
return DirList\r
\r
## Get the root directory list for intermediate files of all libraries build\r
def GetLibraryBuildDirectoryList(self):\r
DirList = []\r
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList:\r
- DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
+ if not LibraryAutoGen.IsBinaryModule:\r
+ DirList.append(os.path.join(self._AutoGenObject.BuildDir, LibraryAutoGen.BuildDir))\r
return DirList\r
\r
_TemplateDict = property(_CreateTemplateDict)\r
projects / mirror_edk2.git / blobdiff