aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/gen_keywordlist.pl34
-rw-r--r--src/tools/msvc/Install.pm19
-rw-r--r--src/tools/msvc/Solution.pm33
-rw-r--r--src/tools/msvc/build.pl2
-rwxr-xr-xsrc/tools/msvc/install.pl2
-rw-r--r--src/tools/msvc/mkvcbuild.pl2
-rw-r--r--src/tools/msvc/vcregress.pl8
7 files changed, 57 insertions, 43 deletions
diff --git a/src/tools/gen_keywordlist.pl b/src/tools/gen_keywordlist.pl
index 1c1f1df6ad1..1623c867879 100644
--- a/src/tools/gen_keywordlist.pl
+++ b/src/tools/gen_keywordlist.pl
@@ -38,9 +38,9 @@ use lib $FindBin::RealBin;
use PerfectHash;
my $output_path = '';
-my $extern = 0;
-my $case_fold = 1;
-my $varname = 'ScanKeywords';
+my $extern = 0;
+my $case_fold = 1;
+my $varname = 'ScanKeywords';
GetOptions(
'output:s' => \$output_path,
@@ -56,12 +56,13 @@ if ($output_path ne '' && substr($output_path, -1) ne '/')
$output_path .= '/';
}
-$kw_input_file =~ /(\w+)\.h$/ || die "Input file must be named something.h.\n";
+$kw_input_file =~ /(\w+)\.h$/
+ || die "Input file must be named something.h.\n";
my $base_filename = $1 . '_d';
-my $kw_def_file = $output_path . $base_filename . '.h';
+my $kw_def_file = $output_path . $base_filename . '.h';
-open(my $kif, '<', $kw_input_file) || die "$kw_input_file: $!\n";
-open(my $kwdef, '>', $kw_def_file) || die "$kw_def_file: $!\n";
+open(my $kif, '<', $kw_input_file) || die "$kw_input_file: $!\n";
+open(my $kwdef, '>', $kw_def_file) || die "$kw_def_file: $!\n";
# Opening boilerplate for keyword definition header.
printf $kwdef <<EOM, $base_filename, uc $base_filename, uc $base_filename;
@@ -116,10 +117,11 @@ if ($case_fold)
# helpful because it provides a cheap way to reject duplicate keywords.
# Also, insisting on sorted order ensures that code that scans the keyword
# table linearly will see the keywords in a canonical order.
-for my $i (0..$#keywords - 1)
+for my $i (0 .. $#keywords - 1)
{
- die qq|The keyword "$keywords[$i + 1]" is out of order in $kw_input_file\n|
- if ($keywords[$i] cmp $keywords[$i + 1]) >= 0;
+ die
+ qq|The keyword "$keywords[$i + 1]" is out of order in $kw_input_file\n|
+ if ($keywords[$i] cmp $keywords[ $i + 1 ]) >= 0;
}
# Emit the string containing all the keywords.
@@ -133,7 +135,7 @@ print $kwdef qq|";\n\n|;
printf $kwdef "static const uint16 %s_kw_offsets[] = {\n", $varname;
-my $offset = 0;
+my $offset = 0;
my $max_len = 0;
foreach my $name (@keywords)
{
@@ -169,11 +171,11 @@ printf $kwdef qq|static %s\n|, $f;
printf $kwdef "static " if !$extern;
printf $kwdef "const ScanKeywordList %s = {\n", $varname;
-printf $kwdef qq|\t%s_kw_string,\n|, $varname;
-printf $kwdef qq|\t%s_kw_offsets,\n|, $varname;
-printf $kwdef qq|\t%s,\n|, $funcname;
-printf $kwdef qq|\t%s_NUM_KEYWORDS,\n|, uc $varname;
-printf $kwdef qq|\t%d\n|, $max_len;
+printf $kwdef qq|\t%s_kw_string,\n|, $varname;
+printf $kwdef qq|\t%s_kw_offsets,\n|, $varname;
+printf $kwdef qq|\t%s,\n|, $funcname;
+printf $kwdef qq|\t%s_NUM_KEYWORDS,\n|, uc $varname;
+printf $kwdef qq|\t%d\n|, $max_len;
printf $kwdef "};\n\n";
printf $kwdef "#endif\t\t\t\t\t\t\t/* %s_H */\n", uc $base_filename;
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index e0c2cd16be4..d109b2c9060 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -518,9 +518,12 @@ sub CopySubdirFiles
{
$flist = '';
if ($mf =~ /^HEADERS\s*=\s*(.*)$/m) { $flist .= $1 }
- my @modlist = ();
+ my @modlist = ();
my %fmodlist = ();
- while ($mf =~ /^HEADERS_([^\s=]+)\s*=\s*(.*)$/mg) { $fmodlist{$1} .= $2 }
+ while ($mf =~ /^HEADERS_([^\s=]+)\s*=\s*(.*)$/mg)
+ {
+ $fmodlist{$1} .= $2;
+ }
if ($mf =~ /^MODULE_big\s*=\s*(.*)$/m)
{
@@ -544,14 +547,13 @@ sub CopySubdirFiles
croak "HEADERS_$mod for unknown module in $subdir $module"
unless grep { $_ eq $mod } @modlist;
$flist = ParseAndCleanRule($fmodlist{$mod}, $mf);
- EnsureDirectories($target,
- "include", "include/server",
- "include/server/$moduledir",
- "include/server/$moduledir/$mod");
+ EnsureDirectories($target, "include", "include/server",
+ "include/server/$moduledir",
+ "include/server/$moduledir/$mod");
foreach my $f (split /\s+/, $flist)
{
lcopy("$subdir/$module/$f",
- "$target/include/server/$moduledir/$mod/" . basename($f))
+ "$target/include/server/$moduledir/$mod/" . basename($f))
|| croak("Could not copy file $f in $subdir $module");
print '.';
}
@@ -615,8 +617,7 @@ sub CopyIncludeFiles
'Public headers', $target . '/include/',
'src/include/', 'postgres_ext.h',
'pg_config.h', 'pg_config_ext.h',
- 'pg_config_os.h',
- 'pg_config_manual.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/Solution.pm b/src/tools/msvc/Solution.pm
index 2ea224d7708..33ba15c15ee 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -269,7 +269,7 @@ sub GenerateFiles
"LIBPGTYPES");
chdir('src/backend/utils');
- my $pg_proc_dat = '../../../src/include/catalog/pg_proc.dat';
+ my $pg_proc_dat = '../../../src/include/catalog/pg_proc.dat';
if ( IsNewer('fmgr-stamp', 'Gen_fmgrtab.pl')
|| IsNewer('fmgr-stamp', '../catalog/Catalog.pm')
|| IsNewer('fmgr-stamp', $pg_proc_dat)
@@ -409,12 +409,12 @@ sub GenerateFiles
chdir('../../..');
}
- if (IsNewer(
- 'src/common/kwlist_d.h',
- 'src/include/parser/kwlist.h'))
+ if (IsNewer('src/common/kwlist_d.h', 'src/include/parser/kwlist.h'))
{
print "Generating kwlist_d.h...\n";
- system('perl -I src/tools src/tools/gen_keywordlist.pl --extern -o src/common src/include/parser/kwlist.h');
+ system(
+ 'perl -I src/tools src/tools/gen_keywordlist.pl --extern -o src/common src/include/parser/kwlist.h'
+ );
}
if (IsNewer(
@@ -424,10 +424,15 @@ sub GenerateFiles
'src/pl/plpgsql/src/pl_unreserved_kwlist_d.h',
'src/pl/plpgsql/src/pl_unreserved_kwlist.h'))
{
- print "Generating pl_reserved_kwlist_d.h and pl_unreserved_kwlist_d.h...\n";
+ print
+ "Generating pl_reserved_kwlist_d.h and pl_unreserved_kwlist_d.h...\n";
chdir('src/pl/plpgsql/src');
- system('perl -I ../../../tools ../../../tools/gen_keywordlist.pl --varname ReservedPLKeywords pl_reserved_kwlist.h');
- system('perl -I ../../../tools ../../../tools/gen_keywordlist.pl --varname UnreservedPLKeywords pl_unreserved_kwlist.h');
+ system(
+ 'perl -I ../../../tools ../../../tools/gen_keywordlist.pl --varname ReservedPLKeywords pl_reserved_kwlist.h'
+ );
+ system(
+ 'perl -I ../../../tools ../../../tools/gen_keywordlist.pl --varname UnreservedPLKeywords pl_unreserved_kwlist.h'
+ );
chdir('../../../..');
}
@@ -440,8 +445,12 @@ sub GenerateFiles
{
print "Generating c_kwlist_d.h and ecpg_kwlist_d.h...\n";
chdir('src/interfaces/ecpg/preproc');
- system('perl -I ../../../tools ../../../tools/gen_keywordlist.pl --varname ScanCKeywords --no-case-fold c_kwlist.h');
- system('perl -I ../../../tools ../../../tools/gen_keywordlist.pl --varname ScanECPGKeywords ecpg_kwlist.h');
+ system(
+ 'perl -I ../../../tools ../../../tools/gen_keywordlist.pl --varname ScanCKeywords --no-case-fold c_kwlist.h'
+ );
+ system(
+ 'perl -I ../../../tools ../../../tools/gen_keywordlist.pl --varname ScanECPGKeywords ecpg_kwlist.h'
+ );
chdir('../../../..');
}
@@ -527,7 +536,9 @@ EOF
{
chdir('src/backend/catalog');
my $bki_srcs = join(' ../../../src/include/catalog/', @bki_srcs);
- system("perl genbki.pl --include-path ../../../src/include/ --set-version=$self->{majorver} $bki_srcs");
+ system(
+ "perl genbki.pl --include-path ../../../src/include/ --set-version=$self->{majorver} $bki_srcs"
+ );
open(my $f, '>', 'bki-stamp')
|| confess "Could not touch bki-stamp";
close($f);
diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
index f242d569dd8..52abdb17b9b 100644
--- a/src/tools/msvc/build.pl
+++ b/src/tools/msvc/build.pl
@@ -6,7 +6,7 @@ use strict;
use File::Basename;
use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
use Cwd;
diff --git a/src/tools/msvc/install.pl b/src/tools/msvc/install.pl
index 47cdba35361..e7ac6d1afa0 100755
--- a/src/tools/msvc/install.pl
+++ b/src/tools/msvc/install.pl
@@ -8,7 +8,7 @@ use warnings;
use File::Basename;
use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
use Install qw(Install);
diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
index f5505b98c26..48672439dcf 100644
--- a/src/tools/msvc/mkvcbuild.pl
+++ b/src/tools/msvc/mkvcbuild.pl
@@ -9,7 +9,7 @@ use warnings;
use File::Basename;
use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
use Mkvcbuild;
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 2aa29ab008c..30b86e7521f 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -12,7 +12,7 @@ use File::Copy;
use File::Find ();
use File::Path qw(rmtree);
use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
use Install qw(Install);
@@ -203,8 +203,8 @@ sub tap_check
# adjust the environment for just this test
local %ENV = %ENV;
- $ENV{PERL5LIB} = "$topdir/src/test/perl;$ENV{PERL5LIB}";
- $ENV{PG_REGRESS} = "$topdir/$Config/pg_regress/pg_regress";
+ $ENV{PERL5LIB} = "$topdir/src/test/perl;$ENV{PERL5LIB}";
+ $ENV{PG_REGRESS} = "$topdir/$Config/pg_regress/pg_regress";
$ENV{REGRESS_SHLIB} = "$topdir/src/test/regress/regress.dll";
$ENV{TESTDIR} = "$dir";
@@ -404,7 +404,7 @@ sub subdircheck
return;
}
- my @opts = fetchRegressOpts();
+ my @opts = fetchRegressOpts();
# Special processing for python transform modules, see their respective
# Makefiles for more details regarding Python-version specific
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 21:52:49 +0000