BaseTools:introduce PREFIX env for VS tool path

This patch introduce PREFIX env for VS tool path for tools_def.template
file.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index bae5ab0ad0232396e5aa929250149dbf16c86280..39fda78f8f7e874f0e3ff2cbce9c474b6129926b 100755 (executable)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -17,82 +17,81 @@
 IDENTIFIER = Default TOOL_CHAIN_CONF\r
 \r
 # common path macros\r
-DEFINE VS2003_BIN       = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-DEFINE VS2003_DLL       = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+DEFINE VS2003_BIN       = ENV(VS2003_PREFIX)Vc7\bin\r
+DEFINE VS2003_DLL       = ENV(VS2003_PREFIX)Common7\IDE\r
 \r
-DEFINE VS2005_BIN       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\r
-DEFINE VS2005_DLL       = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE;DEF(VS2005_BIN)\r
-DEFINE VS2005_BINX64    = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64\r
-DEFINE VS2005_BIN64     = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_ia64\r
+DEFINE VS2005_BIN       = ENV(VS2005_PREFIX)Vc\bin\r
+DEFINE VS2005_DLL       = ENV(VS2005_PREFIX)Common7\IDE;DEF(VS2005_BIN)\r
+DEFINE VS2005_BINX64    = DEF(VS2005_BIN)\x86_amd64\r
+DEFINE VS2005_BIN64     = DEF(VS2005_BIN)\x86_ia64\r
 \r
-DEFINE VS2005x86_BIN    = C:\Program Files (x86)\Microsoft Visual Studio 8\Vc\bin\r
-DEFINE VS2005x86_DLL    = C:\Program Files (x86)\Microsoft Visual Studio 8\Common7\IDE;DEF(VS2005x86_BIN)\r
+DEFINE VS2005x86_BIN    = ENV(VS2005_PREFIX)Vc\bin\r
+DEFINE VS2005x86_DLL    = ENV(VS2005_PREFIX)Common7\IDE;DEF(VS2005x86_BIN)\r
 DEFINE VS2005x86_BINX64 = DEF(VS2005x86_BIN)\x86_amd64\r
 DEFINE VS2005x86_BIN64  = DEF(VS2005x86_BIN)\x86_ia64\r
 \r
-DEFINE VS2008_BIN      = C:\Program Files\Microsoft Visual Studio 9.0\Vc\bin\r
-DEFINE VS2008_DLL      = C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE;DEF(VS2008_BIN)\r
+DEFINE VS2008_BIN      = ENV(VS2008_PREFIX)Vc\bin\r
+DEFINE VS2008_DLL      = ENV(VS2008_PREFIX)Common7\IDE;DEF(VS2008_BIN)\r
 DEFINE VS2008_BINX64   = DEF(VS2008_BIN)\x86_amd64\r
 DEFINE VS2008_BIN64    = DEF(VS2008_BIN)\x86_ia64\r
 \r
-DEFINE VS2008x86_BIN    = C:\Program Files (x86)\Microsoft Visual Studio 9.0\Vc\bin\r
-DEFINE VS2008x86_DLL    = C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE;DEF(VS2008x86_BIN)\r
+DEFINE VS2008x86_BIN    = ENV(VS2008_PREFIX)Vc\bin\r
+DEFINE VS2008x86_DLL    = ENV(VS2008_PREFIX)Common7\IDE;DEF(VS2008x86_BIN)\r
 DEFINE VS2008x86_BINX64 = DEF(VS2008x86_BIN)\x86_amd64\r
 DEFINE VS2008x86_BIN64  = DEF(VS2008x86_BIN)\x86_ia64\r
 \r
-DEFINE VS2010_BIN      = C:\Program Files\Microsoft Visual Studio 10.0\Vc\bin\r
-DEFINE VS2010_DLL      = C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE;DEF(VS2010_BIN)\r
+DEFINE VS2010_BIN      = ENV(VS2010_PREFIX)Vc\bin\r
+DEFINE VS2010_DLL      = ENV(VS2010_PREFIX)Common7\IDE;DEF(VS2010_BIN)\r
 DEFINE VS2010_BINX64   = DEF(VS2010_BIN)\x86_amd64\r
 DEFINE VS2010_BIN64    = DEF(VS2010_BIN)\x86_ia64\r
 \r
-DEFINE VS2010x86_BIN    = C:\Program Files (x86)\Microsoft Visual Studio 10.0\Vc\bin\r
-DEFINE VS2010x86_DLL    = C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;DEF(VS2010x86_BIN)\r
+DEFINE VS2010x86_BIN    = ENV(VS2010_PREFIX)Vc\bin\r
+DEFINE VS2010x86_DLL    = ENV(VS2010_PREFIX)Common7\IDE;DEF(VS2010x86_BIN)\r
 DEFINE VS2010x86_BINX64 = DEF(VS2010x86_BIN)\x86_amd64\r
 DEFINE VS2010x86_BIN64  = DEF(VS2010x86_BIN)\x86_ia64\r
 \r
-DEFINE VS2012_BIN      = C:\Program Files\Microsoft Visual Studio 11.0\Vc\bin\r
-DEFINE VS2012_DLL      = C:\Program Files\Microsoft Visual Studio 11.0\Common7\IDE;DEF(VS2012_BIN)\r
+DEFINE VS2012_BIN      = ENV(VS2012_PREFIX)Vc\bin\r
+DEFINE VS2012_DLL      = ENV(VS2012_PREFIX)Common7\IDE;DEF(VS2012_BIN)\r
 DEFINE VS2012_BINX64   = DEF(VS2012_BIN)\x86_amd64\r
 \r
-DEFINE VS2012x86_BIN    = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Vc\bin\r
-DEFINE VS2012x86_DLL    = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE;DEF(VS2012x86_BIN)\r
+DEFINE VS2012x86_BIN    = ENV(VS2012_PREFIX)Vc\bin\r
+DEFINE VS2012x86_DLL    = ENV(VS2012_PREFIX)Common7\IDE;DEF(VS2012x86_BIN)\r
 DEFINE VS2012x86_BINX64 = DEF(VS2012x86_BIN)\x86_amd64\r
 \r
-DEFINE VS2013_BIN      = C:\Program Files\Microsoft Visual Studio 12.0\Vc\bin\r
-DEFINE VS2013_DLL      = C:\Program Files\Microsoft Visual Studio 12.0\Common7\IDE;DEF(VS2012_BIN)\r
+DEFINE VS2013_BIN      = ENV(VS2013_PREFIX)Vc\bin\r
+DEFINE VS2013_DLL      = ENV(VS2013_PREFIX)Common7\IDE;DEF(VS2013_BIN)\r
 DEFINE VS2013_BINX64   = DEF(VS2013_BIN)\x86_amd64\r
 \r
-DEFINE VS2013x86_BIN    = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Vc\bin\r
-DEFINE VS2013x86_DLL    = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE;DEF(VS2013x86_BIN)\r
+DEFINE VS2013x86_BIN    = ENV(VS2013_PREFIX)Vc\bin\r
+DEFINE VS2013x86_DLL    = ENV(VS2013_PREFIX)Common7\IDE;DEF(VS2013x86_BIN)\r
 DEFINE VS2013x86_BINX64 = DEF(VS2013x86_BIN)\x86_amd64\r
 \r
-DEFINE VS2015_BIN      = C:\Program Files\Microsoft Visual Studio 14.0\Vc\bin\r
-DEFINE VS2015_DLL      = C:\Program Files\Microsoft Visual Studio 14.0\Common7\IDE;DEF(VS2015_BIN)\r
+DEFINE VS2015_BIN      = ENV(VS2015_PREFIX)Vc\bin\r
+DEFINE VS2015_DLL      = ENV(VS2015_PREFIX)Common7\IDE;DEF(VS2015_BIN)\r
 DEFINE VS2015_BINX64   = DEF(VS2015_BIN)\x86_amd64\r
 \r
-DEFINE VS2015x86_BIN    = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Vc\bin\r
-DEFINE VS2015x86_DLL    = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE;DEF(VS2015x86_BIN)\r
+DEFINE VS2015x86_BIN    = ENV(VS2015_PREFIX)Vc\bin\r
+DEFINE VS2015x86_DLL    = ENV(VS2015_PREFIX)Common7\IDE;DEF(VS2015x86_BIN)\r
 DEFINE VS2015x86_BINX64 = DEF(VS2015x86_BIN)\x86_amd64\r
 \r
-DEFINE WINSDK_VERSION   = v6.0A\r
-DEFINE WINSDK_BIN       = c:\Program Files\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin\r
-DEFINE WINSDKx86_BIN    = c:\Program Files (x86)\Microsoft SDKs\Windows\DEF(WINSDK_VERSION)\bin\r
+DEFINE WINSDK_BIN       = ENV(WINSDK_PREFIX)\r
+DEFINE WINSDKx86_BIN    = ENV(WINSDKx86_PREFIX)\r
 \r
 # Microsoft Visual Studio 2010\r
-DEFINE WINSDK7_BIN       = c:\Program Files\Microsoft SDKs\Windows\v7.0A\Bin\r
-DEFINE WINSDK7x86_BIN    = c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\r
+DEFINE WINSDK7_BIN       = ENV(WINSDK7_PREFIX)\r
+DEFINE WINSDK7x86_BIN    = ENV(WINSDK7x86_PREFIX)\r
 \r
 # Microsoft Visual Studio 2012 Update 1 (required for rc.exe that was not included in the initial release)\r
-DEFINE WINSDK71_BIN       = c:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\r
-DEFINE WINSDK71x86_BIN    = c:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\r
+DEFINE WINSDK71_BIN       = ENV(WINSDK71_PREFIX)\r
+DEFINE WINSDK71x86_BIN    = ENV(WINSDK71x86_PREFIX)\r
 \r
 # Microsoft Visual Studio 2013 Professional Edition\r
-DEFINE WINSDK8_BIN       = c:\Program Files\Windows Kits\8.0\bin\x86\\r
-DEFINE WINSDK8x86_BIN    = c:\Program Files (x86)\Windows Kits\8.0\bin\x64\r
+DEFINE WINSDK8_BIN       = ENV(WINSDK8_PREFIX)x86\\r
+DEFINE WINSDK8x86_BIN    = ENV(WINSDK8x86_PREFIX)x64\r
 \r
 # Microsoft Visual Studio 2015 Professional Edition\r
-DEFINE WINSDK81_BIN       = c:\Program Files\Windows Kits\8.1\bin\x86\\r
-DEFINE WINSDK81x86_BIN    = c:\Program Files (x86)\Windows Kits\8.1\bin\x64\r
+DEFINE WINSDK81_BIN       = ENV(WINSDK81_PREFIX)x86\\r
+DEFINE WINSDK81x86_BIN    = ENV(WINSDK81x86_PREFIX)x64\r
 \r
 # These defines are needed for certain Microsoft Visual Studio tools that\r
 # are used by other toolchains.  An example is that ICC on Windows normally\r
@@ -103,10 +102,10 @@ DEFINE MS_VS_BIN   = DEF(VS2005_BIN)
 # 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
 \r
-DEFINE WINDDK_BIN16     = C:\WINDDK\3790.1830\bin\bin16\r
-DEFINE WINDDK_BIN32     = C:\WINDDK\3790.1830\bin\x86\r
-DEFINE WINDDK_BINX64    = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
-DEFINE WINDDK_BIN64     = C:\WINDDK\3790.1830\bin\win64\x86\r
+DEFINE WINDDK_BIN16     = ENV(WINDDK3790_PREFIX)bin16\r
+DEFINE WINDDK_BIN32     = ENV(WINDDK3790_PREFIX)x86\r
+DEFINE WINDDK_BINX64    = ENV(WINDDK3790_PREFIX)win64\x86\amd64\r
+DEFINE WINDDK_BIN64     = ENV(WINDDK3790_PREFIX)win64\x86\r
 \r
 # NOTE: The Intel C++ Compiler for Windows requires one of the Microsoft C compiler\r
 #        tool chains for the linker and nmake commands.\r
@@ -201,9 +200,8 @@ DEFINE GCC5_IA32_PREFIX        = ENV(GCC5_BIN)
 DEFINE GCC5_X64_PREFIX         = ENV(GCC5_BIN)\r
 \r
 DEFINE UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl\r
-DEFINE WIN_ASL_BIN_DIR         = C:\ASL\r
-DEFINE WIN_IASL_BIN            = DEF(WIN_ASL_BIN_DIR)\iasl.exe\r
-DEFINE WIN_ASL_BIN             = DEF(WIN_ASL_BIN_DIR)\asl.exe\r
+DEFINE WIN_IASL_BIN            = ENV(IASL_PREFIX)iasl.exe\r
+DEFINE WIN_ASL_BIN             = ENV(IASL_PREFIX)asl.exe\r
 \r
 DEFINE IASL_FLAGS              =\r
 DEFINE IASL_OUTFLAGS           = -p\r