aboutsummaryrefslogtreecommitdiff
path: root/src/tools/msvc
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/msvc')
-rw-r--r--src/tools/msvc/Install.pm25
-rw-r--r--src/tools/msvc/MSBuildProject.pm24
-rw-r--r--src/tools/msvc/Mkvcbuild.pm24
-rw-r--r--src/tools/msvc/Project.pm3
-rw-r--r--src/tools/msvc/Solution.pm24
-rw-r--r--src/tools/msvc/VCBuildProject.pm2
-rw-r--r--src/tools/msvc/vcregress.pl11
7 files changed, 63 insertions, 50 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 0d0c46e18bb..a11c59b89de 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -37,13 +37,15 @@ sub Install
$| = 1;
my $target = shift;
+
# if called from vcregress, the config will be passed to us
# so no need to re-include these
our $config = shift;
unless ($config)
{
+
# suppress warning about harmless redeclaration of $config
- no warnings 'misc';
+ no warnings 'misc';
require "config_default.pl";
require "config.pl" if (-f "config.pl");
}
@@ -83,11 +85,15 @@ sub Install
"src");
CopySetOfFiles('config files', $sample_files, $target . '/share/');
CopyFiles(
- 'Import libraries', $target . '/lib/',
- "$conf\\", "postgres\\postgres.lib",
- "libpq\\libpq.lib", "libecpg\\libecpg.lib",
+ 'Import libraries',
+ $target . '/lib/',
+ "$conf\\",
+ "postgres\\postgres.lib",
+ "libpq\\libpq.lib",
+ "libecpg\\libecpg.lib",
"libpgcommon\\libpgcommon.lib",
- "libpgport\\libpgport.lib", "libpgtypes\\libpgtypes.lib",
+ "libpgport\\libpgport.lib",
+ "libpgtypes\\libpgtypes.lib",
"libecpg_compat\\libecpg_compat.lib");
CopySetOfFiles(
'timezone names',
@@ -490,11 +496,10 @@ sub CopyIncludeFiles
'include/internal/libpq', 'include/server', 'include/server/parser');
CopyFiles(
- 'Public headers',
- $target . '/include/',
- 'src/include/', 'postgres_ext.h',
- 'pg_config.h', 'pg_config_ext.h', 'pg_config_os.h',
- 'pg_config_manual.h');
+ 'Public headers', $target . '/include/',
+ 'src/include/', 'postgres_ext.h',
+ 'pg_config.h', 'pg_config_ext.h',
+ 'pg_config_os.h', 'pg_config_manual.h');
lcopy('src/include/libpq/libpq-fs.h', $target . '/include/libpq/')
|| croak 'Could not copy libpq-fs.h';
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
index 0cafd717a2b..217c47ab78a 100644
--- a/src/tools/msvc/MSBuildProject.pm
+++ b/src/tools/msvc/MSBuildProject.pm
@@ -64,7 +64,7 @@ EOF
# We have to use this flag on 32 bit targets because the 32bit perls
# are built with it and sometimes crash if we don't.
- my $use_32bit_time_t =
+ my $use_32bit_time_t =
$self->{platform} eq 'Win32' ? '_USE_32BIT_TIME_T;' : '';
$self->WriteItemDefinitionGroup(
@@ -409,26 +409,26 @@ use base qw(MSBuildProject);
sub new
{
- my $classname = shift;
- my $self = $classname->SUPER::_new(@_);
- bless($self, $classname);
+ my $classname = shift;
+ my $self = $classname->SUPER::_new(@_);
+ bless($self, $classname);
- $self->{vcver} = '11.00';
+ $self->{vcver} = '11.00';
- return $self;
+ return $self;
}
# This override adds the <PlatformToolset> element
# to the PropertyGroup labeled "Configuration"
sub WriteConfigurationPropertyGroup
{
- my ($self, $f, $cfgname, $p) = @_;
- my $cfgtype =
- ($self->{type} eq "exe")
- ?'Application'
- :($self->{type} eq "dll"?'DynamicLibrary':'StaticLibrary');
+ my ($self, $f, $cfgname, $p) = @_;
+ my $cfgtype =
+ ($self->{type} eq "exe")
+ ? 'Application'
+ : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary');
- print $f <<EOF;
+ print $f <<EOF;
<PropertyGroup Condition="'\$(Configuration)|\$(Platform)'=='$cfgname|$self->{platform}'" Label="Configuration">
<ConfigurationType>$cfgtype</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index a4bd2b62107..e1650a98121 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -49,8 +49,7 @@ my $contrib_extraincludes =
{ 'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend'] };
my $contrib_extrasource = {
'cube' => [ 'cubescan.l', 'cubeparse.y' ],
- 'seg' => [ 'segscan.l', 'segparse.y' ],
- };
+ 'seg' => [ 'segscan.l', 'segparse.y' ], };
my @contrib_excludes = ('pgcrypto', 'intagg', 'sepgsql');
sub mkvcbuild
@@ -75,10 +74,9 @@ sub mkvcbuild
win32error.c win32setlocale.c);
our @pgcommonallfiles = qw(
- relpath.c);
+ relpath.c);
- our @pgcommonfrontendfiles = (@pgcommonallfiles,
- qw(fe_memutils.c));
+ our @pgcommonfrontendfiles = (@pgcommonallfiles, qw(fe_memutils.c));
our @pgcommonbkndfiles = @pgcommonallfiles;
@@ -103,7 +101,7 @@ sub mkvcbuild
'src\backend\port\win32_shmem.c');
$postgres->ReplaceFile('src\backend\port\pg_latch.c',
'src\backend\port\win32_latch.c');
- $postgres->AddFiles('src\port', @pgportfiles);
+ $postgres->AddFiles('src\port', @pgportfiles);
$postgres->AddFiles('src\common', @pgcommonbkndfiles);
$postgres->AddDir('src\timezone');
$postgres->AddFiles('src\backend\parser', 'scan.l', 'gram.y');
@@ -593,17 +591,19 @@ sub mkvcbuild
# fix up pg_xlogdump once it's been set up
# files symlinked on Unix are copied on windows
- my $pg_xlogdump = (grep {$_->{name} eq 'pg_xlogdump'}
- @{$solution->{projects}->{contrib}} )[0];
+ my $pg_xlogdump =
+ (grep { $_->{name} eq 'pg_xlogdump' }
+ @{ $solution->{projects}->{contrib} })[0];
$pg_xlogdump->AddDefine('FRONTEND');
- foreach my $xf (glob('src/backend/access/rmgrdesc/*desc.c') )
+ foreach my $xf (glob('src/backend/access/rmgrdesc/*desc.c'))
{
my $bf = basename $xf;
- copy($xf,"contrib/pg_xlogdump/$bf");
+ copy($xf, "contrib/pg_xlogdump/$bf");
$pg_xlogdump->AddFile("contrib\\pg_xlogdump\\$bf");
}
- copy('src/backend/access/transam/xlogreader.c',
- 'contrib/pg_xlogdump/xlogreader.c');
+ copy(
+ 'src/backend/access/transam/xlogreader.c',
+ 'contrib/pg_xlogdump/xlogreader.c');
$solution->Save();
return $solution->{vcver};
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
index 4182871e88e..9ca5b1f13ad 100644
--- a/src/tools/msvc/Project.pm
+++ b/src/tools/msvc/Project.pm
@@ -225,7 +225,8 @@ sub AddDir
if ($filter eq "LIBOBJS")
{
- if (grep(/$p/, @main::pgportfiles, @main::pgcommonfiles) == 1)
+ if (grep(/$p/, @main::pgportfiles, @main::pgcommonfiles)
+ == 1)
{
$p =~ s/\.c/\.o/;
$matches .= $p . " ";
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index e271ac8d9be..bc52086fc8a 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -242,10 +242,12 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
}
if (IsNewer(
- "src\\include\\pg_config_ext.h", "src\\include\\pg_config_ext.h.win32"))
+ "src\\include\\pg_config_ext.h",
+ "src\\include\\pg_config_ext.h.win32"))
{
print "Copying pg_config_ext.h...\n";
- copyFile("src\\include\\pg_config_ext.h.win32",
+ copyFile(
+ "src\\include\\pg_config_ext.h.win32",
"src\\include\\pg_config_ext.h");
}
@@ -275,7 +277,9 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
"perl -I ../catalog Gen_fmgrtab.pl ../../../src/include/catalog/pg_proc.h");
chdir('..\..\..');
}
- if (IsNewer('src\include\utils\fmgroids.h', 'src\backend\utils\fmgroids.h'))
+ if (IsNewer(
+ 'src\include\utils\fmgroids.h',
+ 'src\backend\utils\fmgroids.h'))
{
copyFile('src\backend\utils\fmgroids.h',
'src\include\utils\fmgroids.h');
@@ -712,15 +716,15 @@ use base qw(Solution);
sub new
{
- my $classname = shift;
- my $self = $classname->SUPER::_new(@_);
- bless($self, $classname);
+ my $classname = shift;
+ my $self = $classname->SUPER::_new(@_);
+ bless($self, $classname);
- $self->{solutionFileVersion} = '12.00';
- $self->{vcver} = '11.00';
- $self->{visualStudioName} = 'Visual Studio 2012';
+ $self->{solutionFileVersion} = '12.00';
+ $self->{vcver} = '11.00';
+ $self->{visualStudioName} = 'Visual Studio 2012';
- return $self;
+ return $self;
}
1;
diff --git a/src/tools/msvc/VCBuildProject.pm b/src/tools/msvc/VCBuildProject.pm
index 624682601b3..1713cb5e3f8 100644
--- a/src/tools/msvc/VCBuildProject.pm
+++ b/src/tools/msvc/VCBuildProject.pm
@@ -35,7 +35,7 @@ EOF
# We have to use this flag on 32 bit targets because the 32bit perls
# are built with it and sometimes crash if we don't.
- my $use_32bit_time_t =
+ my $use_32bit_time_t =
$self->{platform} eq 'Win32' ? '_USE_32BIT_TIME_T;' : '';
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index cdba9a5fb71..89bd31a306c 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -31,7 +31,8 @@ if (-e "src/tools/msvc/buildenv.pl")
my $what = shift || "";
if ($what =~
- /^(check|installcheck|plcheck|contribcheck|ecpgcheck|isolationcheck|upgradecheck)$/i)
+/^(check|installcheck|plcheck|contribcheck|ecpgcheck|isolationcheck|upgradecheck)$/i
+ )
{
$what = uc $what;
}
@@ -76,7 +77,7 @@ my %command = (
ECPGCHECK => \&ecpgcheck,
CONTRIBCHECK => \&contribcheck,
ISOLATIONCHECK => \&isolationcheck,
- UPGRADECHECK => \&upgradecheck,);
+ UPGRADECHECK => \&upgradecheck,);
my $proc = $command{$what};
@@ -251,9 +252,10 @@ sub upgradecheck
my $tmp_install = "$tmp_root/install";
print "Setting up temp install\n\n";
Install($tmp_install, $config);
+
# Install does a chdir, so change back after that
chdir $cwd;
- my ($bindir,$libdir,$oldsrc,$newsrc) =
+ my ($bindir, $libdir, $oldsrc, $newsrc) =
("$tmp_install/bin", "$tmp_install/lib", $topdir, $topdir);
$ENV{PATH} = "$bindir;$ENV{PATH}";
my $data = "$tmp_root/data";
@@ -266,6 +268,7 @@ sub upgradecheck
system("pg_ctl start -l $logdir/postmaster1.log -w") == 0 or exit 1;
print "\nSetting up data for upgrading\n\n";
installcheck();
+
# now we can chdir into the source dir
chdir "$topdir/contrib/pg_upgrade";
print "\nDumping old cluster\n\n";
@@ -276,7 +279,7 @@ sub upgradecheck
print "\nSetting up new cluster\n\n";
system("initdb") == 0 or exit 1;
print "\nRunning pg_upgrade\n\n";
- system("pg_upgrade -d $data.old -D $data -b $bindir -B $bindir") == 0
+ system("pg_upgrade -d $data.old -D $data -b $bindir -B $bindir") == 0
or exit 1;
print "\nStarting new cluster\n\n";
system("pg_ctl -l $logdir/postmaster2.log -w start") == 0 or exit 1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 04:11:17 +0000