Permalink
Browse files

Remove some cruft.

The ipcclean and multiroot options were long dead. The header comment
was out of date and now just points to the Wiki and the Github repo.

Also a line in the help text for skip-steps was added.
  • Loading branch information...
1 parent cb2d4c5 commit b765f0e6bb63a7e83bd75419aedf85f5bf622b87 @adunstan adunstan committed Sep 6, 2012
Showing with 8 additions and 42 deletions.
  1. +3 −5 PGBuild/Options.pm
  2. +5 −37 run_build.pl
View
@@ -20,7 +20,7 @@ use vars qw(@option_list);
BEGIN
{
@option_list =qw(
- $forcerun $buildconf $keepall $ipcclean $help $multiroot
+ $forcerun $buildconf $keepall $help
$quiet $from_source $from_source_clean $testmode
$test_mode $skip_steps $find_typedefs
$nosend $nostatus $verbose
@@ -38,8 +38,8 @@ use vars qw($VERSION); $VERSION = 'REL_4.7';
@EXPORT_OK = ();
our (
- $forcerun, $buildconf, $keepall, $ipcclean,
- $help, $multiroot,$quiet, $from_source,
+ $forcerun, $buildconf, $keepall,
+ $help, $quiet, $from_source,
$from_source_clean, $testmode,$test_mode, $skip_steps,
$find_typedefs,$nosend, $nostatus, $verbose,
);
@@ -54,14 +54,12 @@ my (%standard_options);
'force' => \$forcerun,
'find-typedefs' => \$find_typedefs,
'keepall' => \$keepall,
- 'ipcclean' => \$ipcclean,
'verbose:i' => \$verbose,
'nostatus' => \$nostatus,
'test' => \$testmode,
'help' => \$help,
'quiet' => \$quiet,
'skip-steps=s' => \$skip_steps,
- 'multiroot' => \$multiroot,
);
$buildconf = "build-farm.conf"; # default value
View
@@ -20,36 +20,13 @@
AUTHOR: Andrew Dunstan
- USAGE:
+ DOCUMENTATION:
- To upload results, you will need a name/secret
- to put into the config file. Test runs without
- uploading results can be done using the --nosend
- commandline flag.
+ See http://wiki.postgresql.org/wiki/PostgreSQL_Buildfarm_Howto
- Install this file, run_web_txn.pl and build-farm.conf in some
- directory together. Edit build-farm.conf to match
- your setup. Create the buildroot directory.
- Run "perl -cw build-farm.conf" to make sure it
- is OK. Run "perl -cw run_build.pl" to make sure
- you have all the required perl modules. Make a
- test run in the foreground (can take up to an hour
- on a slow machine). Add cron entries that look
- like this:
+ REPOSITORY:
- # check HEAD branch once an hour
- 32 * * * * cd /path/to/script && ./run_build.pl
- # check REL7_4_STABLE branch once a week
- 18 3 * * 3 cd /path/to/script && ./run_build.pl REL7_4_STABLE
-
- There is provision in the conf file for support of
- ccache. This is highly recommended.
-
- For more extensive information, see docs and mailing list
- at the pgfoundry site: http://pgfoundry.org/projects/pgbuildfarm/
-
- See the results of our labors at
- http://www.pgbuildfarm.org/cgi-bin/show_status.pl
+ https://github.com/PGBuildFarm/client-code
=cut
@@ -244,11 +221,6 @@
$scm->check_access($using_msvc);
}
-if ($multiroot)
-{
- warn "--multi-root is no longer necessary, and is deprecated";
-}
-
my $st_prefix = "$animal.";
my $pgsql = $from_source || $scm->get_build_path($use_vpath);
@@ -397,10 +369,6 @@ END
}
chdir $branch_root;
}
- if ($ipcclean && -x "$pgsql/src/bin/ipcclean/ipcclean")
- {
- system("$pgsql/src/bin/ipcclean/ipcclean >$devnull 2>&1");
- }
if ( !$from_source && $keep_errs)
{
print "moving kept error trees\n" if $verbose;
@@ -787,8 +755,8 @@ sub print_help
--keepall = keep directories if an error occurs
--verbose[=n] = verbosity (default 1) 2 or more = huge output.
--quiet = suppress normal error message
- --ipcclean = clean up shared memory on failure
--test = short for --nosend --nostatus --verbose --force
+ --skip-steps=list = skip certain steps
Default branch is HEAD. Usually only the --config option should be necessary.

0 comments on commit b765f0e

Please sign in to comment.