1. Use FAMILY defined in *_TAGNAME_*_*_FAMILY as the toolchain family

2. Force file name case check in Windows
3. Consolidate file/path operations
4. Support binary file type in build_rule.txt
5. Generate $(FILE_TYPES) macro only when it's used in build_rule.txt
6. Fix HSD202142 and HSD202144

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7529 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index 01d175fd885f8814bbf379c90e9e5c6446cf6c51..4a53936b7a644cc6e1c5b56b54954df88862a4a1 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFds.exe and b/BaseTools/Bin/Win32/GenFds.exe differ

diff --git a/BaseTools/Bin/Win32/Trim.exe b/BaseTools/Bin/Win32/Trim.exe
index 0f3ce16185c1250ad472cd95a86efa9dfdc2429b..9aac756d349173723015b4fd6cbf037fcbbcb3c0 100755 (executable)
Binary files a/BaseTools/Bin/Win32/Trim.exe and b/BaseTools/Bin/Win32/Trim.exe differ

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 79157611ebd5c29b067a0bb0956a7138d15c8297..e54dfc3eab2834970b6def0c40c754d0f9ef9df5 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 9f49d44261c65d467619eeddeac1100e12520b2f..83dd6a8fd0fd31447e70db637864a5a0f46c7111 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -80,7 +80,7 @@
 #   $(<FILE_TYPES_LIST>) Macro point to a file containing list of files of a file type\r
 #                       (\r
 #                        Note: The macro and file name are derived from file type name.\r
-#                        For example, C-Code-File will have C_CODE_FILES_LIST macro pointing \r
+#                        For example, C-Code-File will have C_CODE_FILES_LIST macro pointing\r
 #                        to $(OUTPUT_DIR)/c_code_files.lst. The list file and macro name\r
 #                        will be generated only when this macro is used in command line.\r
 #                        This is intended to get over the long command line limitation.\r
@@ -202,10 +202,10 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).lib\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} ${src}\r
+        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} $(OBJECT_FILES)\r
 \r
     <Command.GCC>\r
-        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src}\r
+        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) $(OBJECT_FILES)\r
 \r
 [Static-Library-File]\r
     <InputFile>\r
@@ -218,10 +218,26 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) ${src} \r
+        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(STATIC_LIBRARY_FILES)\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) ${src} -\) $(DLINK2_FLAGS)\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
+\r
+[Static-Library-File.USER_DEFINED]\r
+    <InputFile>\r
+        *.lib\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME)\r
+\r
+    <Command.MSFT, Command.INTEL>\r
+        "$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) $(STATIC_LIBRARY_FILES)\r
+\r
+    <Command.GCC>\r
+        "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
 \r
 [Dynamic-Library-File]\r
     <InputFile>\r
@@ -326,7 +342,7 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).bin\r
 \r
     <Command>\r
-        GenFw -o ${dst} -j ${src}\r
+        GenFw -o ${dst} -j $(MICROCODE_BINARY_FILES)\r
         -$(CP) ${dst} $(BIN_DIR)\r
 \r
 [EFI-Image-File]\r