BaseTools: Append FILE_GUID to BaseName.

[mirror_edk2.git] / BaseTools / Conf / build_rule.template

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 3b054c4dddba4089ac9c8e934757200eaa3ba4d3..596d41d5f53ae5d9327dccf9062786dafa03dccb 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -66,6 +66,8 @@
 #   $(LIBS)             Static library files of current module\r
 #   $(<tool>_FLAGS)     Tools flags of current module\r
 #   $(MODULE_NAME)      Current module name\r
+#   $(MODULE_NAME_GUID) Current module name with module FILE_GUID if same $(MODULE_NAME) exists\r
+#                       in different modules, otherwise its value is same as $(MODULE_NAME)\r
 #   $(MODULE_TYPE)      Current module type\r
 #   $(MODULE_GUID)      Current module guid\r
 #   $(ARCH)             Architecture of current module\r
@@ -334,7 +336,7 @@
     <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC>  \r
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
         $(CP) ${dst} $(OUTPUT_DIR)\r
-        $(CP) ${dst} $(BIN_DIR)\r
+        $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi\r
         -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)\r
         -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) \r
     <Command.GCC>\r
@@ -345,11 +347,11 @@
         #The below 2 lines are only needed for UNIXGCC tool chain, which genereates PE image directly\r
         #\r
         -$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}\r
-        -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)\r
+        -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug\r
 \r
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
         $(CP) ${dst} $(OUTPUT_DIR)\r
-        $(CP) ${dst} $(BIN_DIR)\r
+        $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi\r
         -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)\r
         \r
     <Command.XCODE>\r
@@ -359,7 +361,7 @@
         -$(DSYMUTIL) ${src}\r
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS)\r
         $(CP) ${dst} $(OUTPUT_DIR)\r
-        $(CP) ${dst} $(BIN_DIR)\r
+        $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi\r
         -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)\r
 \r
 [Dependency-Expression-File]\r
@@ -516,7 +518,7 @@
 \r
     <Command>\r
         "$(GENFW)" -o ${dst} -j $(MICROCODE_BINARY_FILES) $(GENFW_FLAGS)\r
-        -$(CP) ${dst} $(BIN_DIR)\r
+        -$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).bin\r
 \r
 [EFI-Image-File]\r
     <InputFile>\r
@@ -542,7 +544,7 @@
         ?.efi, ?.EFI, ?.Efi\r
 \r
     <OutputFile>\r
-        $(BIN_DIR)(+)$(MODULE_NAME).rom\r
+        $(BIN_DIR)(+)$(MODULE_NAME_GUID).rom\r
 \r
     <Command>\r
         $(OPTROM) -i $(PCI_DEVICE_ID) -f $(PCI_VENDOR_ID) -l $(PCI_CLASS_CODE) -r $(PCI_REVISION) -o $dst $(OPTROM_FLAGS) $src\r