diff -Napcdr -x .git postgres/doc/src/sgml/install-windows.sgml postgres_dev/doc/src/sgml/install-windows.sgml *** postgres/doc/src/sgml/install-windows.sgml Thu Sep 13 23:17:21 2012 --- postgres_dev/doc/src/sgml/install-windows.sgml Thu Sep 13 23:22:03 2012 *************** *** 22,28 **** Microsoft tools is to install a supported version of the Microsoft Windows SDK and use the included compiler. It is also possible to build with the full ! Microsoft Visual C++ 2005, 2008, 2010 or 2012. In some cases that requires the installation of the Windows SDK in addition to the compiler. --- 22,28 ---- Microsoft tools is to install a supported version of the Microsoft Windows SDK and use the included compiler. It is also possible to build with the full ! Microsoft Visual C++ 2005, 2008 or 2010. In some cases that requires the installation of the Windows SDK in addition to the compiler. *************** *** 77,91 **** Visual Studio Express or some versions of the Microsoft Windows SDK. If you do not already have a Visual Studio environment set up, the easiest ! ways are to use the compilers in the Windows SDK ! (<= 7.1) or those from Visual Studio Express 2012 for Windows ! Desktop, which are both free downloads from Microsoft. PostgreSQL is known to support compilation using the compilers shipped with Visual Studio 2005 to ! Visual Studio 2012 (including Express editions), as well as standalone Windows SDK releases 6.0 to 7.1. 64-bit PostgreSQL builds are only supported with Microsoft Windows SDK version 6.0a and above or --- 77,90 ---- Visual Studio Express or some versions of the Microsoft Windows SDK. If you do not already have a Visual Studio environment set up, the easiest ! way is to use the compilers in the Windows SDK, ! which is a free download from Microsoft. PostgreSQL is known to support compilation using the compilers shipped with Visual Studio 2005 to ! Visual Studio 2010 (including Express editions), as well as standalone Windows SDK releases 6.0 to 7.1. 64-bit PostgreSQL builds are only supported with Microsoft Windows SDK version 6.0a and above or *************** $ENV{PATH}=$ENV{PATH} . ';c:\some\where\ *** 158,165 **** If you install the Windows SDK including the Visual C++ Compilers, you don't need Visual Studio to build. - Note that as of Version 8.0a the Windows SDK no longer ships with a - complete command-line build environment. --- 157,162 ---- *************** $ENV{PATH}=$ENV{PATH} . ';c:\some\where\ *** 201,210 **** Bison can be downloaded from . Flex can be downloaded from . ! If you are using msysGit or GitHub for ! Windows for accessing the PostgreSQL Git ! repository you probably already have recent versions of bison and flex in your ! Git binary directory. --- 198,207 ---- Bison can be downloaded from . Flex can be downloaded from . ! If you are using msysGit for accessing the ! PostgreSQL Git repository you probably already ! have recent versions of bison and flex in your Git ! binary directory. diff -Napcdr -x .git postgres/src/tools/msvc/MSBuildProject.pm postgres_dev/src/tools/msvc/MSBuildProject.pm *** postgres/src/tools/msvc/MSBuildProject.pm Thu Sep 13 23:17:32 2012 --- postgres_dev/src/tools/msvc/MSBuildProject.pm Thu Sep 13 23:22:03 2012 *************** sub new *** 397,440 **** return $self; } - package VC2012Project; - - # - # Package that encapsulates a Visual C++ 2012 project file - # - - use strict; - use warnings; - use base qw(MSBuildProject); - - sub new - { - my $classname = shift; - my $self = $classname->SUPER::_new(@_); - bless($self, $classname); - - $self->{vcver} = '11.00'; - - return $self; - } - - sub WriteConfigurationPropertyGroup - { - my ($self, $f, $cfgname, $p) = @_; - my $cfgtype = - ($self->{type} eq "exe") - ?'Application' - :($self->{type} eq "dll"?'DynamicLibrary':'StaticLibrary'); - - print $f < - $cfgtype - false - MultiByte - $p->{wholeopt} - v110 - - EOF - } - 1; --- 397,400 ---- diff -Napcdr -x .git postgres/src/tools/msvc/Solution.pm postgres_dev/src/tools/msvc/Solution.pm *** postgres/src/tools/msvc/Solution.pm Thu Sep 13 23:17:32 2012 --- postgres_dev/src/tools/msvc/Solution.pm Thu Sep 13 23:22:03 2012 *************** sub new *** 689,716 **** return $self; } - package VS2012Solution; - - # - # Package that encapsulates a Visual Studio 2012 solution file - # - - use Carp; - use strict; - use warnings; - use base qw(Solution); - - sub new - { - my $classname = shift; - my $self = $classname->SUPER::_new(@_); - bless($self, $classname); - - $self->{solutionFileVersion} = '12.00'; - $self->{vcver} = '11.00'; - $self->{visualStudioName} = 'Visual Studio 2012'; - - return $self; - } - 1; --- 689,692 ---- diff -Napcdr -x .git postgres/src/tools/msvc/VSObjectFactory.pm postgres_dev/src/tools/msvc/VSObjectFactory.pm *** postgres/src/tools/msvc/VSObjectFactory.pm Thu Sep 13 23:17:32 2012 --- postgres_dev/src/tools/msvc/VSObjectFactory.pm Thu Sep 13 23:22:03 2012 *************** sub CreateSolution *** 41,50 **** { return new VS2010Solution(@_); } - elsif ($visualStudioVersion eq '11.00') - { - return new VS2012Solution(@_); - } else { croak "The requested Visual Studio version is not supported."; --- 41,46 ---- *************** sub CreateProject *** 72,81 **** { return new VC2010Project(@_); } - elsif ($visualStudioVersion eq '11.00') - { - return new VC2012Project(@_); - } else { croak "The requested Visual Studio version is not supported."; --- 68,73 ---- *************** sub DetermineVisualStudioVersion *** 115,125 **** sub _GetVisualStudioVersion { my ($major, $minor) = @_; ! if ($major > 11) { carp "The determined version of Visual Studio is newer than the latest supported version. Returning the latest supported version instead."; ! return '11.00'; } elsif ($major < 6) { --- 107,117 ---- sub _GetVisualStudioVersion { my ($major, $minor) = @_; ! if ($major > 10) { carp "The determined version of Visual Studio is newer than the latest supported version. Returning the latest supported version instead."; ! return '10.00'; } elsif ($major < 6) { diff -Napcdr -x .git postgres/src/tools/msvc/build.pl postgres_dev/src/tools/msvc/build.pl *** postgres/src/tools/msvc/build.pl Thu Sep 13 23:17:32 2012 --- postgres_dev/src/tools/msvc/build.pl Thu Sep 13 23:22:03 2012 *************** elsif ($ARGV[0] ne "RELEASE") *** 50,56 **** # ... and do it ! if ($buildwhat and $vcver >= 10.00) { system( "msbuild $buildwhat.vcxproj /verbosity:detailed /p:Configuration=$bconf"); --- 50,56 ---- # ... and do it ! if ($buildwhat and $vcver eq '10.00') { system( "msbuild $buildwhat.vcxproj /verbosity:detailed /p:Configuration=$bconf");