Fri, 14 Jan 2011 14:04:19 -0800
6950375: Remove msvcrt.dll from the Windows JRE bundles
Reviewed-by: prr
Makefile | file | annotate | diff | comparison | revisions | |
README-builds.html | file | annotate | diff | comparison | revisions |
1.1 --- a/Makefile Thu Jan 13 17:55:10 2011 -0800 1.2 +++ b/Makefile Fri Jan 14 14:04:19 2011 -0800 1.3 @@ -360,7 +360,6 @@ 1.4 DEVTOOLS_PATH.desc = Directory containing zip and gnumake 1.5 CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files 1.6 DXSDK_PATH.desc = Root directory of DirectX SDK 1.7 -MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll 1.8 1.9 # Make variables to print out (description and value) 1.10 VARIABLE_PRINTVAL_LIST += \ 1.11 @@ -389,12 +388,10 @@ 1.12 ifeq ($(PLATFORM), windows) 1.13 1.14 VARIABLE_PRINTVAL_LIST += \ 1.15 - DXSDK_PATH \ 1.16 - MSVCRT_DLL_PATH 1.17 + DXSDK_PATH 1.18 1.19 VARIABLE_CHECKDIR_LIST += \ 1.20 - DXSDK_PATH \ 1.21 - MSVCRT_DLL_PATH 1.22 + DXSDK_PATH 1.23 1.24 endif 1.25
2.1 --- a/README-builds.html Thu Jan 13 17:55:10 2011 -0800 2.2 +++ b/README-builds.html Fri Jan 14 14:04:19 2011 -0800 2.3 @@ -1414,14 +1414,14 @@ 2.4 but it's normally found via the DirectX environment variable 2.5 <tt>DXSDK_DIR</tt>. 2.6 </blockquote> 2.7 - <strong><a name="msvcrt"><tt>MSVCR100.DLL</tt></a></strong> 2.8 + <strong><a name="msvcrNN"><tt>MSVCR100.DLL</tt></a></strong> 2.9 <blockquote> 2.10 The OpenJDK build requires access to a redistributable 2.11 <tt>MSVCR100.DLL</tt>. 2.12 This is usually picked up automatically from the redist 2.13 directories of Visual Studio 2010. 2.14 If this cannot be found set the 2.15 - <a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a> 2.16 + <a href="#ALT_MSVCRNN_DLL_PATH"><tt>ALT_MSVCRNN_DLL_PATH</tt></a> 2.17 variable to the location of this file. 2.18 <p> 2.19 </blockquote> 2.20 @@ -1671,15 +1671,10 @@ 2.21 variable <tt>DXSDK_DIR</tt>, 2.22 failing that, look in <tt>C:/DXSDK</tt>. 2.23 </dd> 2.24 - <dt><tt><a name="ALT_MSVCRT_DLL_PATH">ALT_MSVCRT_DLL_PATH</a></tt> </dt> 2.25 - <dd> 2.26 - The location of the 2.27 - <a href="#msvcrt"><tt>MSVCRT.DLL</tt></a>. 2.28 - </dd> 2.29 <dt><tt><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></tt> </dt> 2.30 <dd> 2.31 The location of the 2.32 - <a href="#msvcrt"><tt>MSVCR100.DLL</tt></a>. 2.33 + <a href="#msvcrNN"><tt>MSVCR100.DLL</tt></a>. 2.34 </dd> 2.35 </dl> 2.36 </dd>