Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

perltidy run

  • Loading branch information...
commit a96b4e44697ba401df7fa168d2154a944f03c083 1 parent 8001ad6
@adunstan adunstan authored
View
3  Makefile
@@ -8,7 +8,8 @@ PERLFILES = run_build.pl run_web_txn.pl run_branches.pl \
build-farm.conf \
PGBuild/SCM.pm PGBuild/Options.pm \
PGBuild/Modules/Skeleton.pm \
- PGBuild/Modules/TestUpgrade.pm
+ PGBuild/Modules/TestUpgrade.pm \
+ PGBuild/Modules/FileTextArrayFDW.pm
FILES = License README $(PERLFILES)
View
60 PGBuild/Modules/FileTextArrayFDW.pm
@@ -17,9 +17,11 @@ use vars qw($VERSION); $VERSION = 'REL_4.8';
my $hooks = {
'checkout' => \&checkout,
'setup-target' => \&setup_target,
+
# 'need-run' => \&need_run,
# 'configure' => \&configure,
'build' => \&build,
+
# 'check' => \&check,
'install' => \&install,
'installcheck' => \&installcheck,
@@ -35,7 +37,7 @@ sub setup
my $conf = shift; # ref to the whole config object
my $pgsql = shift; # postgres build dir
- return unless $branch ge 'REL9_1_STABLE' || $branch eq 'HEAD';
+ return unless $branch ge 'REL9_1_STABLE' || $branch eq 'HEAD';
# could even set up several of these (e.g. for different branches)
my $self = {
@@ -46,18 +48,17 @@ sub setup
};
bless($self, $class);
- my $scmconf =
- {
- scm => 'git',
- scmrepo => 'git://github.com/adunstan/file_text_array_fdw.git',
- git_reference => undef,
- git_keep_mirror => undef,
- git_ignore_mirror_failure => undef,
- };
+ my $scmconf ={
+ scm => 'git',
+ scmrepo => 'git://github.com/adunstan/file_text_array_fdw.git',
+ git_reference => undef,
+ git_keep_mirror => undef,
+ git_ignore_mirror_failure => undef,
+ };
- $self->{scm} = new PGBuild::SCM $scmconf, 'file_text_array_fdw';
- my $where = $self->{scm}->get_build_path();
- $self->{where} = $where;
+ $self->{scm} = new PGBuild::SCM $scmconf, 'file_text_array_fdw';
+ my $where = $self->{scm}->get_build_path();
+ $self->{where} = $where;
# for each instance you create, do:
main::register_module_hooks($self,$hooks);
@@ -71,10 +72,10 @@ sub checkout
print main::time_str(), "checking out $MODULE\n" if $verbose;
- my $scmlog = $self->{scm}->checkout($self->{pgbranch});
+ my $scmlog = $self->{scm}->checkout($self->{pgbranch});
- push(@$savescmlog, "------------- $MODULE checkout ----------------\n",
- @$scmlog);
+ push(@$savescmlog,
+ "------------- $MODULE checkout ----------------\n",@$scmlog);
}
sub setup_target
@@ -83,8 +84,8 @@ sub setup_target
# copy the code or setup a vpath dir if supported as appropriate
- print main::time_str(), "copying source to ...$self->{where}\n"
- if $verbose;
+ print main::time_str(), "copying source to ...$self->{where}\n"
+ if $verbose;
$self->{scm}->copy_source(undef);
@@ -109,7 +110,6 @@ sub configure
print main::time_str(), "configuring $MODULE\n" if $verbose;
-
}
sub build
@@ -118,15 +118,15 @@ sub build
print main::time_str(), "building $MODULE\n" if $verbose;
- my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1";
+ my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1";
- my @makeout = `cd $self->{where} && $cmd 2>&1`;
+ my @makeout = `cd $self->{where} && $cmd 2>&1`;
my $status = $? >>8;
main::writelog("$MODULE-build",\@makeout);
print "======== make log ===========\n",@makeout if ($verbose > 1);
main::send_result("$MODULE-build",$status,\@makeout) if $status;
-
+
}
sub install
@@ -135,15 +135,15 @@ sub install
print main::time_str(), "installing $MODULE\n" if $verbose;
- my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1 install";
+ my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1 install";
- my @log = `cd $self->{where} && $cmd 2>&1`;
+ my @log = `cd $self->{where} && $cmd 2>&1`;
my $status = $? >>8;
main::writelog("$MODULE-install",\@log);
print "======== install log ===========\n",@log if ($verbose > 1);
main::send_result("$MODULE-install",$status,\@log) if $status;
-
+
}
sub check
@@ -160,16 +160,16 @@ sub installcheck
print main::time_str(), "install-checking $MODULE\n" if $verbose;
- my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1 installcheck";
+ my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1 installcheck";
- my @log = `cd $self->{where} && $cmd 2>&1`;
+ my @log = `cd $self->{where} && $cmd 2>&1`;
my $status = $? >>8;
main::writelog("$MODULE-installcheck-$locale",\@log);
- print "======== installcheck ($locale) log ===========\n",@log
- if ($verbose > 1);
+ print "======== installcheck ($locale) log ===========\n",@log
+ if ($verbose > 1);
main::send_result("$MODULE-installcheck-$locale",$status,\@log) if $status;
-
+
}
sub cleanup
@@ -178,7 +178,7 @@ sub cleanup
print main::time_str(), "cleaning up $MODULE\n" if $verbose;
- system("rm -rf $self->{where}");
+ system("rm -rf $self->{where}");
}
1;
View
3  build-farm.conf
@@ -182,7 +182,8 @@ my $branch;
base_port => 5678,
- modules => [ qw(TestUpgrade) ],
+ modules => [qw(TestUpgrade)],
+
#
);
View
13 run_build.pl
@@ -61,8 +61,10 @@ BEGIN
# report all the keys but only values for whitelisted settings
# this is to stop leaking of things like passwords
$orig_env->{$k} =(
- ($k =~ /^PG(?!PASSWORD)|MAKE|CC|CPP|FLAG|LIBRAR|INCLUDE/ ||
- $k =~/^(HOME|LOGNAME|USER|PATH|SHELL)$/)
+ (
+ $k =~ /^PG(?!PASSWORD)|MAKE|CC|CPP|FLAG|LIBRAR|INCLUDE/
+ ||$k =~/^(HOME|LOGNAME|USER|PATH|SHELL)$/
+ )
? $v
: 'xxxxxx'
);
@@ -1021,9 +1023,10 @@ sub make_contrib
sub make_contrib_install
{
- return unless step_wanted('make') &&
- step_wanted('make-contrib') &&
- step_wanted('install');
+ return
+ unless step_wanted('make')
+ &&step_wanted('make-contrib')
+ &&step_wanted('install');
print time_str(),"running make contrib install ...\n"
if $verbose;

0 comments on commit a96b4e4

Please sign in to comment.
Something went wrong with that request. Please try again.