Browse Source

Add PostgreSQL home page to --help output

Per emerging standard in GNU programs and elsewhere.  Autoconf already
has support for specifying a home page, so we can just that.

Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Discussion: https://www.postgresql.org/message-id/flat/8d389c5f-7fb5-8e48-9a4a-68cec44786fa%402ndquadrant.com
REL_13_STABLE
Peter Eisentraut 8 months ago
parent
commit
1933ae629e
37 changed files with 53 additions and 14 deletions
  1. +4
    -2
      configure
  2. +1
    -1
      configure.in
  3. +3
    -2
      contrib/oid2name/oid2name.c
  4. +1
    -0
      contrib/pg_standby/pg_standby.c
  5. +1
    -0
      contrib/vacuumlo/vacuumlo.c
  6. +2
    -0
      src/Makefile.global.in
  7. +1
    -1
      src/Makefile.shlib
  8. +1
    -0
      src/backend/main/main.c
  9. +1
    -0
      src/bin/initdb/initdb.c
  10. +1
    -0
      src/bin/pg_archivecleanup/pg_archivecleanup.c
  11. +1
    -0
      src/bin/pg_basebackup/pg_basebackup.c
  12. +1
    -0
      src/bin/pg_basebackup/pg_receivewal.c
  13. +1
    -0
      src/bin/pg_basebackup/pg_recvlogical.c
  14. +1
    -0
      src/bin/pg_checksums/pg_checksums.c
  15. +1
    -0
      src/bin/pg_config/pg_config.c
  16. +1
    -0
      src/bin/pg_controldata/pg_controldata.c
  17. +1
    -0
      src/bin/pg_ctl/pg_ctl.c
  18. +1
    -0
      src/bin/pg_dump/pg_dump.c
  19. +1
    -0
      src/bin/pg_dump/pg_dumpall.c
  20. +1
    -0
      src/bin/pg_dump/pg_restore.c
  21. +1
    -0
      src/bin/pg_resetwal/pg_resetwal.c
  22. +1
    -0
      src/bin/pg_rewind/pg_rewind.c
  23. +1
    -0
      src/bin/pg_upgrade/option.c
  24. +1
    -0
      src/bin/pg_waldump/pg_waldump.c
  25. +3
    -2
      src/bin/pgbench/pgbench.c
  26. +1
    -0
      src/bin/psql/help.c
  27. +1
    -0
      src/bin/scripts/clusterdb.c
  28. +1
    -0
      src/bin/scripts/createdb.c
  29. +1
    -0
      src/bin/scripts/createuser.c
  30. +1
    -0
      src/bin/scripts/dropdb.c
  31. +1
    -0
      src/bin/scripts/dropuser.c
  32. +1
    -0
      src/bin/scripts/pg_isready.c
  33. +1
    -0
      src/bin/scripts/reindexdb.c
  34. +1
    -0
      src/bin/scripts/vacuumdb.c
  35. +1
    -0
      src/interfaces/ecpg/preproc/ecpg.c
  36. +1
    -0
      src/test/regress/pg_regress.c
  37. +9
    -6
      src/tools/msvc/Solution.pm

+ 4
- 2
configure View File

@ -585,7 +585,7 @@ PACKAGE_TARNAME='postgresql'
PACKAGE_VERSION='13devel'
PACKAGE_STRING='PostgreSQL 13devel'
PACKAGE_BUGREPORT='pgsql-bugs@lists.postgresql.org'
PACKAGE_URL=''
PACKAGE_URL='https://www.postgresql.org/'
ac_unique_file="src/backend/access/common/heaptuple.c"
ac_default_prefix=/usr/local/pgsql
@ -1600,6 +1600,7 @@ Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <pgsql-bugs@lists.postgresql.org>.
PostgreSQL home page: <https://www.postgresql.org/>.
_ACEOF
ac_status=$?
fi
@ -19516,7 +19517,8 @@ $config_links
Configuration commands:
$config_commands
Report bugs to <pgsql-bugs@lists.postgresql.org>."
Report bugs to <pgsql-bugs@lists.postgresql.org>.
PostgreSQL home page: <https://www.postgresql.org/>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

+ 1
- 1
configure.in View File

@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
dnl
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
AC_INIT([PostgreSQL], [13devel], [pgsql-bugs@lists.postgresql.org])
AC_INIT([PostgreSQL], [13devel], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
Untested combinations of 'autoconf' and PostgreSQL versions are not

+ 3
- 2
contrib/oid2name/oid2name.c View File

@ -219,8 +219,9 @@ help(const char *progname)
" -p, --port=PORT database server port number\n"
" -U, --username=USERNAME connect as specified database user\n"
"\nThe default action is to show all database OIDs.\n\n"
"Report bugs to <%s>.\n",
progname, progname, PACKAGE_BUGREPORT);
"Report bugs to <%s>.\n"
"%s home page: <%s>\n",
progname, progname, PACKAGE_BUGREPORT, PACKAGE_NAME, PACKAGE_URL);
}
/*

+ 1
- 0
contrib/pg_standby/pg_standby.c View File

@ -613,6 +613,7 @@ usage(void)
"e.g.\n"
" restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n");
printf("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
}
#ifndef WIN32

+ 1
- 0
contrib/vacuumlo/vacuumlo.c View File

@ -437,6 +437,7 @@ usage(const char *progname)
printf(" -W, --password force password prompt\n");
printf("\n");
printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
printf("%s home page: <%s>\n", PACKAGE_NAME, PACKAGE_URL);
}

+ 2
- 0
src/Makefile.global.in View File

@ -40,6 +40,8 @@ VERSION = @PACKAGE_VERSION@
MAJORVERSION = @PG_MAJORVERSION@
VERSION_NUM = @PG_VERSION_NUM@
PACKAGE_URL = @PACKAGE_URL@
# Set top_srcdir, srcdir, and VPATH.
ifdef PGXS
top_srcdir = $(top_builddir)

+ 1
- 1
src/Makefile.shlib View File

@ -389,7 +389,7 @@ endif # PORTNAME == cygwin || PORTNAME == win32
%.pc: $(MAKEFILE_LIST)
echo 'Name: lib$(NAME)' >$@
echo 'Description: PostgreSQL lib$(NAME) library' >>$@
echo 'Url: http://www.postgresql.org/' >>$@
echo 'Url: $(PACKAGE_URL)' >>$@
echo 'Version: $(VERSION)' >>$@
echo 'Requires: ' >>$@
echo 'Requires.private: $(PKG_CONFIG_REQUIRES_PRIVATE)' >>$@

+ 1
- 0
src/backend/main/main.c View File

@ -360,6 +360,7 @@ help(const char *progname)
"configuration settings and how to set them on the command line or in\n"
"the configuration file.\n\n"
"Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/initdb/initdb.c View File

@ -2323,6 +2323,7 @@ usage(const char *progname)
printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"
"is used.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
static void

+ 1
- 0
src/bin/pg_archivecleanup/pg_archivecleanup.c View File

@ -270,6 +270,7 @@ usage(void)
"e.g.\n"
" pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
/*------------ MAIN ----------------------------------------*/

+ 1
- 0
src/bin/pg_basebackup/pg_basebackup.c View File

@ -397,6 +397,7 @@ usage(void)
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt (should happen automatically)\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/pg_basebackup/pg_receivewal.c View File

@ -103,6 +103,7 @@ usage(void)
printf(_(" --create-slot create a new replication slot (for the slot's name see --slot)\n"));
printf(_(" --drop-slot drop the replication slot (for the slot's name see --slot)\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
static bool

+ 1
- 0
src/bin/pg_basebackup/pg_recvlogical.c View File

@ -104,6 +104,7 @@ usage(void)
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt (should happen automatically)\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
/*

+ 1
- 0
src/bin/pg_checksums/pg_checksums.c View File

@ -89,6 +89,7 @@ usage(void)
printf(_("\nIf no data directory (DATADIR) is specified, "
"the environment variable PGDATA\nis used.\n\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
/*

+ 1
- 0
src/bin/pg_config/pg_config.c View File

@ -103,6 +103,7 @@ help(void)
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nWith no arguments, all known items are shown.\n\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
static void

+ 1
- 0
src/bin/pg_controldata/pg_controldata.c View File

@ -42,6 +42,7 @@ usage(const char *progname)
printf(_("\nIf no data directory (DATADIR) is specified, "
"the environment variable PGDATA\nis used.\n\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/pg_ctl/pg_ctl.c View File

@ -2096,6 +2096,7 @@ do_help(void)
#endif
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/pg_dump/pg_dump.c View File

@ -1048,6 +1048,7 @@ help(const char *progname)
printf(_("\nIf no database name is supplied, then the PGDATABASE environment\n"
"variable value is used.\n\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
static void

+ 1
- 0
src/bin/pg_dump/pg_dumpall.c View File

@ -671,6 +671,7 @@ help(void)
printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n"
"output.\n\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/pg_dump/pg_restore.c View File

@ -520,4 +520,5 @@ usage(const char *progname)
"multiple times to select multiple objects.\n"));
printf(_("\nIf no input file name is supplied, then standard input is used.\n\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/pg_resetwal/pg_resetwal.c View File

@ -1224,4 +1224,5 @@ usage(void)
printf(_(" --wal-segsize=SIZE size of WAL segments, in megabytes\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/pg_rewind/pg_rewind.c View File

@ -88,6 +88,7 @@ usage(const char *progname)
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/pg_upgrade/option.c View File

@ -337,6 +337,7 @@ usage(void)
" C:\\> pg_upgrade\n"));
#endif
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/pg_waldump/pg_waldump.c View File

@ -731,6 +731,7 @@ usage(void)
" (optionally, show per-record statistics)\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
int

+ 3
- 2
src/bin/pgbench/pgbench.c View File

@ -681,8 +681,9 @@ usage(void)
" -V, --version output version information, then exit\n"
" -?, --help show this help, then exit\n"
"\n"
"Report bugs to <%s>.\n",
progname, progname, PACKAGE_BUGREPORT);
"Report bugs to <%s>.\n"
"%s home page: <%s>\n",
progname, progname, PACKAGE_BUGREPORT, PACKAGE_NAME, PACKAGE_URL);
}
/* return whether str matches "^\s*[-+]?[0-9]+$" */

+ 1
- 0
src/bin/psql/help.c View File

@ -145,6 +145,7 @@ usage(unsigned short int pager)
"commands) from within psql, or consult the psql section in the PostgreSQL\n"
"documentation.\n\n"));
fprintf(output, _("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
fprintf(output, _("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
ClosePager(output);
}

+ 1
- 0
src/bin/scripts/clusterdb.c View File

@ -292,4 +292,5 @@ help(const char *progname)
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nRead the description of the SQL command CLUSTER for details.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/scripts/createdb.c View File

@ -278,4 +278,5 @@ help(const char *progname)
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nBy default, a database with the same name as the current user is created.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/scripts/createuser.c View File

@ -376,4 +376,5 @@ help(const char *progname)
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/scripts/dropdb.c View File

@ -178,4 +178,5 @@ help(const char *progname)
printf(_(" -W, --password force password prompt\n"));
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/scripts/dropuser.c View File

@ -176,4 +176,5 @@ help(const char *progname)
printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/scripts/pg_isready.c View File

@ -236,4 +236,5 @@ help(const char *progname)
printf(_(" -t, --timeout=SECS seconds to wait when attempting connection, 0 disables (default: %s)\n"), DEFAULT_CONNECT_TIMEOUT);
printf(_(" -U, --username=USERNAME user name to connect as\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/scripts/reindexdb.c View File

@ -775,4 +775,5 @@ help(const char *progname)
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nRead the description of the SQL command REINDEX for details.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/bin/scripts/vacuumdb.c View File

@ -950,4 +950,5 @@ help(const char *progname)
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nRead the description of the SQL command VACUUM for details.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}

+ 1
- 0
src/interfaces/ecpg/preproc/ecpg.c View File

@ -59,6 +59,7 @@ help(const char *progname)
printf(_("\nIf no output file is specified, the name is formed by adding .c to the\n"
"input file name, after stripping off .pgc if present.\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
static void

+ 1
- 0
src/test/regress/pg_regress.c View File

@ -2072,6 +2072,7 @@ help(void)
printf(_("if the tests could not be run for some reason.\n"));
printf(_("\n"));
printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL);
}
int

+ 9
- 6
src/tools/msvc/Solution.pm View File

@ -146,20 +146,26 @@ sub GenerateFiles
{
my $self = shift;
my $bits = $self->{platform} eq 'Win32' ? 32 : 64;
my $ac_init_found = 0;
my $package_name;
my $package_version;
my $package_bugreport;
my $package_url;
# Parse configure.in to get version numbers
open(my $c, '<', "configure.in")
|| confess("Could not open configure.in for reading\n");
while (<$c>)
{
if (/^AC_INIT\(\[([^\]]+)\], \[([^\]]+)\], \[([^\]]+)\]/)
if (/^AC_INIT\(\[([^\]]+)\], \[([^\]]+)\], \[([^\]]+)\], \[([^\]]*)\], \[([^\]]+)\]/)
{
$ac_init_found = 1;
$package_name = $1;
$package_version = $2;
$package_bugreport = $3;
#$package_tarname = $4;
$package_url = $5;
if ($package_version !~ /^(\d+)(?:\.(\d+))?/)
{
@ -171,10 +177,7 @@ sub GenerateFiles
}
close($c);
confess "Unable to parse configure.in for all variables!"
if ( $package_name eq ''
|| $package_version eq ''
|| $self->{numver} eq ''
|| $package_bugreport eq '');
unless $ac_init_found;
if (IsNewer("src/include/pg_config_os.h", "src/include/port/win32.h"))
{
@ -431,7 +434,7 @@ sub GenerateFiles
PACKAGE_NAME => qq{"$package_name"},
PACKAGE_STRING => qq{"$package_name $package_version"},
PACKAGE_TARNAME => lc qq{"$package_name"},
PACKAGE_URL => undef,
PACKAGE_URL => qq{"$package_url"},
PACKAGE_VERSION => qq{"$package_version"},
PG_INT128_TYPE => undef,
PG_INT64_TYPE => 'long long int',

Loading…
Cancel
Save