mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
Run newly-configured perltidy script on Perl files.
Run on HEAD and 9.2.
This commit is contained in:
Bruce Momjian
@ -13,13 +13,13 @@ use File::Copy;
|
||||
use File::Find ();
|
||||
|
||||
use Exporter;
|
||||
our (@ISA,@EXPORT_OK);
|
||||
@ISA = qw(Exporter);
|
||||
our (@ISA, @EXPORT_OK);
|
||||
@ISA = qw(Exporter);
|
||||
@EXPORT_OK = qw(Install);
|
||||
|
||||
sub lcopy
|
||||
{
|
||||
my $src = shift;
|
||||
my $src = shift;
|
||||
my $target = shift;
|
||||
|
||||
if (-f $target)
|
||||
@ -27,7 +27,7 @@ sub lcopy
|
||||
unlink $target || confess "Could not delete $target\n";
|
||||
}
|
||||
|
||||
copy($src,$target)
|
||||
copy($src, $target)
|
||||
|| confess "Could not copy $src to $target\n";
|
||||
|
||||
}
|
||||
@ -41,7 +41,7 @@ sub Install
|
||||
require "config_default.pl";
|
||||
require "config.pl" if (-f "config.pl");
|
||||
|
||||
chdir("../../..") if (-f "../../../configure");
|
||||
chdir("../../..") if (-f "../../../configure");
|
||||
chdir("../../../..") if (-f "../../../../configure");
|
||||
my $conf = "";
|
||||
if (-d "debug")
|
||||
@ -56,83 +56,79 @@ sub Install
|
||||
my $majorver = DetermineMajorVersion();
|
||||
print "Installing version $majorver for $conf in $target\n";
|
||||
|
||||
EnsureDirectories($target, 'bin', 'lib', 'share','share/timezonesets','share/extension',
|
||||
'share/contrib','doc','doc/extension', 'doc/contrib','symbols',
|
||||
'share/tsearch_data');
|
||||
EnsureDirectories(
|
||||
$target, 'bin',
|
||||
'lib', 'share',
|
||||
'share/timezonesets', 'share/extension',
|
||||
'share/contrib', 'doc',
|
||||
'doc/extension', 'doc/contrib',
|
||||
'symbols', 'share/tsearch_data');
|
||||
|
||||
CopySolutionOutput($conf, $target);
|
||||
lcopy($target . '/lib/libpq.dll', $target . '/bin/libpq.dll');
|
||||
my $sample_files = [];
|
||||
File::Find::find(
|
||||
{
|
||||
wanted =>sub {
|
||||
{ wanted => sub {
|
||||
/^.*\.sample\z/s
|
||||
&&push(@$sample_files, $File::Find::name);
|
||||
&& push(@$sample_files, $File::Find::name);
|
||||
}
|
||||
},
|
||||
"src"
|
||||
);
|
||||
"src");
|
||||
CopySetOfFiles('config files', $sample_files, $target . '/share/');
|
||||
CopyFiles(
|
||||
'Import libraries',
|
||||
$target .'/lib/',
|
||||
"$conf\\", "postgres\\postgres.lib","libpq\\libpq.lib", "libecpg\\libecpg.lib",
|
||||
"libpgport\\libpgport.lib"
|
||||
);
|
||||
'Import libraries', $target . '/lib/',
|
||||
"$conf\\", "postgres\\postgres.lib",
|
||||
"libpq\\libpq.lib", "libecpg\\libecpg.lib",
|
||||
"libpgport\\libpgport.lib");
|
||||
CopySetOfFiles(
|
||||
'timezone names',
|
||||
[ glob('src\timezone\tznames\*.txt') ],
|
||||
$target . '/share/timezonesets/'
|
||||
);
|
||||
$target . '/share/timezonesets/');
|
||||
CopyFiles(
|
||||
'timezone sets',
|
||||
$target . '/share/timezonesets/',
|
||||
'src/timezone/tznames/', 'Default','Australia','India'
|
||||
);
|
||||
'src/timezone/tznames/', 'Default', 'Australia', 'India');
|
||||
CopySetOfFiles(
|
||||
'BKI files',
|
||||
[ glob("src\\backend\\catalog\\postgres.*") ],
|
||||
$target .'/share/'
|
||||
);
|
||||
CopySetOfFiles('SQL files', [ glob("src\\backend\\catalog\\*.sql") ],$target . '/share/');
|
||||
$target . '/share/');
|
||||
CopySetOfFiles(
|
||||
'SQL files',
|
||||
[ glob("src\\backend\\catalog\\*.sql") ],
|
||||
$target . '/share/');
|
||||
CopyFiles(
|
||||
'Information schema data',$target . '/share/',
|
||||
'src/backend/catalog/', 'sql_features.txt'
|
||||
);
|
||||
'Information schema data', $target . '/share/',
|
||||
'src/backend/catalog/', 'sql_features.txt');
|
||||
GenerateConversionScript($target);
|
||||
GenerateTimezoneFiles($target,$conf);
|
||||
GenerateTimezoneFiles($target, $conf);
|
||||
GenerateTsearchFiles($target);
|
||||
CopySetOfFiles(
|
||||
'Stopword files',
|
||||
[ glob("src\\backend\\snowball\\stopwords\\*.stop") ],
|
||||
$target . '/share/tsearch_data/'
|
||||
);
|
||||
$target . '/share/tsearch_data/');
|
||||
CopySetOfFiles(
|
||||
'Dictionaries sample files',
|
||||
[ glob("src\\backend\\tsearch\\*_sample.*") ],
|
||||
$target . '/share/tsearch_data/'
|
||||
);
|
||||
CopyContribFiles($config,$target);
|
||||
$target . '/share/tsearch_data/');
|
||||
CopyContribFiles($config, $target);
|
||||
CopyIncludeFiles($target);
|
||||
|
||||
my $pl_extension_files = [];
|
||||
my @pldirs = ('src/pl/plpgsql/src');
|
||||
push @pldirs,"src/pl/plperl" if $config->{perl};
|
||||
push @pldirs,"src/pl/plpython" if $config->{python};
|
||||
push @pldirs,"src/pl/tcl" if $config->{tcl};
|
||||
my @pldirs = ('src/pl/plpgsql/src');
|
||||
push @pldirs, "src/pl/plperl" if $config->{perl};
|
||||
push @pldirs, "src/pl/plpython" if $config->{python};
|
||||
push @pldirs, "src/pl/tcl" if $config->{tcl};
|
||||
File::Find::find(
|
||||
{
|
||||
wanted =>sub {
|
||||
{ wanted => sub {
|
||||
/^(.*--.*\.sql|.*\.control)\z/s
|
||||
&&push(@$pl_extension_files,
|
||||
$File::Find::name);
|
||||
&& push(@$pl_extension_files, $File::Find::name);
|
||||
}
|
||||
},
|
||||
@pldirs
|
||||
);
|
||||
CopySetOfFiles('PL Extension files', $pl_extension_files,$target . '/share/extension/');
|
||||
@pldirs);
|
||||
CopySetOfFiles('PL Extension files',
|
||||
$pl_extension_files, $target . '/share/extension/');
|
||||
|
||||
GenerateNLSFiles($target,$config->{nls},$majorver) if ($config->{nls});
|
||||
GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls});
|
||||
|
||||
print "Installation complete.\n";
|
||||
}
|
||||
@ -149,8 +145,8 @@ sub EnsureDirectories
|
||||
|
||||
sub CopyFiles
|
||||
{
|
||||
my $what = shift;
|
||||
my $target = shift;
|
||||
my $what = shift;
|
||||
my $target = shift;
|
||||
my $basedir = shift;
|
||||
|
||||
print "Copying $what";
|
||||
@ -166,14 +162,14 @@ sub CopyFiles
|
||||
|
||||
sub CopySetOfFiles
|
||||
{
|
||||
my $what = shift;
|
||||
my $flist = shift;
|
||||
my $what = shift;
|
||||
my $flist = shift;
|
||||
my $target = shift;
|
||||
print "Copying $what" if $what;
|
||||
foreach (@$flist)
|
||||
{
|
||||
next if /regress/; # Skip temporary install in regression subdir
|
||||
next if /ecpg.test/; # Skip temporary install in regression subdir
|
||||
next if /regress/; # Skip temporary install in regression subdir
|
||||
next if /ecpg.test/; # Skip temporary install in regression subdir
|
||||
my $tgt = $target . basename($_);
|
||||
print ".";
|
||||
lcopy($_, $tgt) || croak "Could not copy $_: $!\n";
|
||||
@ -183,14 +179,17 @@ sub CopySetOfFiles
|
||||
|
||||
sub CopySolutionOutput
|
||||
{
|
||||
my $conf = shift;
|
||||
my $conf = shift;
|
||||
my $target = shift;
|
||||
my $rem = qr{Project\("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"\) = "([^"]+)"};
|
||||
my $rem =
|
||||
qr{Project\("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"\) = "([^"]+)"};
|
||||
|
||||
my $sln = read_file("pgsql.sln") || croak "Could not open pgsql.sln\n";
|
||||
|
||||
my $vcproj = 'vcproj';
|
||||
if ($sln =~ /Microsoft Visual Studio Solution File, Format Version (\d+)\.\d+/ && $1 >= 11)
|
||||
if ($sln =~
|
||||
/Microsoft Visual Studio Solution File, Format Version (\d+)\.\d+/
|
||||
&& $1 >= 11)
|
||||
{
|
||||
$vcproj = 'vcxproj';
|
||||
}
|
||||
@ -204,7 +203,8 @@ sub CopySolutionOutput
|
||||
|
||||
$sln =~ s/$rem//;
|
||||
|
||||
my $proj = read_file("$pf.$vcproj") || croak "Could not open $pf.$vcproj\n";
|
||||
my $proj = read_file("$pf.$vcproj")
|
||||
|| croak "Could not open $pf.$vcproj\n";
|
||||
if ($vcproj eq 'vcproj' && $proj =~ qr{ConfigurationType="([^"]+)"})
|
||||
{
|
||||
if ($1 == 1)
|
||||
@ -220,11 +220,11 @@ sub CopySolutionOutput
|
||||
else
|
||||
{
|
||||
|
||||
# Static lib, such as libpgport, only used internally during build, don't install
|
||||
# Static lib, such as libpgport, only used internally during build, don't install
|
||||
next;
|
||||
}
|
||||
}
|
||||
elsif ( $vcproj eq 'vcxproj'
|
||||
elsif ($vcproj eq 'vcxproj'
|
||||
&& $proj =~ qr{<ConfigurationType>(\w+)</ConfigurationType>})
|
||||
{
|
||||
if ($1 eq 'Application')
|
||||
@ -237,10 +237,10 @@ sub CopySolutionOutput
|
||||
$dir = "lib";
|
||||
$ext = "dll";
|
||||
}
|
||||
else # 'StaticLibrary'
|
||||
else # 'StaticLibrary'
|
||||
{
|
||||
|
||||
# Static lib, such as libpgport, only used internally during build, don't install
|
||||
# Static lib, such as libpgport, only used internally during build, don't install
|
||||
next;
|
||||
}
|
||||
}
|
||||
@ -248,9 +248,9 @@ sub CopySolutionOutput
|
||||
{
|
||||
croak "Could not parse $pf.$vcproj\n";
|
||||
}
|
||||
lcopy("$conf\\$pf\\$pf.$ext","$target\\$dir\\$pf.$ext")
|
||||
lcopy("$conf\\$pf\\$pf.$ext", "$target\\$dir\\$pf.$ext")
|
||||
|| croak "Could not copy $pf.$ext\n";
|
||||
lcopy("$conf\\$pf\\$pf.pdb","$target\\symbols\\$pf.pdb")
|
||||
lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb")
|
||||
|| croak "Could not copy $pf.pdb\n";
|
||||
print ".";
|
||||
}
|
||||
@ -260,7 +260,7 @@ sub CopySolutionOutput
|
||||
sub GenerateConversionScript
|
||||
{
|
||||
my $target = shift;
|
||||
my $sql = "";
|
||||
my $sql = "";
|
||||
my $F;
|
||||
|
||||
print "Generating conversion proc script...";
|
||||
@ -268,14 +268,14 @@ sub GenerateConversionScript
|
||||
$mf =~ s{\\\s*[\r\n]+}{}mg;
|
||||
$mf =~ /^CONVERSIONS\s*=\s*(.*)$/m
|
||||
|| die "Could not find CONVERSIONS line in conversions Makefile\n";
|
||||
my @pieces = split /\s+/,$1;
|
||||
my @pieces = split /\s+/, $1;
|
||||
while ($#pieces > 0)
|
||||
{
|
||||
my $name = shift @pieces;
|
||||
my $se = shift @pieces;
|
||||
my $de = shift @pieces;
|
||||
my $se = shift @pieces;
|
||||
my $de = shift @pieces;
|
||||
my $func = shift @pieces;
|
||||
my $obj = shift @pieces;
|
||||
my $obj = shift @pieces;
|
||||
$sql .= "-- $se --> $de\n";
|
||||
$sql .=
|
||||
"CREATE OR REPLACE FUNCTION $func (INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) RETURNS VOID AS '\$libdir/$obj', '$func' LANGUAGE C STRICT;\n";
|
||||
@ -283,10 +283,11 @@ sub GenerateConversionScript
|
||||
"COMMENT ON FUNCTION $func(INTEGER, INTEGER, CSTRING, INTERNAL, INTEGER) IS 'internal conversion function for $se to $de';\n";
|
||||
$sql .= "DROP CONVERSION pg_catalog.$name;\n";
|
||||
$sql .=
|
||||
"CREATE DEFAULT CONVERSION pg_catalog.$name FOR '$se' TO '$de' FROM $func;\n";
|
||||
$sql .= "COMMENT ON CONVERSION pg_catalog.$name IS 'conversion for $se to $de';\n";
|
||||
"CREATE DEFAULT CONVERSION pg_catalog.$name FOR '$se' TO '$de' FROM $func;\n";
|
||||
$sql .=
|
||||
"COMMENT ON CONVERSION pg_catalog.$name IS 'conversion for $se to $de';\n";
|
||||
}
|
||||
open($F,">$target/share/conversion_create.sql")
|
||||
open($F, ">$target/share/conversion_create.sql")
|
||||
|| die "Could not write to conversion_create.sql\n";
|
||||
print $F $sql;
|
||||
close($F);
|
||||
@ -296,12 +297,13 @@ sub GenerateConversionScript
|
||||
sub GenerateTimezoneFiles
|
||||
{
|
||||
my $target = shift;
|
||||
my $conf = shift;
|
||||
my $mf = read_file("src/timezone/Makefile");
|
||||
my $conf = shift;
|
||||
my $mf = read_file("src/timezone/Makefile");
|
||||
$mf =~ s{\\\s*[\r\n]+}{}mg;
|
||||
$mf =~ /^TZDATA\s*:?=\s*(.*)$/m || die "Could not find TZDATA row in timezone makefile\n";
|
||||
my @tzfiles = split /\s+/,$1;
|
||||
unshift @tzfiles,'';
|
||||
$mf =~ /^TZDATA\s*:?=\s*(.*)$/m
|
||||
|| die "Could not find TZDATA row in timezone makefile\n";
|
||||
my @tzfiles = split /\s+/, $1;
|
||||
unshift @tzfiles, '';
|
||||
print "Generating timezone files...";
|
||||
system("$conf\\zic\\zic -d \"$target/share/timezone\" "
|
||||
. join(" src/timezone/data/", @tzfiles));
|
||||
@ -315,21 +317,21 @@ sub GenerateTsearchFiles
|
||||
print "Generating tsearch script...";
|
||||
my $F;
|
||||
my $tmpl = read_file('src/backend/snowball/snowball.sql.in');
|
||||
my $mf = read_file('src/backend/snowball/Makefile');
|
||||
my $mf = read_file('src/backend/snowball/Makefile');
|
||||
$mf =~ s{\\\s*[\r\n]+}{}mg;
|
||||
$mf =~ /^LANGUAGES\s*=\s*(.*)$/m
|
||||
|| die "Could not find LANGUAGES line in snowball Makefile\n";
|
||||
my @pieces = split /\s+/,$1;
|
||||
open($F,">$target/share/snowball_create.sql")
|
||||
my @pieces = split /\s+/, $1;
|
||||
open($F, ">$target/share/snowball_create.sql")
|
||||
|| die "Could not write snowball_create.sql";
|
||||
print $F read_file('src/backend/snowball/snowball_func.sql.in');
|
||||
|
||||
while ($#pieces > 0)
|
||||
{
|
||||
my $lang = shift @pieces || last;
|
||||
my $lang = shift @pieces || last;
|
||||
my $asclang = shift @pieces || last;
|
||||
my $txt = $tmpl;
|
||||
my $stop = '';
|
||||
my $txt = $tmpl;
|
||||
my $stop = '';
|
||||
|
||||
if (-s "src/backend/snowball/stopwords/$lang.stop")
|
||||
{
|
||||
@ -361,9 +363,9 @@ sub CopyContribFiles
|
||||
{
|
||||
next if ($d =~ /^\./);
|
||||
next unless (-f "contrib/$d/Makefile");
|
||||
next if ($d eq "uuid-ossp"&& !defined($config->{uuid}));
|
||||
next if ($d eq "sslinfo" && !defined($config->{openssl}));
|
||||
next if ($d eq "xml2" && !defined($config->{xml}));
|
||||
next if ($d eq "uuid-ossp" && !defined($config->{uuid}));
|
||||
next if ($d eq "sslinfo" && !defined($config->{openssl}));
|
||||
next if ($d eq "xml2" && !defined($config->{xml}));
|
||||
next if ($d eq "sepgsql");
|
||||
|
||||
my $mf = read_file("contrib/$d/Makefile");
|
||||
@ -373,32 +375,32 @@ sub CopyContribFiles
|
||||
my $moduledir = 'contrib';
|
||||
|
||||
my $flist = '';
|
||||
if ($mf =~ /^EXTENSION\s*=\s*(.*)$/m) {$flist .= $1}
|
||||
if ($mf =~ /^EXTENSION\s*=\s*(.*)$/m) { $flist .= $1 }
|
||||
if ($flist ne '')
|
||||
{
|
||||
$moduledir = 'extension';
|
||||
$flist = ParseAndCleanRule($flist, $mf);
|
||||
|
||||
foreach my $f (split /\s+/,$flist)
|
||||
foreach my $f (split /\s+/, $flist)
|
||||
{
|
||||
lcopy(
|
||||
'contrib/' . $d . '/' . $f . '.control',
|
||||
$target . '/share/extension/' . $f . '.control'
|
||||
)|| croak("Could not copy file $f.control in contrib $d");
|
||||
) || croak("Could not copy file $f.control in contrib $d");
|
||||
print '.';
|
||||
}
|
||||
}
|
||||
|
||||
$flist = '';
|
||||
if ($mf =~ /^DATA_built\s*=\s*(.*)$/m) {$flist .= $1}
|
||||
if ($mf =~ /^DATA\s*=\s*(.*)$/m) {$flist .= " $1"}
|
||||
$flist =~ s/^\s*//; # Remove leading spaces if we had only DATA_built
|
||||
if ($mf =~ /^DATA_built\s*=\s*(.*)$/m) { $flist .= $1 }
|
||||
if ($mf =~ /^DATA\s*=\s*(.*)$/m) { $flist .= " $1" }
|
||||
$flist =~ s/^\s*//; # Remove leading spaces if we had only DATA_built
|
||||
|
||||
if ($flist ne '')
|
||||
{
|
||||
$flist = ParseAndCleanRule($flist, $mf);
|
||||
|
||||
foreach my $f (split /\s+/,$flist)
|
||||
foreach my $f (split /\s+/, $flist)
|
||||
{
|
||||
lcopy('contrib/' . $d . '/' . $f,
|
||||
$target . '/share/' . $moduledir . '/' . basename($f))
|
||||
@ -408,12 +410,12 @@ sub CopyContribFiles
|
||||
}
|
||||
|
||||
$flist = '';
|
||||
if ($mf =~ /^DATA_TSEARCH\s*=\s*(.*)$/m) {$flist .= $1}
|
||||
if ($mf =~ /^DATA_TSEARCH\s*=\s*(.*)$/m) { $flist .= $1 }
|
||||
if ($flist ne '')
|
||||
{
|
||||
$flist = ParseAndCleanRule($flist, $mf);
|
||||
|
||||
foreach my $f (split /\s+/,$flist)
|
||||
foreach my $f (split /\s+/, $flist)
|
||||
{
|
||||
lcopy('contrib/' . $d . '/' . $f,
|
||||
$target . '/share/tsearch_data/' . basename($f))
|
||||
@ -423,7 +425,7 @@ sub CopyContribFiles
|
||||
}
|
||||
|
||||
$flist = '';
|
||||
if ($mf =~ /^DOCS\s*=\s*(.*)$/mg) {$flist .= $1}
|
||||
if ($mf =~ /^DOCS\s*=\s*(.*)$/mg) { $flist .= $1 }
|
||||
if ($flist ne '')
|
||||
{
|
||||
$flist = ParseAndCleanRule($flist, $mf);
|
||||
@ -432,7 +434,7 @@ sub CopyContribFiles
|
||||
$flist =
|
||||
"autoinc.example insert_username.example moddatetime.example refint.example timetravel.example"
|
||||
if ($d eq 'spi');
|
||||
foreach my $f (split /\s+/,$flist)
|
||||
foreach my $f (split /\s+/, $flist)
|
||||
{
|
||||
lcopy('contrib/' . $d . '/' . $f,
|
||||
$target . '/doc/' . $moduledir . '/' . $f)
|
||||
@ -448,20 +450,25 @@ sub CopyContribFiles
|
||||
sub ParseAndCleanRule
|
||||
{
|
||||
my $flist = shift;
|
||||
my $mf = shift;
|
||||
my $mf = shift;
|
||||
|
||||
# Strip out $(addsuffix) rules
|
||||
if (index($flist, '$(addsuffix ') >= 0)
|
||||
{
|
||||
my $pcount = 0;
|
||||
my $i;
|
||||
for ($i = index($flist, '$(addsuffix ') + 12; $i < length($flist); $i++)
|
||||
for (
|
||||
$i = index($flist, '$(addsuffix ') + 12;
|
||||
$i < length($flist);
|
||||
$i++)
|
||||
{
|
||||
$pcount++ if (substr($flist, $i, 1) eq '(');
|
||||
$pcount-- if (substr($flist, $i, 1) eq ')');
|
||||
last if ($pcount < 0);
|
||||
last if ($pcount < 0);
|
||||
}
|
||||
$flist = substr($flist, 0, index($flist, '$(addsuffix ')) . substr($flist, $i+1);
|
||||
$flist =
|
||||
substr($flist, 0, index($flist, '$(addsuffix '))
|
||||
. substr($flist, $i + 1);
|
||||
}
|
||||
return $flist;
|
||||
}
|
||||
@ -470,56 +477,52 @@ sub CopyIncludeFiles
|
||||
{
|
||||
my $target = shift;
|
||||
|
||||
EnsureDirectories($target, 'include', 'include/libpq','include/internal',
|
||||
'include/internal/libpq','include/server', 'include/server/parser');
|
||||
EnsureDirectories($target, 'include', 'include/libpq', 'include/internal',
|
||||
'include/internal/libpq', 'include/server', 'include/server/parser');
|
||||
|
||||
CopyFiles(
|
||||
'Public headers',
|
||||
$target . '/include/',
|
||||
'src/include/', 'postgres_ext.h', 'pg_config.h', 'pg_config_os.h',
|
||||
'pg_config_manual.h'
|
||||
);
|
||||
'pg_config_manual.h');
|
||||
lcopy('src/include/libpq/libpq-fs.h', $target . '/include/libpq/')
|
||||
|| croak 'Could not copy libpq-fs.h';
|
||||
|
||||
CopyFiles(
|
||||
'Libpq headers',
|
||||
$target . '/include/',
|
||||
'src/interfaces/libpq/','libpq-fe.h', 'libpq-events.h'
|
||||
);
|
||||
'src/interfaces/libpq/', 'libpq-fe.h', 'libpq-events.h');
|
||||
CopyFiles(
|
||||
'Libpq internal headers',
|
||||
$target .'/include/internal/',
|
||||
'src/interfaces/libpq/', 'libpq-int.h', 'pqexpbuffer.h'
|
||||
);
|
||||
$target . '/include/internal/',
|
||||
'src/interfaces/libpq/', 'libpq-int.h', 'pqexpbuffer.h');
|
||||
|
||||
CopyFiles(
|
||||
'Internal headers',
|
||||
$target . '/include/internal/',
|
||||
'src/include/', 'c.h', 'port.h', 'postgres_fe.h'
|
||||
);
|
||||
'src/include/', 'c.h', 'port.h', 'postgres_fe.h');
|
||||
lcopy('src/include/libpq/pqcomm.h', $target . '/include/internal/libpq/')
|
||||
|| croak 'Could not copy pqcomm.h';
|
||||
|
||||
CopyFiles(
|
||||
'Server headers',
|
||||
$target . '/include/server/',
|
||||
'src/include/', 'pg_config.h', 'pg_config_os.h'
|
||||
);
|
||||
'src/include/', 'pg_config.h', 'pg_config_os.h');
|
||||
CopyFiles(
|
||||
'Grammar header',
|
||||
$target . '/include/server/parser/',
|
||||
'src/backend/parser/','gram.h'
|
||||
);
|
||||
CopySetOfFiles('',[ glob("src\\include\\*.h") ],$target . '/include/server/');
|
||||
'src/backend/parser/', 'gram.h');
|
||||
CopySetOfFiles(
|
||||
'',
|
||||
[ glob("src\\include\\*.h") ],
|
||||
$target . '/include/server/');
|
||||
my $D;
|
||||
opendir($D, 'src/include') || croak "Could not opendir on src/include!\n";
|
||||
|
||||
CopyFiles(
|
||||
'PL/pgSQL header',
|
||||
$target . '/include/server/',
|
||||
'src/pl/plpgsql/src/', 'plpgsql.h'
|
||||
);
|
||||
'src/pl/plpgsql/src/', 'plpgsql.h');
|
||||
|
||||
# some xcopy progs don't like mixed slash style paths
|
||||
(my $ctarget = $target) =~ s!/!\\!g;
|
||||
@ -533,47 +536,45 @@ sub CopyIncludeFiles
|
||||
EnsureDirectories("$target/include/server/$d");
|
||||
system(
|
||||
qq{xcopy /s /i /q /r /y src\\include\\$d\\*.h "$ctarget\\include\\server\\$d\\"}
|
||||
)&& croak("Failed to copy include directory $d\n");
|
||||
) && croak("Failed to copy include directory $d\n");
|
||||
}
|
||||
closedir($D);
|
||||
|
||||
my $mf = read_file('src/interfaces/ecpg/include/Makefile');
|
||||
$mf =~ s{\\s*[\r\n]+}{}mg;
|
||||
$mf =~ /^ecpg_headers\s*=\s*(.*)$/m || croak "Could not find ecpg_headers line\n";
|
||||
$mf =~ /^ecpg_headers\s*=\s*(.*)$/m
|
||||
|| croak "Could not find ecpg_headers line\n";
|
||||
CopyFiles(
|
||||
'ECPG headers',
|
||||
$target . '/include/',
|
||||
'src/interfaces/ecpg/include/',
|
||||
'ecpg_config.h', split /\s+/,$1
|
||||
);
|
||||
$mf =~ /^informix_headers\s*=\s*(.*)$/m || croak "Could not find informix_headers line\n";
|
||||
'ecpg_config.h', split /\s+/, $1);
|
||||
$mf =~ /^informix_headers\s*=\s*(.*)$/m
|
||||
|| croak "Could not find informix_headers line\n";
|
||||
EnsureDirectories($target . '/include', 'informix', 'informix/esql');
|
||||
CopyFiles(
|
||||
'ECPG informix headers',
|
||||
$target .'/include/informix/esql/',
|
||||
$target . '/include/informix/esql/',
|
||||
'src/interfaces/ecpg/include/',
|
||||
split /\s+/,$1
|
||||
);
|
||||
split /\s+/, $1);
|
||||
}
|
||||
|
||||
sub GenerateNLSFiles
|
||||
{
|
||||
my $target = shift;
|
||||
my $nlspath = shift;
|
||||
my $target = shift;
|
||||
my $nlspath = shift;
|
||||
my $majorver = shift;
|
||||
|
||||
print "Installing NLS files...";
|
||||
EnsureDirectories($target, "share/locale");
|
||||
my @flist;
|
||||
File::Find::find(
|
||||
{
|
||||
wanted =>sub {
|
||||
{ wanted => sub {
|
||||
/^nls\.mk\z/s
|
||||
&&!push(@flist, $File::Find::name);
|
||||
&& !push(@flist, $File::Find::name);
|
||||
}
|
||||
},
|
||||
"src"
|
||||
);
|
||||
"src");
|
||||
foreach (@flist)
|
||||
{
|
||||
my $prgm = DetermineCatalogName($_);
|
||||
@ -590,7 +591,7 @@ sub GenerateNLSFiles
|
||||
"share/locale/$lang/LC_MESSAGES");
|
||||
system(
|
||||
"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo\" $_"
|
||||
)&& croak("Could not run msgfmt on $dir\\$_");
|
||||
) && croak("Could not run msgfmt on $dir\\$_");
|
||||
print ".";
|
||||
}
|
||||
}
|
||||
@ -599,7 +600,8 @@ sub GenerateNLSFiles
|
||||
|
||||
sub DetermineMajorVersion
|
||||
{
|
||||
my $f = read_file('src/include/pg_config.h') || croak 'Could not open pg_config.h';
|
||||
my $f = read_file('src/include/pg_config.h')
|
||||
|| croak 'Could not open pg_config.h';
|
||||
$f =~ /^#define\s+PG_MAJORVERSION\s+"([^"]+)"/m
|
||||
|| croak 'Could not determine major version';
|
||||
return $1;
|
||||
|
||||
Reference in New Issue
Block a user