Mon, 26 Aug 2013 21:59:50 -0700
8020622: create.bat on Windows failed to create project file for Visual Studio 2012
Summary: Treat VS2012 the same as VS2010.
Reviewed-by: dcubed, kamg, minqi
make/windows/create.bat | file | annotate | diff | comparison | revisions | |
make/windows/makefiles/rules.make | file | annotate | diff | comparison | revisions |
1.1 --- a/make/windows/create.bat Mon Aug 26 07:01:23 2013 -0700 1.2 +++ b/make/windows/create.bat Mon Aug 26 21:59:50 2013 -0700 1.3 @@ -82,6 +82,7 @@ 1.4 1.5 echo ************************************************************** 1.6 set ProjectFile=%HotSpotBuildSpace%\jvm.vcproj 1.7 +echo MSC_VER = "%MSC_VER%" 1.8 if "%MSC_VER%" == "1200" ( 1.9 set ProjectFile=%HotSpotBuildSpace%\jvm.dsp 1.10 echo Will generate VC6 project {unsupported} 1.11 @@ -96,11 +97,17 @@ 1.12 echo Will generate VC10 {Visual Studio 2010} 1.13 set ProjectFile=%HotSpotBuildSpace%\jvm.vcxproj 1.14 ) else ( 1.15 +if "%MSC_VER%" == "1700" ( 1.16 +echo Will generate VC10 {compatible with Visual Studio 2012} 1.17 +echo After opening in VS 2012, click "Update" when prompted. 1.18 +set ProjectFile=%HotSpotBuildSpace%\jvm.vcxproj 1.19 +) else ( 1.20 echo Will generate VC7 project {Visual Studio 2003 .NET} 1.21 ) 1.22 ) 1.23 ) 1.24 ) 1.25 +) 1.26 echo %ProjectFile% 1.27 echo ************************************************************** 1.28
2.1 --- a/make/windows/makefiles/rules.make Mon Aug 26 07:01:23 2013 -0700 2.2 +++ b/make/windows/makefiles/rules.make Mon Aug 26 21:59:50 2013 -0700 2.3 @@ -69,6 +69,13 @@ 2.4 VcVersion=VC10 2.5 ProjectFile=jvm.vcxproj 2.6 2.7 +!elseif "$(MSC_VER)" == "1700" 2.8 +# This is VS2012, but it loads VS10 projects just fine (and will 2.9 +# upgrade them automatically to VS2012 format). 2.10 + 2.11 +VcVersion=VC10 2.12 +ProjectFile=jvm.vcxproj 2.13 + 2.14 !else 2.15 2.16 VcVersion=VC7