a. Changed MYTOOLS to use Visual Studio Team Suite for IA32 and X64. IPF is still...

b. Re-generated build.exe and GenFds.exe to incorporate new changes of build tools
c. Enable multi-thread build mode by default

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

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index eac822b1803d2bcb4ade11e50d55cf0bc6a9d486..a804fb3cf8aecbbb5ffc310b6415f63bfaa56be5 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFds.exe and b/BaseTools/Bin/Win32/GenFds.exe differ

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 18868862a45340a1be7322cafff926ad43769cdd..7eb3be474dcf02e1bcf8361f52d3867cab75471b 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index e8e32438737c3ddb6bd53f11cc1465effe971883..4f04e936becbf7c1ff5d02a07172922213283612 100644 (file)
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -63,9 +63,9 @@ TOOL_CHAIN_TAG        = MYTOOLS
 #                                             This feature is only available for "spawn" build mode, and \r
 #                                             only for PLATFORM build. The clean, cleanall or\r
 #                                             stand-alone module build is still using the normal way.\r
-MULTIPLE_THREAD       = Disable\r
+MULTIPLE_THREAD       = Enable\r
 \r
 # MAX_CONCURRENT_THREAD_NUMBER  NUMBER  Optional  The number of concurrent threads. Default is 2. Recommend to\r
 #                                                 set this value to one more than the number of your compurter\r
 #                                                 cores or CPUs.\r
-MAX_CONCURRENT_THREAD_NUMBER = 2\r
+MAX_CONCURRENT_THREAD_NUMBER = 1\r

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 541d60d1bc0d70dd6b32d0af55d1ba33f3679ded..8097fc2128184d7b39233bba60d3343d17cfd0b0 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -654,60 +654,51 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe\r
 \r
+*_MYTOOLS_*_MAKE_FLAGS                   = /nologo\r
 *_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.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
 ##################\r
 # IA32 definitions\r
 ##################\r
-*_MYTOOLS_IA32_*_DLL                = DEF(VSNET2003_DLL)\r
+*_MYTOOLS_IA32_*_DLL                = DEF(VS2005TEAMSUITE_DLL)\r
 \r
-*_MYTOOLS_IA32_MAKE_PATH            = DEF(VSNET2003_BIN)\nmake.exe\r
-*_MYTOOLS_IA32_CC_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
-*_MYTOOLS_IA32_SLINK_PATH           = DEF(VSNET2003_BIN)\lib.exe\r
-*_MYTOOLS_IA32_DLINK_PATH           = DEF(VSNET2003_BIN)\link.exe\r
+*_MYTOOLS_IA32_MAKE_PATH            = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+*_MYTOOLS_IA32_CC_PATH              = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_SLINK_PATH           = DEF(VS2005TEAMSUITE_BIN)\lib.exe\r
+*_MYTOOLS_IA32_DLINK_PATH           = DEF(VS2005TEAMSUITE_BIN)\link.exe\r
 *_MYTOOLS_IA32_ASMLINK_PATH         = DEF(WINDDK_BIN16)\link.exe\r
-*_MYTOOLS_IA32_PP_PATH              = DEF(VSNET2003_BIN)\cl.exe\r
-*_MYTOOLS_IA32_VFRPP_PATH           = DEF(VSNET2003_BIN)\cl.exe\r
-*_MYTOOLS_IA32_APP_PATH             = DEF(VSNET2003_BIN)\cl.exe\r
-*_MYTOOLS_IA32_ASM_PATH             = DEF(VSNET2003_BIN)\ml.exe\r
-*_MYTOOLS_IA32_PCH_PATH             = DEF(VSNET2003_BIN)\cl.exe\r
-\r
-      *_MYTOOLS_IA32_MAKE_FLAGS          = /nologo\r
-      *_MYTOOLS_IA32_APP_FLAGS           = /nologo /E /TC\r
-      *_MYTOOLS_IA32_PP_FLAGS            = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm\r
-RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192\r
-  DEBUG_MYTOOLS_IA32_PCH_FLAGS           = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
-RELEASE_MYTOOLS_IA32_PCH_FLAGS           = /nologo /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
+*_MYTOOLS_IA32_PP_PATH              = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_VFRPP_PATH           = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_APP_PATH             = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
+*_MYTOOLS_IA32_ASM_PATH             = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
+\r
+  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm \r
+RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
   DEBUG_MYTOOLS_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
 RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /W3 /WX /c /coff /Cx /Zd /W0\r
       *_MYTOOLS_IA32_ASMLINK_FLAGS       = /nologo /tiny\r
-      *_MYTOOLS_IA32_SLINK_FLAGS         = /nologo /LTCG\r
-  DEBUG_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
-RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+  DEBUG_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb\r
+RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb\r
 \r
 ##################\r
 # x64 definitions\r
 ##################\r
-*_MYTOOLS_X64_MAKE_PATH             = DEF(WINDDK_BIN32)\nmake.exe\r
-*_MYTOOLS_X64_CC_PATH               = DEF(WINDDK_BINX64)\cl.exe\r
-*_MYTOOLS_X64_SLINK_PATH            = DEF(WINDDK_BINX64)\lib.exe\r
-*_MYTOOLS_X64_DLINK_PATH            = DEF(WINDDK_BINX64)\link.exe\r
-*_MYTOOLS_X64_ASMLINK_PATH          = DEF(WINDDK_BIN16)\link.exe\r
-*_MYTOOLS_X64_PP_PATH               = DEF(WINDDK_BINX64)\cl.exe\r
-*_MYTOOLS_X64_VFRPP_PATH            = DEF(WINDDK_BINX64)\cl.exe\r
-*_MYTOOLS_X64_APP_PATH              = DEF(WINDDK_BINX64)\cl.exe\r
-*_MYTOOLS_X64_ASM_PATH              = DEF(WINDDK_BINX64)\ml64.exe\r
-*_MYTOOLS_X64_PCH_PATH              = DEF(WINDDK_BINX64)\cl.exe\r
-\r
-      *_MYTOOLS_X64_SLINK_FLAGS          = /nologo /LTCG\r
-      *_MYTOOLS_X64_APP_FLAGS            = /nologo /E /TC\r
-      *_MYTOOLS_X64_PP_FLAGS             = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-      *_MYTOOLS_X64_MAKE_FLAGS           = /nologo\r
-  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Gm /EHs-c- /GF\r
-RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF\r
-  DEBUG_MYTOOLS_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Gm /EHs-c- /GF\r
-RELEASE_MYTOOLS_X64_PCH_FLAGS            = /nologo /X /W4 /WX /c /Gs8192 /GS- /D UNICODE /O1ib2s /GL /Gy /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /EHs-c- /GF\r
+*_MYTOOLS_X64_*_DLL                 = DEF(VS2005TEAMSUITE_DLL)\r
+\r
+*_MYTOOLS_X64_MAKE_PATH             = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
+*_MYTOOLS_X64_CC_PATH               = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_SLINK_PATH            = DEF(VS2005TEAMSUITE_BINX64)\lib.exe\r
+*_MYTOOLS_X64_DLINK_PATH            = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
+*_MYTOOLS_X64_PP_PATH               = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_VFRPP_PATH            = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_APP_PATH              = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
+*_MYTOOLS_X64_ASM_PATH              = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe\r
+\r
+  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm \r
+RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /GS- /W4 /WX /Gy /c /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GF /Gs8192\r
   DEBUG_MYTOOLS_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd /Zi\r
 RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /W3 /WX /c /Cx /Zd\r
   DEBUG_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /Machine:AMD64 /LTCG /DLL /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
@@ -725,21 +716,15 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_IPF_VFRPP_PATH            = DEF(WINDDK_BIN64)\cl.exe\r
 *_MYTOOLS_IPF_APP_PATH              = DEF(WINDDK_BIN64)\cl.exe\r
 *_MYTOOLS_IPF_ASM_PATH              = DEF(WINDDK_BIN64)\ias.exe\r
-*_MYTOOLS_IPF_PCH_PATH              = DEF(WINDDK_BIN64)\cl.exe\r
 \r
       *_MYTOOLS_IPF_ASM_OUTPUT           = "-o "\r
 \r
-      *_MYTOOLS_IPF_MAKE_FLAGS           = /nologo\r
-      *_MYTOOLS_IPF_APP_FLAGS            = /nologo /E /TC\r
-      *_MYTOOLS_IPF_PP_FLAGS             = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
-  DEBUG_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zi /Zx\r
-RELEASE_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Zx\r
-  DEBUG_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /TC /Zi /Zx\r
-RELEASE_MYTOOLS_IPF_PCH_FLAGS            = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FI$(DEST_DIR_DEBUG)/AutoGen.h /Yc /TC /Zx\r
+  DEBUG_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FIAutoGen.h /Zi /Zx\r
+RELEASE_MYTOOLS_IPF_CC_FLAGS             = /GS- /nologo /W4 /WX /EHs-c- /Gy /c /Ox /GF /GL /X /FIAutoGen.h /Zx\r
   DEBUG_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
 RELEASE_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4\r
-  DEBUG_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG\r
-RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb\r
+  DEBUG_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG\r
+RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(ENTRYPOINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb\r
       *_MYTOOLS_IPF_SLINK_FLAGS          = /nologo /LTCG\r
 \r
 ##################\r
@@ -747,7 +732,7 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 ##################\r
 *_MYTOOLS_EBC_*_FAMILY              = INTEL\r
 \r
-*_MYTOOLS_EBC_MAKE_PATH             = DEF(VSNET2003_BIN)\nmake.exe\r
+*_MYTOOLS_EBC_MAKE_PATH             = DEF(VS2005TEAMSUITE_BIN)\nmake.exe\r
 *_MYTOOLS_EBC_PP_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