mirror of
https://github.com/postgres/postgres.git
synced 2025-10-16 17:07:43 +03:00
Get rid of the need for manual maintenance of the initial contents of
pg_attribute, by having genbki.pl derive the information from the various catalog header files. This greatly simplifies modification of the "bootstrapped" catalogs. This patch finally kills genbki.sh and Gen_fmgrtab.sh; we now rely entirely on Perl scripts for those build steps. To avoid creating a Perl build dependency where there was not one before, the output files generated by these scripts are now treated as distprep targets, ie, they will be built and shipped in tarballs. But you will need a reasonably modern Perl (probably at least 5.6) if you want to build from a CVS pull. The changes to the MSVC build process are untested, and may well break --- we'll soon find out from the buildfarm. John Naylor, based on ideas from Robert Haas and others
This commit is contained in:
Tom Lane
@@ -1,262 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# Genbki.pm --
|
||||
# perl script which generates .bki files from specially formatted .h
|
||||
# files. These .bki files are used to initialize the postgres template
|
||||
# database.
|
||||
#
|
||||
# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
# Portions Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $PostgreSQL: pgsql/src/tools/msvc/Genbki.pm,v 1.9 2010/01/02 16:58:17 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
package Genbki;
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use Exporter;
|
||||
our (@ISA, @EXPORT_OK);
|
||||
@ISA = qw(Exporter);
|
||||
@EXPORT_OK = qw(genbki);
|
||||
|
||||
sub genbki
|
||||
{
|
||||
my $version = shift;
|
||||
my $prefix = shift;
|
||||
|
||||
$version =~ /^(\d+\.\d+)/ || die "Bad format version $version\n";
|
||||
my $majorversion = $1;
|
||||
|
||||
my $pgauthid = read_file("src/include/catalog/pg_authid.h");
|
||||
$pgauthid =~ /^#define\s+BOOTSTRAP_SUPERUSERID\s+(\d+)$/mg
|
||||
|| die "Could not read BOOTSTRAP_SUPERUSERID from pg_authid.h\n";
|
||||
my $bootstrapsuperuserid = $1;
|
||||
|
||||
my $pgnamespace = read_file("src/include/catalog/pg_namespace.h");
|
||||
$pgnamespace =~ /^#define\s+PG_CATALOG_NAMESPACE\s+(\d+)$/mg
|
||||
|| die "Could not read PG_CATALOG_NAMESPACE from pg_namespace.h\n";
|
||||
my $pgcatalognamespace = $1;
|
||||
|
||||
my $indata = "";
|
||||
|
||||
while (@_)
|
||||
{
|
||||
my $f = shift;
|
||||
next unless $f;
|
||||
$indata .= read_file($f);
|
||||
$indata .= "\n";
|
||||
}
|
||||
|
||||
# Strip C comments, from perl FAQ 4.27
|
||||
$indata =~ s{/\*.*?\*/}{}gs;
|
||||
|
||||
$indata =~ s{;\s*$}{}gm;
|
||||
$indata =~ s{^\s+}{}gm;
|
||||
$indata =~ s{^Oid}{oid}gm;
|
||||
$indata =~ s{\(Oid}{(oid}gm;
|
||||
$indata =~ s{^NameData}{name}gm;
|
||||
$indata =~ s{\(NameData}{(name}g;
|
||||
$indata =~ s{^TransactionId}{xid}gm;
|
||||
$indata =~ s{\(TransactionId}{(xid}g;
|
||||
$indata =~ s{PGUID}{$bootstrapsuperuserid}g;
|
||||
$indata =~ s{PGNSP}{$pgcatalognamespace}g;
|
||||
|
||||
#print $indata;
|
||||
|
||||
my $bki = "";
|
||||
my $desc = "";
|
||||
my $shdesc = "";
|
||||
|
||||
my $oid = 0;
|
||||
my $catalog = 0;
|
||||
my $reln_open = 0;
|
||||
my $bootstrap = "";
|
||||
my $shared_relation = "";
|
||||
my $without_oids = "";
|
||||
my $rowtype_oid = "";
|
||||
my $nc = 0;
|
||||
my $inside = 0;
|
||||
my @attr;
|
||||
my @types;
|
||||
|
||||
foreach my $line (split /\n/, $indata)
|
||||
{
|
||||
if ($line =~ /^DATA\((.*)\)$/m)
|
||||
{
|
||||
my $data = $1;
|
||||
my @fields = split /\s+/,$data;
|
||||
if ($#fields >=4 && $fields[0] eq "insert" && $fields[1] eq "OID" && $fields[2] eq "=")
|
||||
{
|
||||
$oid = $fields[3];
|
||||
}
|
||||
else
|
||||
{
|
||||
$oid = 0;
|
||||
}
|
||||
$data =~ s/\s+/ /g;
|
||||
$bki .= $data . "\n";
|
||||
}
|
||||
elsif ($line =~ /^DESCR\("(.*)"\)$/m)
|
||||
{
|
||||
if ($oid != 0)
|
||||
{
|
||||
$desc .= sprintf("%d\t%s\t0\t%s\n", $oid, $catalog, $1);
|
||||
}
|
||||
}
|
||||
elsif ($line =~ /^SHDESCR\("(.*)"\)$/m)
|
||||
{
|
||||
if ($oid != 0)
|
||||
{
|
||||
$shdesc .= sprintf("%d\t%s\t%s\n", $oid, $catalog, $1);
|
||||
}
|
||||
}
|
||||
elsif ($line =~ /^DECLARE_(UNIQUE_)?INDEX\((.*)\)$/m)
|
||||
{
|
||||
if ($reln_open)
|
||||
{
|
||||
$bki .= "close $catalog\n";
|
||||
$reln_open = 0;
|
||||
}
|
||||
my $u = $1?" unique":"";
|
||||
my @fields = split /,/,$2,3;
|
||||
$fields[0] =~ s/\s+//g;
|
||||
$fields[1] =~ s/\s+//g;
|
||||
$fields[2] =~ s/\s+/ /g;
|
||||
$fields[2] =~ s/^\s+//;
|
||||
$bki .= "declare$u index $fields[0] $fields[1] $fields[2]\n";
|
||||
}
|
||||
elsif ($line =~ /^DECLARE_TOAST\((.*)\)$/m)
|
||||
{
|
||||
if ($reln_open)
|
||||
{
|
||||
$bki .= "close $catalog\n";
|
||||
$reln_open = 0;
|
||||
}
|
||||
my @fields = split /,/,$1;
|
||||
$fields[1] =~ s/\s+//g;
|
||||
$fields[2] =~ s/\s+//g;
|
||||
$bki .= "declare toast $fields[1] $fields[2] on $fields[0]\n";
|
||||
}
|
||||
elsif ($line =~ /^BUILD_INDICES/)
|
||||
{
|
||||
$bki .= "build indices\n";
|
||||
}
|
||||
elsif ($line =~ /^CATALOG\(([^)]*)\)(.*)$/m)
|
||||
{
|
||||
if ($reln_open)
|
||||
{
|
||||
$bki .= "close $catalog\n";
|
||||
$reln_open = 0;
|
||||
}
|
||||
my $rest = $2;
|
||||
my @fields = split /,/,$1;
|
||||
$catalog = $fields[0];
|
||||
$oid = $fields[1];
|
||||
$bootstrap=$shared_relation=$without_oids=$rowtype_oid="";
|
||||
if ($rest =~ /BKI_BOOTSTRAP/)
|
||||
{
|
||||
$bootstrap = " bootstrap";
|
||||
}
|
||||
if ($rest =~ /BKI_SHARED_RELATION/)
|
||||
{
|
||||
$shared_relation = " shared_relation";
|
||||
}
|
||||
if ($rest =~ /BKI_WITHOUT_OIDS/)
|
||||
{
|
||||
$without_oids = " without_oids";
|
||||
}
|
||||
if ($rest =~ /BKI_ROWTYPE_OID\((\d+)\)/)
|
||||
{
|
||||
$rowtype_oid = " rowtype_oid $1";
|
||||
}
|
||||
$nc++;
|
||||
$inside = 1;
|
||||
next;
|
||||
}
|
||||
if ($inside==1)
|
||||
{
|
||||
next if ($line =~ /{/);
|
||||
if ($line =~ /}/)
|
||||
{
|
||||
|
||||
# Last line
|
||||
$bki .= "create $catalog $oid$bootstrap$shared_relation$without_oids$rowtype_oid\n (\n";
|
||||
my $first = 1;
|
||||
for (my $i = 0; $i <= $#attr; $i++)
|
||||
{
|
||||
if ($first == 1)
|
||||
{
|
||||
$first = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
$bki .= " ,\n";
|
||||
}
|
||||
$bki .= " " . $attr[$i] . " = " . $types[$i];
|
||||
}
|
||||
$bki .= "\n )\n";
|
||||
undef(@attr);
|
||||
undef(@types);
|
||||
$reln_open = 1;
|
||||
$inside = 0;
|
||||
if ($bootstrap eq "")
|
||||
{
|
||||
$bki .= "open $catalog\n";
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
# inside catalog definition, so keep sucking up attributes
|
||||
my @fields = split /\s+/,$line;
|
||||
if ($fields[1] =~ /(.*)\[.*\]/)
|
||||
{ #Array attribute
|
||||
push @attr, $1;
|
||||
push @types, $fields[0] . '[]';
|
||||
}
|
||||
else
|
||||
{
|
||||
push @attr, $fields[1];
|
||||
push @types, $fields[0];
|
||||
}
|
||||
next;
|
||||
}
|
||||
}
|
||||
if ($reln_open == 1)
|
||||
{
|
||||
$bki .= "close $catalog\n";
|
||||
}
|
||||
|
||||
open(O,">$prefix.bki") || die "Could not write $prefix.bki\n";
|
||||
print O "# PostgreSQL $majorversion\n";
|
||||
print O $bki;
|
||||
close(O);
|
||||
open(O,">$prefix.description") || die "Could not write $prefix.description\n";
|
||||
print O $desc;
|
||||
close(O);
|
||||
open(O,">$prefix.shdescription") || die "Could not write $prefix.shdescription\n";
|
||||
print O $shdesc;
|
||||
close(O);
|
||||
}
|
||||
|
||||
sub read_file
|
||||
{
|
||||
my $filename = shift;
|
||||
my $F;
|
||||
my $t = $/;
|
||||
|
||||
undef $/;
|
||||
open($F, $filename) || die "Could not open file $filename\n";
|
||||
my $txt = <$F>;
|
||||
close($F);
|
||||
$/ = $t;
|
||||
|
||||
return $txt;
|
||||
}
|
||||
|
||||
1;
|
||||
@@ -3,14 +3,12 @@ package Solution;
|
||||
#
|
||||
# Package that encapsulates a Visual C++ solution file generation
|
||||
#
|
||||
# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.51 2010/01/01 17:34:25 mha Exp $
|
||||
# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.52 2010/01/05 01:06:57 tgl Exp $
|
||||
#
|
||||
use Carp;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use Genbki;
|
||||
|
||||
sub new
|
||||
{
|
||||
my $junk = shift;
|
||||
@@ -240,7 +238,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
|
||||
{
|
||||
print "Generating fmgrtab.c and fmgroids.h...\n";
|
||||
chdir('src\backend\utils');
|
||||
system("perl Gen_fmgrtab.pl ../../../src/include/catalog/pg_proc.h");
|
||||
system("perl -I ../catalog Gen_fmgrtab.pl ../../../src/include/catalog/pg_proc.h");
|
||||
chdir('..\..\..');
|
||||
copyFile('src\backend\utils\fmgroids.h','src\include\utils\fmgroids.h');
|
||||
}
|
||||
@@ -339,12 +337,12 @@ EOF
|
||||
next if $bki eq "";
|
||||
if (IsNewer('src/backend/catalog/postgres.bki', "src/include/catalog/$bki"))
|
||||
{
|
||||
print "Generating postgres.bki...\n";
|
||||
Genbki::genbki(
|
||||
$self->{majorver},
|
||||
"src/backend/catalog/postgres",
|
||||
split(/ /,join(' src/include/catalog/',@allbki))
|
||||
);
|
||||
print "Generating postgres.bki and schemapg.h...\n";
|
||||
chdir('src\backend\catalog');
|
||||
my $bki_srcs = join(' ../../../src/include/catalog/', @allbki);
|
||||
system("perl genbki.pl -I../../../src/include/catalog --set-version=$self->{majorver} $bki_srcs");
|
||||
chdir('..\..\..');
|
||||
copyFile('src\backend\catalog\schemapg.h', 'src\include\catalog\schemapg.h');
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@echo off
|
||||
REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.17 2010/01/01 16:58:53 mha Exp $
|
||||
REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.18 2010/01/05 01:06:57 tgl Exp $
|
||||
|
||||
set DIST=0
|
||||
if "%1"=="dist" set DIST=1
|
||||
@@ -23,11 +23,12 @@ if %DIST%==1 if exist src\backend\parser\gram.h del /q src\backend\parser\gram.h
|
||||
if exist src\include\utils\fmgroids.h del /q src\include\utils\fmgroids.h
|
||||
if exist src\include\utils\probes.h del /q src\include\utils\probes.h
|
||||
|
||||
if exist src\backend\utils\fmgroids.h del /q src\backend\utils\fmgroids.h
|
||||
if exist src\backend\utils\fmgrtab.c del /q src\backend\utils\fmgrtab.c
|
||||
if exist src\backend\catalog\postgres.bki del /q src\backend\catalog\postgres.bki
|
||||
if exist src\backend\catalog\postgres.description del /q src\backend\catalog\postgres.description
|
||||
if exist src\backend\catalog\postgres.shdescription del /q src\backend\catalog\postgres.shdescription
|
||||
if %DIST%==1 if exist src\backend\utils\fmgroids.h del /q src\backend\utils\fmgroids.h
|
||||
if %DIST%==1 if exist src\backend\utils\fmgrtab.c del /q src\backend\utils\fmgrtab.c
|
||||
if %DIST%==1 if exist src\backend\catalog\postgres.bki del /q src\backend\catalog\postgres.bki
|
||||
if %DIST%==1 if exist src\backend\catalog\postgres.description del /q src\backend\catalog\postgres.description
|
||||
if %DIST%==1 if exist src\backend\catalog\postgres.shdescription del /q src\backend\catalog\postgres.shdescription
|
||||
if %DIST%==1 if exist src\backend\catalog\schemapg.h del /q src\backend\catalog\schemapg.h
|
||||
if %DIST%==1 if exist src\backend\parser\scan.c del /q src\backend\parser\scan.c
|
||||
if %DIST%==1 if exist src\backend\parser\gram.c del /q src\backend\parser\gram.c
|
||||
if %DIST%==1 if exist src\backend\bootstrap\bootscanner.c del /q src\backend\bootstrap\bootscanner.c
|
||||
|
||||
Reference in New Issue
Block a user