BaseTools: Update Build tool to support multiple workspaces

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

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 0ad368a4cec560614cd72c54fc05794f94c546e2..d9b219e1c75fe778f4e485289504c754885a9576 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -19,7 +19,7 @@ import string
 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
@@ -241,12 +241,14 @@ PLATFORM_OUTPUT_DIR = ${platform_output_directory}
 #\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
@@ -552,6 +554,18 @@ cleanlib:
             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
@@ -564,12 +578,14 @@ cleanlib:
 \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
@@ -673,7 +689,8 @@ cleanlib:
                     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
@@ -839,6 +856,7 @@ PLATFORM_OUTPUT_DIR = ${platform_output_directory}
 #\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
@@ -963,6 +981,7 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\
 \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
@@ -1177,7 +1196,8 @@ cleanlib:
     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
@@ -1187,7 +1207,8 @@ cleanlib:
     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
@@ -1200,7 +1221,7 @@ cleanlib:
 #\r
 class TopLevelMakefile(BuildFile):\r
     ## template used to generate toplevel makefile\r
-    _TEMPLATE_ = TemplateString('''${BEGIN}\tGenFds -f ${fdf_file} -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
+    _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
@@ -1258,6 +1279,9 @@ class TopLevelMakefile(BuildFile):
         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
@@ -1272,6 +1296,7 @@ class TopLevelMakefile(BuildFile):
             "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
@@ -1301,7 +1326,8 @@ class TopLevelMakefile(BuildFile):
     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
@@ -1311,7 +1337,8 @@ class TopLevelMakefile(BuildFile):
     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