# HG changeset patch # User duke # Date 1499267729 -7200 # Node ID 7db898d81977e0c171bbfc9298ac4b150b564a32 # Parent 19fe6cf1559bc8d658596eecb92965fdbb8b8f97# Parent 774fb1c5b8d05bddfd0675ba9fe23b4708e08076 Merge diff -r 19fe6cf1559b -r 7db898d81977 .hgtags-top-repo --- a/.hgtags-top-repo Thu Jun 10 13:59:04 2010 -0700 +++ b/.hgtags-top-repo Wed Jul 05 17:15:29 2017 +0200 @@ -71,3 +71,4 @@ d7f35c61afa092b6357c2c4bce3f298f16620f71 jdk7-b94 fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95 cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96 +5e197c942c6ebd8b92f324a31049c5f1d26d40ef jdk7-b97 diff -r 19fe6cf1559b -r 7db898d81977 README-builds.html --- a/README-builds.html Thu Jun 10 13:59:04 2010 -0700 +++ b/README-builds.html Wed Jul 05 17:15:29 2017 +0200 @@ -65,8 +65,9 @@
- Windows x64: Microsoft Visual Studio Compilers + Windows x64: Microsoft Visual Studio 2010 Professional CompilerBEGIN WARNING: At this time (Spring/Summer 2010) JDK 7 is starting a transition to @@ -971,14 +972,13 @@ 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. END WARNING. +open source repositories, but this is 32 bit only. To build 64 bit +Windows binaries use the the 7.1 Windows SDK.END WARNING.
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 VS100COMNTOOLS which @@ -1001,14 +1001,33 @@ The path /usr/bin must be after the path to the Visual Studio product.
- On X64, the set up is much the same in VS2010 + For X64, builds, when using the VS2010 Professional + compiler, the 64 bit build set up is much the same as 32 bit except that you run amd64\VCVARS64.BAT 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.+ Windows x64: Microsoft Windows 7.1 SDK 64 bit compilers. + For a free alternative for 64 bit builds, use the 7.1 SDK. + Microsoft say that to set up your paths for this run +
+ c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd /x64. ++ 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 : +
+ 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 +