Skip to content
Browse files

Add locale-end module hook, use USE_MODULE_DB for install checking.

  • Loading branch information...
1 parent 1fedb00 commit f6b4aa009a05bab3f23df2a3e46e189d55af451f @adunstan adunstan committed
Showing with 18 additions and 3 deletions.
  1. +13 −2 PGBuild/Modules/Skeleton.pm
  2. +5 −1 run_build.pl
View
15 PGBuild/Modules/Skeleton.pm
@@ -20,6 +20,7 @@ my $hooks = {
'check' => \&check,
'install' => \&install,
'installcheck' => \&installcheck,
+ 'locale-end' => \&locale_end,
'cleanup' => \&cleanup,
};
@@ -112,14 +113,24 @@ sub installcheck
my $self = shift;
my $locale = shift;
- print main::time_str(), "installchecking ",__PACKAGE__,"\n" if $verbose;
+ print main::time_str(), "installchecking $locale",__PACKAGE__,"\n"
+ if $verbose;
+}
+
+sub locale_end
+{
+ my $self = shift;
+ my $locale = shift;
+
+ print main::time_str(), "end of locale $locale processing",__PACKAGE__,"\n"
+ if $verbose;
}
sub cleanup
{
my $self = shift;
- print main::time_str(), "cleaning up ",__PACKAGE__,"\n" if $verbose;
+ print main::time_str(), "cleaning up ",__PACKAGE__,"\n" if $verbose > 1;
}
1;
View
6 run_build.pl
@@ -430,6 +430,7 @@ END
rmtree("$ccachedir") if $ccachedir;
}
+ # get the modules to clean up after themselves
process_module_hooks('cleanup');
if ($have_lock)
@@ -729,6 +730,8 @@ END
stop_db($locale);
+ process_module_hooks('locale-end',$locale);
+
rmtree("$installdir/data-$locale")
unless $keepall;
}
@@ -1238,7 +1241,8 @@ sub make_contrib_install_check
my @checklog;
unless ($using_msvc)
{
- @checklog = `cd $pgsql/contrib && $make installcheck 2>&1`;
+ @checklog =
+ `cd $pgsql/contrib && $make USE_MODULE_DB=1 installcheck 2>&1`;
}
else
{

0 comments on commit f6b4aa0

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