BaseTools: Update MYTOOLS

Remove MYTOOLS in tools_def.template and change
MYTOOLS to VS2015x86 in target.template.
https://bugzilla.tianocore.org/show_bug.cgi?id=1377

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index 155e6c40d2e920124c11fdd86fc9b2a3699773c0..d0031380870c04dbbafef1fe111c35a15cd5d7ab 100644 (file)
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -57,7 +57,7 @@ TOOL_CHAIN_CONF       = Conf/tools_def.txt
 #  TAGNAME               List      Optional   Specify the name(s) of the tools_def.txt TagName to use.\r
 #                                             If not specified, all applicable TagName tools will be\r
 #                                             used for the build.  The list uses space character separation.\r
-TOOL_CHAIN_TAG        = MYTOOLS\r
+TOOL_CHAIN_TAG        = VS2015x86\r
 \r
 # MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. If not specified or set\r
 #                                                 to zero, tool automatically detect number of processor\r

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index e7da94679bd8efb616b28d49580cd1ac39504c20..29c5c723751dee5f46b8d37e970685cc0755ce12 100755 (executable)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -108,10 +108,10 @@ DEFINE WINSDK10_BIN       = ENV(WINSDK10_PREFIX)DEF(VS2017_HOST)
 # are used by other toolchains.  An example is that ICC on Windows normally\r
 # uses Microsoft's nmake.exe.\r
 \r
-# Some MS_VS_BIN options: DEF(VS2003_BIN), DEF(VS2005_BIN), DEF(VS2005x86_BIN), DEF(VS2008_BIN), DEF(VS2008x86_BIN)\r
-DEFINE MS_VS_BIN   = DEF(VS2005_BIN)\r
-# Some MS_VS_DLL options: DEF(VS2003_DLL), DEF(VS2005_DLL), DEF(VS2005x86_DLL), DEF(VS2008_DLL), DEF(VS2008x86_DLL)\r
-DEFINE MS_VS_DLL   = DEF(VS2005_DLL)\r
+# Some MS_VS_BIN options: DEF(VS2008_BIN), DEF(VS2008x86_BIN)\r
+DEFINE MS_VS_BIN   = DEF(VS2008_BIN)\r
+# Some MS_VS_DLL options: DEF(VS2008_DLL), DEF(VS2008x86_DLL)\r
+DEFINE MS_VS_DLL   = DEF(VS2008_DLL)\r
 \r
 DEFINE WINDDK_BIN16     = ENV(WINDDK3790_PREFIX)bin16\r
 DEFINE WINDDK_BIN32     = ENV(WINDDK3790_PREFIX)x86\r
@@ -404,14 +404,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler (iasl.exe) from\r
 #                               https://acpica.org/downloads\r
-#   MYTOOLS     -win32-  Requires:\r
-#                             Microsoft Visual Studio 2008 for IA32/X64\r
-#                        Optional:\r
-#                             Required to build EBC drivers:\r
-#                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)\r
-#                             Required to build platforms or ACPI tables:\r
-#                               Intel(r) ACPI Compiler (iasl.exe) from\r
-#                               https://acpica.org/downloads\r
 #   VS2003xASL  -win32-  Requires:\r
 #                             Microsoft Visual Studio .NET 2003\r
 #                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830\r
@@ -5983,119 +5975,6 @@ NOOPT_ICC11x86xASL_X64_DLINK_FLAGS                = /NOLOGO /NODEFAULTLIB /IGNOR
 *_ICC11x86xASL_EBC_DLINK_FLAGS                = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#\r
-# MYTOOLS\r
-#   IA32 - Microsoft Visual Studio 2008 Team Suite\r
-#   X64  - Microsoft Visual Studio 2008 Team Suite\r
-#   EBC  - Intel EFI Byte Code Compiler\r
-#\r
-####################################################################################\r
-#   MYTOOLS          - Settings compatible with previous versions of tools_def.template\r
-*_MYTOOLS_*_*_FAMILY                = MSFT\r
-\r
-##################\r
-# ASL definitions\r
-##################\r
-*_MYTOOLS_*_ASL_PATH        = DEF(DEFAULT_WIN_ASL_BIN)\r
-*_MYTOOLS_*_ASL_FLAGS       = DEF(DEFAULT_WIN_ASL_FLAGS)\r
-*_MYTOOLS_*_ASL_OUTFLAGS    = DEF(DEFAULT_WIN_ASL_OUTFLAGS)\r
-*_MYTOOLS_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)\r
-*_MYTOOLS_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)\r
-*_MYTOOLS_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)\r
-\r
-\r
-*_MYTOOLS_*_MAKE_FLAGS                   = /nologo\r
-*_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC\r
-*_MYTOOLS_*_PP_FLAGS                     = /nologo /E /TC /FIAutoGen.h\r
-*_MYTOOLS_*_SLINK_FLAGS                  = /nologo /LTCG\r
-\r
-*_MYTOOLS_*_ASM16_PATH      = DEF(VS2008_BIN)\ml.exe\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_MYTOOLS_IA32_*_DLL                = DEF(VS2008_DLL)\r
-\r
-*_MYTOOLS_IA32_MAKE_PATH            = DEF(VS2008_BIN)\nmake.exe\r
-*_MYTOOLS_IA32_CC_PATH              = DEF(VS2008_BIN)\cl.exe\r
-*_MYTOOLS_IA32_SLINK_PATH           = DEF(VS2008_BIN)\lib.exe\r
-*_MYTOOLS_IA32_DLINK_PATH           = DEF(VS2008_BIN)\link.exe\r
-*_MYTOOLS_IA32_PP_PATH              = DEF(VS2008_BIN)\cl.exe\r
-*_MYTOOLS_IA32_VFRPP_PATH           = DEF(VS2008_BIN)\cl.exe\r
-*_MYTOOLS_IA32_APP_PATH             = DEF(VS2008_BIN)\cl.exe\r
-*_MYTOOLS_IA32_ASM_PATH             = DEF(VS2008_BIN)\ml.exe\r
-*_MYTOOLS_IA32_ASLCC_PATH           = DEF(VS2008_BIN)\cl.exe\r
-*_MYTOOLS_IA32_ASLPP_PATH           = DEF(VS2008_BIN)\cl.exe\r
-*_MYTOOLS_IA32_ASLDLINK_PATH        = DEF(VS2008_BIN)\link.exe\r
-*_MYTOOLS_IA32_RC_PATH              = DEF(WINSDK_BIN)\rc.exe\r
-\r
-  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
-RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_MYTOOLS_IA32_CC_FLAGS              = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-  DEBUG_MYTOOLS_IA32_ASM_FLAGS           = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
-RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /c /WX /W3 /coff /Cx /Zd\r
-NOOPT_MYTOOLS_IA32_ASM_FLAGS             = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
-  DEBUG_MYTOOLS_IA32_NASM_FLAGS          = -Ox -f win32 -g\r
-RELEASE_MYTOOLS_IA32_NASM_FLAGS          = -Ox -f win32\r
-NOOPT_MYTOOLS_IA32_NASM_FLAGS            = -O0 -f win32 -g\r
-  DEBUG_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb\r
-RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb\r
-NOOPT_MYTOOLS_IA32_DLINK_FLAGS           = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb\r
-\r
-##################\r
-# x64 definitions\r
-##################\r
-*_MYTOOLS_X64_*_DLL                 = DEF(VS2008_DLL)\r
-\r
-*_MYTOOLS_X64_MAKE_PATH             = DEF(VS2008_BIN)\nmake.exe\r
-*_MYTOOLS_X64_CC_PATH               = DEF(VS2008_BINX64)\cl.exe\r
-*_MYTOOLS_X64_SLINK_PATH            = DEF(VS2008_BINX64)\lib.exe\r
-*_MYTOOLS_X64_DLINK_PATH            = DEF(VS2008_BINX64)\link.exe\r
-*_MYTOOLS_X64_PP_PATH               = DEF(VS2008_BINX64)\cl.exe\r
-*_MYTOOLS_X64_VFRPP_PATH            = DEF(VS2008_BINX64)\cl.exe\r
-*_MYTOOLS_X64_APP_PATH              = DEF(VS2008_BINX64)\cl.exe\r
-*_MYTOOLS_X64_ASM_PATH              = DEF(VS2008_BINX64)\ml64.exe\r
-*_MYTOOLS_X64_ASLCC_PATH            = DEF(VS2008_BINX64)\cl.exe\r
-*_MYTOOLS_X64_ASLPP_PATH            = DEF(VS2008_BINX64)\cl.exe\r
-*_MYTOOLS_X64_ASLDLINK_PATH         = DEF(VS2008_BINX64)\link.exe\r
-*_MYTOOLS_X64_RC_PATH               = DEF(WINSDK_BIN)\rc.exe\r
-\r
-  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
-RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-NOOPT_MYTOOLS_X64_CC_FLAGS               = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od\r
-  DEBUG_MYTOOLS_X64_ASM_FLAGS            = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /c /WX /W3 /Cx /Zd\r
-NOOPT_MYTOOLS_X64_ASM_FLAGS              = /nologo /c /WX /W3 /Cx /Zd /Zi\r
-  DEBUG_MYTOOLS_X64_NASM_FLAGS           = -Ox -f win64 -g\r
-RELEASE_MYTOOLS_X64_NASM_FLAGS           = -Ox -f win64\r
-NOOPT_MYTOOLS_X64_NASM_FLAGS             = -O0 -f win64 -g\r
-  DEBUG_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data\r
-NOOPT_MYTOOLS_X64_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
-\r
-##################\r
-# EBC definitions\r
-##################\r
-*_MYTOOLS_EBC_*_FAMILY              = INTEL\r
-\r
-*_MYTOOLS_EBC_MAKE_PATH             = DEF(VS2005_BIN)\nmake.exe\r
-*_MYTOOLS_EBC_PP_PATH               = DEF(EBC_BIN)\iec.exe\r
-*_MYTOOLS_EBC_VFRPP_PATH            = DEF(EBC_BIN)\iec.exe\r
-*_MYTOOLS_EBC_CC_PATH               = DEF(EBC_BIN)\iec.exe\r
-*_MYTOOLS_EBC_SLINK_PATH            = DEF(EBC_BIN)\link.exe\r
-*_MYTOOLS_EBC_DLINK_PATH            = DEF(EBC_BIN)\link.exe\r
-*_MYTOOLS_EBC_RC_PATH               = DEF(VS2005_BIN)\rc.exe\r
-\r
-*_MYTOOLS_EBC_MAKE_FLAGS                 = /nologo\r
-*_MYTOOLS_EBC_PP_FLAGS                   = /nologo /E /TC /FIAutoGen.h\r
-*_MYTOOLS_EBC_CC_FLAGS                   = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
-*_MYTOOLS_EBC_VFRPP_FLAGS                = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-*_MYTOOLS_EBC_SLINK_FLAGS                = /lib /NOLOGO /MACHINE:EBC\r
-*_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER\r
-\r
-\r
 #\r
 # XCODE5 support\r
 #\r