Create a script to handle stamping release version numbers into files,

replacing the tedious and error-prone manual process we've been using.

diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES
index 6caaebef1a5ec1f192ef0bb3361c64930b721608..71d21a709857bb5c4aa97a4a35981663ffe9d61e 100644 (file)
--- a/src/tools/RELEASE_CHANGES
+++ b/src/tools/RELEASE_CHANGES
@@ -1,20 +1,10 @@
  
-* Beta and Release Candidate (RC) changes
-       o configure.in, and run autoconf or update configure
-       o doc/bug.template
-       o src/include/pg_config.h.win32
-
 * Version numbers
-       o configure.in, and run autoconf or update configure
-       o doc/bug.template
+       o update doc/FAQ and doc/src/FAQ/FAQ.html
+       o run src/tools/version_stamp.pl, then run autoconf (by packager)
        o bump library versions
                - src/interfaces/*/Makefile (major releases only)
                - src/interfaces/*/*/Makefile (major releases only)
-       o bump interface version numbers
-               - src/interfaces/libpq/libpq.rc.in (major and minor releases)
-               - src/include/pg_config.h.win32 (major and minor releases)
-               - src/port/win32ver.rc (major and minor releases)
-       o update doc/FAQ and doc/src/FAQ/FAQ.html
 
 * Release notes
        o scan cvs logs, use pgcvslog and flags in comments

diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl
index f42d970ac5776876cd4193d7ed247d1e8b942679..8a273f8db71487034b0993722fe5e0f8720471b4 100755 (executable)
--- 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 = 1;
 
 # 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/' " .