mirror of
https://github.com/postgres/postgres.git
synced 2025-06-04 00:02:37 -04:00
pgindent: fix downloading of BSD indent binary
Also fix accessing pgentab binary and tar. Gurjeet Singh
This commit is contained in:
parent
f8a54e936b
commit
8daa4e960e
@ -59,7 +59,7 @@ my $filtered_typedefs_fh;
|
|||||||
|
|
||||||
sub check_indent
|
sub check_indent
|
||||||
{
|
{
|
||||||
system("entab < $devnull");
|
system("$entab < $devnull");
|
||||||
if ($?)
|
if ($?)
|
||||||
{
|
{
|
||||||
print STDERR
|
print STDERR
|
||||||
@ -448,29 +448,28 @@ sub run_build
|
|||||||
|
|
||||||
$ENV{PGTYPEDEFS} = abs_path('tmp_typedefs.list');
|
$ENV{PGTYPEDEFS} = abs_path('tmp_typedefs.list');
|
||||||
|
|
||||||
$rv =
|
my $pg_bsd_indent_name = "pg_bsd_indent-" . $INDENT_VERSION . ".tar.gz";
|
||||||
getstore("ftp://ftp.postgresql.org/pub/dev/indent.netbsd.patched.tgz",
|
|
||||||
"indent.netbsd.patched.tgz");
|
|
||||||
|
|
||||||
die "fetching indent.netbsd.patched.tgz" unless is_success($rv);
|
$rv =
|
||||||
|
getstore("ftp://ftp.postgresql.org/pub/dev/$pg_bsd_indent_name",
|
||||||
|
"pg_bsd_indent.tgz");
|
||||||
|
|
||||||
|
die "fetching $pg_bsd_indent_name" unless is_success($rv);
|
||||||
|
|
||||||
# XXX add error checking here
|
# XXX add error checking here
|
||||||
|
|
||||||
mkdir "bsdindent";
|
system("tar -z -xf pg_bsd_indent.tgz");
|
||||||
chdir "bsdindent";
|
chdir "pg_bsd_indent";
|
||||||
system("tar -z -xf ../indent.netbsd.patched.tgz");
|
|
||||||
system("make > $devnull 2>&1");
|
system("make > $devnull 2>&1");
|
||||||
|
|
||||||
$ENV{PGINDENT} = abs_path('indent');
|
$ENV{PGINDENT} = abs_path('pg_bsd_indent');
|
||||||
|
|
||||||
chdir "../../entab";
|
chdir "../../entab";
|
||||||
|
|
||||||
system("make > $devnull 2>&1");
|
system("make > $devnull 2>&1");
|
||||||
|
|
||||||
$ENV{PGENTAB} = abs_path('entab');
|
$ENV{PGENTAB} = abs_path('entab');
|
||||||
|
|
||||||
chdir $save_dir;
|
chdir $save_dir;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user