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

4 files changed, 22 insertions, 6 deletions

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index 01d175fd88..4a53936b7a 100755
--- a/BaseTools/Bin/Win32/GenFds.exe
+++ b/BaseTools/Bin/Win32/GenFds.exe
diff --git a/BaseTools/Bin/Win32/Trim.exe b/BaseTools/Bin/Win32/Trim.exe
index 0f3ce16185..9aac756d34 100755
--- a/BaseTools/Bin/Win32/Trim.exe
+++ b/BaseTools/Bin/Win32/Trim.exe
diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 79157611eb..e54dfc3eab 100755
--- a/BaseTools/Bin/Win32/build.exe
+++ b/BaseTools/Bin/Win32/build.exe
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 9f49d44261..83dd6a8fd0 100644
--- 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

 #                       (

 #                        Note: The macro and file name are derived from file type name.

-#                        For example, C-Code-File will have C_CODE_FILES_LIST macro pointing 

+#                        For example, C-Code-File will have C_CODE_FILES_LIST macro pointing

 #                        to $(OUTPUT_DIR)/c_code_files.lst. The list file and macro name

 #                        will be generated only when this macro is used in command line.

 #                        This is intended to get over the long command line limitation.

@@ -202,10 +202,10 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).lib

 

     <Command.MSFT, Command.INTEL>

-        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} ${src}

+        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} $(OBJECT_FILES)

 

     <Command.GCC>

-        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src}

+        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) $(OBJECT_FILES)

 

 [Static-Library-File]

     <InputFile>

@@ -218,10 +218,26 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll

 

     <Command.MSFT, Command.INTEL>

-        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) ${src} 

+        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(STATIC_LIBRARY_FILES)

 

     <Command.GCC>

-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) ${src} -\) $(DLINK2_FLAGS)

+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)

+

+[Static-Library-File.USER_DEFINED]

+    <InputFile>

+        *.lib

+

+    <ExtraDependency>

+        $(MAKE_FILE)

+

+    <OutputFile>

+        $(DEBUG_DIR)(+)$(MODULE_NAME)

+

+    <Command.MSFT, Command.INTEL>

+        "$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) $(STATIC_LIBRARY_FILES)

+

+    <Command.GCC>

+        "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)

 

 [Dynamic-Library-File]

     <InputFile>

@@ -326,7 +342,7 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).bin

 

     <Command>

-        GenFw -o ${dst} -j ${src}

+        GenFw -o ${dst} -j $(MICROCODE_BINARY_FILES)

         -$(CP) ${dst} $(BIN_DIR)

 

 [EFI-Image-File]