From 410e1d87139f6bea2f1cd098e269fdfd0997a85e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 10 Jun 2008 18:09:15 +0000 Subject: [PATCH] Create a script to handle stamping release version numbers into files, replacing the tedious and error-prone manual process we've been using. --- src/tools/RELEASE_CHANGES | 15 ++++----------- src/tools/version_stamp.pl | 7 ++----- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES index c7528f46fe..5d38d2c3dd 100644 --- a/src/tools/RELEASE_CHANGES +++ b/src/tools/RELEASE_CHANGES @@ -1,16 +1,9 @@ -* Beta and Release Candidate (RC) changes - o configure.in and configure - o src/include/pg_config.h.win32 - * Version numbers - o configure.in, and run autoconf or update configure - o doc/bug.template + o run src/tools/version_stamp.pl, then run autoconf (by packager) o bump interface version numbers - src/interfaces/*/Makefile (major releases only) - - src/interfaces/libpq/libpq.rc.in (major and minor releases) - - src/include/pg_config.h.win32 (major and minor releases) - - port/win32ver.rc (major and minor releases) + - src/interfaces/*/*/Makefile (major releases only) * Release notes o scan cvs logs, use pgcvslog and flags in comments @@ -28,12 +21,12 @@ document all new features update help output from inside the programs doc/src/sgml/ref manual pages + convert any literal "<" and ">" characters, use tools/find_gt_lt * Ports update config.guess and config.sub at the start of beta update ports list in doc/src/sgml/installation.sgml - update INSTALL - platform-specific FAQ's, if needed + update platform-specific FAQ's, if needed * Update timezone data to match latest zic database (see src/timezone/README) diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl index f42d970ac5..cee2c82f1a 100755 --- a/src/tools/version_stamp.pl +++ b/src/tools/version_stamp.pl @@ -23,7 +23,7 @@ # Major version is hard-wired into the script. We update it when we branch # a new development version. $major1 = 8; -$major2 = 4; +$major2 = 0; # Validate argument and compute derived variables $minor = shift; @@ -53,7 +53,6 @@ if ($dotneeded) { $fullversion = $majorversion . $minor; } $numericversion = $majorversion . "." . $numericminor; -$padnumericversion = sprintf("%d%02d%02d", $major1, $major2, $numericminor); # Get the autoconf version number for eventual nag message # (this also ensures we're in the right directory) @@ -80,10 +79,8 @@ sed_file("doc/bug.template", "-e 's/PostgreSQL version (example: PostgreSQL .*) *: PostgreSQL .*/PostgreSQL version (example: PostgreSQL $fullversion): PostgreSQL $fullversion/'"); sed_file("src/include/pg_config.h.win32", - "-e 's/#define PACKAGE_STRING \"PostgreSQL .*\"/#define PACKAGE_STRING \"PostgreSQL $fullversion\"/' " . - "-e 's/#define PACKAGE_VERSION \".*\"/#define PACKAGE_VERSION \"$fullversion\"/' " . "-e 's/#define PG_VERSION \".*\"/#define PG_VERSION \"$fullversion\"/' " . - "-e 's/#define PG_VERSION_NUM .*/#define PG_VERSION_NUM $padnumericversion/'"); + "-e 's/#define PG_VERSION_STR \".* (win32)\"/#define PG_VERSION_STR \"$fullversion (win32)\"/'"); sed_file("src/interfaces/libpq/libpq.rc.in", "-e 's/FILEVERSION [0-9]*,[0-9]*,[0-9]*,0/FILEVERSION $major1,$major2,$numericminor,0/' " . -- 2.39.5