stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6950375: Remove msvcrt.dll from the Windows JRE bundles

Browse Source 
Reviewed-by: prr
This commit is contained in:
Kelly O'Hair 2011-01-14 14:04:19 -08:00
parent 05a4d88884
commit 5ef33b6dc2
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -360,7 +360,6 @@ CACERTS_FILE.desc = Location of certificates file
DEVTOOLS_PATH.desc = Directory containing zip and gnumake DEVTOOLS_PATH.desc = Directory containing zip and gnumake
CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
DXSDK_PATH.desc = Root directory of DirectX SDK DXSDK_PATH.desc = Root directory of DirectX SDK
MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll
# Make variables to print out (description and value) # Make variables to print out (description and value)
VARIABLE_PRINTVAL_LIST += \ VARIABLE_PRINTVAL_LIST += \
@ -389,12 +388,10 @@ VARIABLE_CHECKFIL_LIST += \
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
VARIABLE_PRINTVAL_LIST += \ VARIABLE_PRINTVAL_LIST += \
DXSDK_PATH \ DXSDK_PATH
MSVCRT_DLL_PATH
VARIABLE_CHECKDIR_LIST += \ VARIABLE_CHECKDIR_LIST += \
DXSDK_PATH \ DXSDK_PATH
MSVCRT_DLL_PATH
endif endif

11
README-builds.html
View File

@ -1414,14 +1414,14 @@
but it's normally found via the DirectX environment variable but it's normally found via the DirectX environment variable
<tt>DXSDK_DIR</tt>. <tt>DXSDK_DIR</tt>.
</blockquote> </blockquote>
<strong><a name="msvcrt"><tt>MSVCR100.DLL</tt></a></strong> <strong><a name="msvcrNN"><tt>MSVCR100.DLL</tt></a></strong>
<blockquote> <blockquote>
The OpenJDK build requires access to a redistributable The OpenJDK build requires access to a redistributable
<tt>MSVCR100.DLL</tt>. <tt>MSVCR100.DLL</tt>.
This is usually picked up automatically from the redist This is usually picked up automatically from the redist
directories of Visual Studio 2010. directories of Visual Studio 2010.
If this cannot be found set the If this cannot be found set the
<a href="#ALT_MSVCRT_DLL_PATH"><tt>ALT_MSVCRT_DLL_PATH</tt></a> <a href="#ALT_MSVCRNN_DLL_PATH"><tt>ALT_MSVCRNN_DLL_PATH</tt></a>
variable to the location of this file. variable to the location of this file.
<p> <p>
</blockquote> </blockquote>
@ -1671,15 +1671,10 @@
variable <tt>DXSDK_DIR</tt>, variable <tt>DXSDK_DIR</tt>,
failing that, look in <tt>C:/DXSDK</tt>. failing that, look in <tt>C:/DXSDK</tt>.
</dd> </dd>
<dt><tt><a name="ALT_MSVCRT_DLL_PATH">ALT_MSVCRT_DLL_PATH</a></tt> </dt>
<dd>
The location of the
<a href="#msvcrt"><tt>MSVCRT.DLL</tt></a>.
</dd>
<dt><tt><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></tt> </dt> <dt><tt><a name="ALT_MSVCRNN_DLL_PATH">ALT_MSVCRNN_DLL_PATH</a></tt> </dt>
<dd> <dd>
The location of the The location of the
<a href="#msvcrt"><tt>MSVCR100.DLL</tt></a>. <a href="#msvcrNN"><tt>MSVCR100.DLL</tt></a>.
</dd> </dd>
</dl> </dl>
</dd> </dd>