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 edbf24398755e0ecc38054b9ee590e45214e030a..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,6 +241,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
@@ -554,8 +555,16 @@ cleanlib:
             LibraryMakeCommandList.append(Command)\r
 \r
         package_rel_dir = self._AutoGenObject.SourceDir\r
-        if os.sep in package_rel_dir:\r
-            package_rel_dir = package_rel_dir[package_rel_dir.index(os.sep) + 1:]\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
@@ -569,6 +578,7 @@ 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
@@ -846,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
@@ -970,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