Merge
This commit is contained in:
J. Duke
commit
9fde16c467
@ -71,3 +71,4 @@ cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
|
||||
d7f35c61afa092b6357c2c4bce3f298f16620f71 jdk7-b94
|
||||
fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95
|
||||
cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96
|
||||
5e197c942c6ebd8b92f324a31049c5f1d26d40ef jdk7-b97
|
||||
|
||||
@ -65,8 +65,9 @@
|
||||
<li><a href="#cacerts">Certificate Authority File (cacert)</a> </li>
|
||||
<li><a href="#compilers">Compilers</a>
|
||||
<ul>
|
||||
<li><a href="#msvc">Microsoft Visual Studio</a> </li>
|
||||
<li><a href="#mssdk">Microsoft Platform SDK</a> </li>
|
||||
<li><a href="#msvc32">Microsoft Visual Studio Professional/Express for 32 bit</a> </li>
|
||||
<li><a href="#msvc64">Microsoft Visual Studio Professional for 64 bit</a> </li>
|
||||
<li><a href="#mssdk64">Microsoft Windows SDK for 64 bit</a> </li>
|
||||
<li><a href="#gcc">Linux gcc/binutils</a> </li>
|
||||
<li><a href="#studio">Sun Studio</a> </li>
|
||||
</ul>
|
||||
@ -789,11 +790,11 @@
|
||||
</li>
|
||||
<li>
|
||||
Install the
|
||||
<a href="#msvc">Microsoft Visual Studio Compilers</a>).
|
||||
<a href="#msvc32">Microsoft Visual Studio Compilers</a>).
|
||||
</li>
|
||||
<li>
|
||||
Setup all environment variables for compilers
|
||||
(see <a href="#msvc">compilers</a>).
|
||||
(see <a href="#msvc32">compilers</a>).
|
||||
</li>
|
||||
<li>
|
||||
Install
|
||||
@ -958,7 +959,7 @@
|
||||
are also an option, although these compilers have not
|
||||
been extensively used yet.
|
||||
</blockquote>
|
||||
<strong><a name="msvc">Windows i586: Microsoft Visual Studio Compilers</a></strong>
|
||||
<strong><a name="msvc32">Windows i586: Microsoft Visual Studio 2010 Compilers</a></strong>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>BEGIN WARNING</b>: At this time (Spring/Summer 2010) JDK 7 is starting a transition to
|
||||
@ -971,14 +972,13 @@ So for now you should be able to build with either VS2003 or VS2010.
|
||||
We do not guarantee that VS2008 will work, although there is sufficient
|
||||
makefile support to make at least basic JDK builds plausible.
|
||||
Visual Studio 2010 Express compilers are now able to build all the
|
||||
open source repositories, but this is 32 bit only, since
|
||||
we have not yet seen the 7.1 Windows SDK with the 64 bit
|
||||
compilers. <b>END WARNING.</b>
|
||||
open source repositories, but this is 32 bit only. To build 64 bit
|
||||
Windows binaries use the the 7.1 Windows SDK.<b>END WARNING.</b>
|
||||
<p>
|
||||
The 32-bit OpenJDK Windows build
|
||||
requires
|
||||
Microsoft Visual Studio C++ 2010 (VS2010) Professional
|
||||
Edition compiler.
|
||||
Edition or Express compiler.
|
||||
The compiler and other tools are expected to reside
|
||||
in the location defined by the variable
|
||||
<tt>VS100COMNTOOLS</tt> which
|
||||
@ -1001,14 +1001,33 @@ compilers. <b>END WARNING.</b>
|
||||
The path <tt>/usr/bin</tt> must be after the path to the
|
||||
Visual Studio product.
|
||||
</blockquote>
|
||||
<strong><a name="mssdk">Windows x64: Microsoft Visual Studio Compilers</a></strong>
|
||||
<strong><a name="msvc64">Windows x64: Microsoft Visual Studio 2010 Professional Compiler</a></strong>
|
||||
<blockquote>
|
||||
On <b>X64</b>, the set up is much the same in VS2010
|
||||
For <b>X64</b>, builds, when using the VS2010 Professional
|
||||
compiler, the 64 bit build set up is much the same as 32 bit
|
||||
except that you run <tt>amd64\VCVARS64.BAT</tt>
|
||||
to set the compiler environment variables.
|
||||
Previously 64 builds had used the 64 bit compiler in
|
||||
an unbundled Windows SDK but this is no longer necessary.
|
||||
Previously 64 bit builds had used the 64 bit compiler in
|
||||
an unbundled Windows SDK but this is no longer necessary if
|
||||
you have VS2010 Professional.
|
||||
</blockquote>
|
||||
<strong><a name="mssdk64">Windows x64: Microsoft Windows 7.1 SDK 64 bit compilers.</a></strong>
|
||||
For a free alternative for 64 bit builds, use the 7.1 SDK.
|
||||
Microsoft say that to set up your paths for this run
|
||||
<pre>
|
||||
c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd /x64.
|
||||
</pre>
|
||||
What was tested is just directly setting up LIB, INCLUDE,
|
||||
PATH and based on the installation directories using the
|
||||
DOS short name appropriate for the system, (you will
|
||||
need to set them for yours, not just blindly copy this) eg :
|
||||
<pre>
|
||||
set VSINSTALLDIR=c:\PROGRA~2\MICROS~1.0
|
||||
set WindowsSdkDir=c:\PROGRA~1\MICROS~1\Windows\v7.1
|
||||
set PATH=%VSINSTALLDIR%\vc\bin\amd64;%VSINSTALLDIR%\Common7\IDE;%WindowsSdkDir%\bin;%PATH%
|
||||
set INCLUDE=%VSINSTALLDIR%\vc\include;%WindowsSdkDir%\include
|
||||
set LIB=%VSINSTALLDIR%\vc\lib\amd64;%WindowsSdkDir%\lib\x64
|
||||
</pre>
|
||||
</blockquote>
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<h4><a name="zip">Zip and Unzip</a></h4>
|
||||
|
||||
@ -71,3 +71,4 @@ bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91
|
||||
533c11186b44e3a02d6c5fe69a73260505fcfe5e jdk7-b94
|
||||
06dbf406818c789bb586c1de4c002024cd26ecd2 jdk7-b95
|
||||
edc2a2659c77dabc55cb55bb617bad89e3a05bb3 jdk7-b96
|
||||
4ec9d59374caa1e5d72fa802291b4d66955a4936 jdk7-b97
|
||||
|
||||
@ -100,3 +100,4 @@ d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94
|
||||
91d861ba858daca645993a1ab6ba2fa06a8f4a5b jdk7-b95
|
||||
573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 jdk7-b96
|
||||
573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 hs19-b02
|
||||
5f42499e57adc16380780f40541e1a66cd601891 jdk7-b97
|
||||
|
||||
@ -69,8 +69,20 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
|
||||
MAKE_ARGS += Platform_arch_model=x86_64
|
||||
endif
|
||||
|
||||
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
|
||||
ARCH_DATA_MODEL=64
|
||||
PLATFORM=windows-amd64
|
||||
VM_PLATFORM=windows_amd64
|
||||
HS_ARCH=x86
|
||||
MAKE_ARGS += LP64=1
|
||||
MAKE_ARGS += ARCH=x86
|
||||
MAKE_ARGS += BUILDARCH=amd64
|
||||
MAKE_ARGS += Platform_arch=x86
|
||||
MAKE_ARGS += Platform_arch_model=x86_64
|
||||
endif
|
||||
|
||||
# NB later OS versions than 2003 may report "Intel64"
|
||||
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),)
|
||||
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
|
||||
ARCH_DATA_MODEL=64
|
||||
PLATFORM=windows-amd64
|
||||
VM_PLATFORM=windows_amd64
|
||||
|
||||
@ -71,3 +71,4 @@ c725ca829c5aa4b50a8ed5728579ec8809fbfb1d jdk7-b93
|
||||
2de307cd3b4e71127e75dff70809c1b1fbc1a494 jdk7-b94
|
||||
07050840f98cda357aa6a8d416fdccbd03038d35 jdk7-b95
|
||||
9510ed0e1c7ab46a8b6659234e1dc7786407a72b jdk7-b96
|
||||
ca01ec32561fee1855630b68a2fcd0042257a8ef jdk7-b97
|
||||
|
||||
@ -71,3 +71,4 @@ df7c033f6a11c0973ab0e74701b1248aee9b659f jdk7-b92
|
||||
8515e093efd14ac054e941ef743f76561a393a70 jdk7-b94
|
||||
ee06cfb113d554b5c8a9a53383bae2b168533829 jdk7-b95
|
||||
208fd4451232f7a522ddb20334c598656844ccb7 jdk7-b96
|
||||
dac23846092ad4956ed41b5278f8686476ae46ef jdk7-b97
|
||||
|
||||
@ -71,3 +71,4 @@ f2dce7210cc00453c23e53edeec7156f112ca382 jdk7-b92
|
||||
cf44386c8fe3fbdb9da14346be25d19fd1092f71 jdk7-b94
|
||||
db951e984ccf50756160fee3078c791300b0917e jdk7-b95
|
||||
51b9e5dbc2da0631414484b934ac3fb62e48a2c6 jdk7-b96
|
||||
b1903d7528d33b521df42bc9291bdcdd2f444a29 jdk7-b97
|
||||
|
||||
@ -331,23 +331,50 @@ ifeq ($(_ms_sdk),)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Compilers for 64bit may be from SDK. For VS 2010 we use those.
|
||||
# The Express compilers don't contain 64 bit compilers, so in
|
||||
# that case, you additionally need the SDK. At this time,
|
||||
# there's no 64 bit SDK available that has VS 2010.
|
||||
# Presumably SDK v7.1 will provide that and we may want to update
|
||||
# the logic here to work with that.
|
||||
# However official builds will use the Professional version.
|
||||
# Compilers for 64bit may be from the free SDK, or Visual Studio Professional
|
||||
# The free Express compilers don't contain 64 bit compilers, which is why
|
||||
# you instead need the SDK.
|
||||
# So for VS2010 based builds, either VS2010 Pro with the 7.0a SDK, or
|
||||
# the Windows 7.1 standalone SDK with compilers may be used.
|
||||
# Release enginering will use VS2010 Pro, so the frequency of testing of
|
||||
# SDK based builds will depend entirely on individual usage.
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc
|
||||
# VS2010 default location is used when building 64 bit using the 7.1 SDK
|
||||
# This is safe to hardwire as the SDK installer won't let you change it
|
||||
# and the VS2010 variable is only used if the compilers are from the SDK
|
||||
xVS2010 :="$(_program_files32)/Microsoft Visual Studio 10.0/"
|
||||
VS2010 :=$(call FullPath,$(xVS2010))
|
||||
xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
|
||||
_vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
|
||||
endif
|
||||
ifneq ($(_vs100tools),)
|
||||
_compiler_bin :=$(_vs100tools)/../../Vc/bin/amd64
|
||||
_redist_sdk :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT
|
||||
xMSSDK70 :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
|
||||
MSSDK70 :=$(call FullPath,$(xMSSDK70))
|
||||
x_redist_sdk :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT
|
||||
_redist_sdk :=$(call FullPath,$(x_redist_sdk))
|
||||
# The SDK doesn't have the redist directory, but the DLL is installed
|
||||
# into the windows directory.
|
||||
ifeq ($(_redist_sdk),)
|
||||
_redist_sdk :=c:/windows/system32
|
||||
endif
|
||||
# Not currently using MSSDK7n, but maybe we can make use of it for
|
||||
# doing default location lookup to find some SDK tools that presently
|
||||
# require the developer to explicitly set the path.
|
||||
# The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK.
|
||||
# Either will work for us.
|
||||
# If a developer chooses to install the standalone SDK in some other
|
||||
# location, then this will fail to find it, which won't matter so long as
|
||||
# we aren't using this variable. If we do they'd still need to set the
|
||||
# ALT_MSDEVTOOLS_PATH as now.
|
||||
# %WindowsSdkDir% could be referenced instead but the SDK installer
|
||||
# doesn't set it and in the case of the VS2010 compilers,
|
||||
# you can't change this location in the installer anyway.
|
||||
xMSSDK7n :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
|
||||
MSSDK7n :=$(call FullPath,$(xMSSDK7n))
|
||||
ifeq ($(MSSDK7n),)
|
||||
xMSSDK7n :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/"
|
||||
MSSDK7n :=$(call FullPath,$(xMSSDK7n))
|
||||
endif
|
||||
else
|
||||
xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/"
|
||||
VS2008 :=$(call FullPath,$(xVS2008))
|
||||
@ -355,7 +382,7 @@ ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
_compiler_bin :=$(VS2008)/VC/Bin/$(ARCH)
|
||||
xMSSDK61 :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
|
||||
MSSDK61 :=$(call FullPath,$(xMSSDK61))
|
||||
_redist_sdk :=$(VS2008)/VC/redist/x86/Microsoft.VC90.CRT
|
||||
_redist_sdk :=$(VS2008)/VC/redist/x64/Microsoft.VC90.CRT
|
||||
else
|
||||
ifneq ($(_ms_sdk),)
|
||||
ifeq ($(ARCH), ia64)
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
#include FT_FREETYPE_H
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER > 1400
|
||||
#if _MSC_VER > 1400 && _MSC_VER < 1600
|
||||
|
||||
/*
|
||||
* When building for Microsoft Windows, your program has a dependency
|
||||
@ -68,7 +68,7 @@
|
||||
"publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
|
||||
|
||||
#endif /* _M_AMD64 */
|
||||
#endif /* _MSC_VER > 1400 */
|
||||
#endif /* _MSC_VER > 1400 && _MSC_VER < 1600 */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#define QUOTEMACRO(x) QUOTEME(x)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user