diff options
author | Andrew Dunstan <andrew@dunslane.net> | 2018-06-30 12:47:59 -0400 |
---|---|---|
committer | Andrew Dunstan <andrew@dunslane.net> | 2018-06-30 12:47:59 -0400 |
commit | feced1387f07c3fa6c47d36a68962750e6065486 (patch) | |
tree | 394bb58b4a59383f918558e691513cdec1d479ae /src | |
parent | d8421390996dcd762383a28e57d1f3f16cc5f76f (diff) | |
download | postgresql-feced1387f07c3fa6c47d36a68962750e6065486.tar.gz postgresql-feced1387f07c3fa6c47d36a68962750e6065486.zip |
Stamp HEAD as 12devel
Let the hacking begin ...
Diffstat (limited to 'src')
-rw-r--r-- | src/include/pg_config.h.win32 | 8 | ||||
-rw-r--r-- | src/interfaces/libpq/libpq.rc.in | 8 | ||||
-rw-r--r-- | src/port/win32ver.rc | 4 | ||||
-rwxr-xr-x | src/tools/git_changelog | 2 | ||||
-rwxr-xr-x | src/tools/version_stamp.pl | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 212e7739cdb..456b5c6b66d 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -622,10 +622,10 @@ #define PACKAGE_NAME "PostgreSQL" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 11beta2" +#define PACKAGE_STRING "PostgreSQL 12devel" /* Define to the version of this package. */ -#define PACKAGE_VERSION "11beta2" +#define PACKAGE_VERSION "12devel" /* Define to the name of a signed 128-bit integer type. */ #undef PG_INT128_TYPE @@ -634,10 +634,10 @@ #define PG_INT64_TYPE long long int /* PostgreSQL version as a string */ -#define PG_VERSION "11beta2" +#define PG_VERSION "12devel" /* PostgreSQL version as a number */ -#define PG_VERSION_NUM 110000 +#define PG_VERSION_NUM 120000 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "postgresql" diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in index bc89cd2a433..de2985c4d47 100644 --- a/src/interfaces/libpq/libpq.rc.in +++ b/src/interfaces/libpq/libpq.rc.in @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 11,0,0,0 - PRODUCTVERSION 11,0,0,0 + FILEVERSION 12,0,0,0 + PRODUCTVERSION 12,0,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,13 +15,13 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "PostgreSQL Access Library\0" - VALUE "FileVersion", "11.0\0" + VALUE "FileVersion", "12.0\0" VALUE "InternalName", "libpq\0" VALUE "LegalCopyright", "Copyright (C) 2018\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libpq.dll\0" VALUE "ProductName", "PostgreSQL\0" - VALUE "ProductVersion", "11.0\0" + VALUE "ProductVersion", "12.0\0" END END BLOCK "VarFileInfo" diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc index a62fde4b0cf..7f559bad030 100644 --- a/src/port/win32ver.rc +++ b/src/port/win32ver.rc @@ -2,8 +2,8 @@ #include "pg_config.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 11,0,0,0 - PRODUCTVERSION 11,0,0,0 + FILEVERSION 12,0,0,0 + PRODUCTVERSION 12,0,0,0 FILEFLAGSMASK 0x17L FILEFLAGS 0x0L FILEOS VOS_NT_WINDOWS32 diff --git a/src/tools/git_changelog b/src/tools/git_changelog index af9afcf1f0f..0a714e27b32 100755 --- a/src/tools/git_changelog +++ b/src/tools/git_changelog @@ -57,7 +57,7 @@ require IPC::Open2; # (We could get this from "git branches", but not worth the trouble.) # NB: master must be first! my @BRANCHES = qw(master - REL_10_STABLE REL9_6_STABLE REL9_5_STABLE + REL_11_STABLE REL_10_STABLE REL9_6_STABLE REL9_5_STABLE REL9_4_STABLE REL9_3_STABLE REL9_2_STABLE REL9_1_STABLE REL9_0_STABLE REL8_4_STABLE REL8_3_STABLE REL8_2_STABLE REL8_1_STABLE REL8_0_STABLE REL7_4_STABLE REL7_3_STABLE REL7_2_STABLE REL7_1_STABLE REL7_0_PATCHES diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl index 499e3deb3ae..41f5d764b78 100755 --- a/src/tools/version_stamp.pl +++ b/src/tools/version_stamp.pl @@ -24,7 +24,7 @@ use strict; # Major version is hard-wired into the script. We update it when we branch # a new development version. -my $majorversion = 11; +my $majorversion = 12; # Validate argument and compute derived variables my $minor = shift; |