License header updated to match correct format.

[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..50bee0dbc114a71c84d32870737e1881ce4f2dab 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -247,6 +247,7 @@ MODULE_FILE = ${module_file}
 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 +553,10 @@ 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
+        if os.sep in package_rel_dir:\r
+            package_rel_dir = package_rel_dir[package_rel_dir.index(os.sep) + 1:]\r
+\r
         MakefileTemplateDict = {\r
             "makefile_header"           : self._FILE_HEADER_[self._FileType],\r
             "makefile_path"             : os.path.join("$(MODULE_BUILD_DIR)", MakefileName),\r
@@ -569,7 +574,8 @@ cleanlib:
             "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
@@ -1177,7 +1183,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 +1194,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 +1208,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 +1266,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 +1283,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 +1313,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 +1324,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