aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest8
-rw-r--r--odb/pgsql/details/options.cli7
-rw-r--r--odb/pgsql/version-build2.hxx.in29
-rw-r--r--odb/pgsql/version.hxx6
-rw-r--r--version2
5 files changed, 26 insertions, 26 deletions
diff --git a/manifest b/manifest
index 313d356..361b8cf 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
: 1
name: libodb-pgsql
-version: 2.5.0-b.14.z
+version: 2.5.0-b.16.z
project: odb
summary: PostgreSQL ODB runtime library
license: GPLv2
@@ -15,7 +15,7 @@ email: odb-users@codesynthesis.com
build-email: odb-builds@codesynthesis.com
builds: all
requires: c++11
-depends: * build2 >= 0.10.0
-depends: * bpkg >= 0.10.0
+depends: * build2 >= 0.11.0
+depends: * bpkg >= 0.11.0
depends: libpq ^9.0.0
-depends: libodb [2.5.0-b.14.1 2.5.0-b.15)
+depends: libodb [2.5.0-b.16.1 2.5.0-b.17)
diff --git a/odb/pgsql/details/options.cli b/odb/pgsql/details/options.cli
index 8f774c9..886a869 100644
--- a/odb/pgsql/details/options.cli
+++ b/odb/pgsql/details/options.cli
@@ -46,9 +46,10 @@ namespace odb
std::string --options-file
{
"<file>",
- "Read additional options from <file>. Each option appearing on a
- separate line optionally followed by space and an option value.
- Empty lines and lines starting with \cb{#} are ignored."
+ "Read additional options from <file>. Each option should appear on a
+ separate line optionally followed by space or equal sign (\cb{=})
+ and an option value. Empty lines and lines starting with \cb{#} are
+ ignored."
};
};
}
diff --git a/odb/pgsql/version-build2.hxx.in b/odb/pgsql/version-build2.hxx.in
index 41de09a..d33d1d5 100644
--- a/odb/pgsql/version-build2.hxx.in
+++ b/odb/pgsql/version-build2.hxx.in
@@ -4,25 +4,24 @@
#ifndef LIBODB_PGSQL_VERSION // Note: using the version macro itself.
-// Note: using build2 standard versioning scheme. The numeric version format
-// is AAABBBCCCDDDE where:
+// The numeric version format is AAAAABBBBBCCCCCDDDE where:
//
-// AAA - major version number
-// BBB - minor version number
-// CCC - bugfix version number
-// DDD - alpha / beta (DDD + 500) version number
-// E - final (0) / snapshot (1)
+// AAAAA - major version number
+// BBBBB - minor version number
+// CCCCC - bugfix version number
+// DDD - alpha / beta (DDD + 500) version number
+// E - final (0) / snapshot (1)
//
-// When DDDE is not 0, 1 is subtracted from AAABBBCCC. For example:
+// When DDDE is not 0, 1 is subtracted from AAAAABBBBBCCCCC. For example:
//
-// Version AAABBBCCCDDDE
+// Version AAAAABBBBBCCCCCDDDE
//
-// 0.1.0 0000010000000
-// 0.1.2 0000010010000
-// 1.2.3 0010020030000
-// 2.2.0-a.1 0020019990010
-// 3.0.0-b.2 0029999995020
-// 2.2.0-a.1.z 0020019990011
+// 0.1.0 0000000001000000000
+// 0.1.2 0000000001000020000
+// 1.2.3 0000100002000030000
+// 2.2.0-a.1 0000200001999990010
+// 3.0.0-b.2 0000299999999995020
+// 2.2.0-a.1.z 0000200001999990011
//
#define LIBODB_PGSQL_VERSION $libodb_pgsql.version.project_number$ULL
#define LIBODB_PGSQL_VERSION_STR "$libodb_pgsql.version.project$"
diff --git a/odb/pgsql/version.hxx b/odb/pgsql/version.hxx
index 3fdbc8b..78b9f79 100644
--- a/odb/pgsql/version.hxx
+++ b/odb/pgsql/version.hxx
@@ -33,15 +33,15 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20464
+#if ODB_VERSION != 20466
# error incompatible odb interface version detected
#endif
// libodb-pgsql version: odb interface version plus the bugfix
// version.
//
-#define LIBODB_PGSQL_VERSION 2049964
-#define LIBODB_PGSQL_VERSION_STR "2.5.0-b.14"
+#define LIBODB_PGSQL_VERSION 2049966
+#define LIBODB_PGSQL_VERSION_STR "2.5.0-b.16"
#include <odb/post.hxx>
diff --git a/version b/version
index 17ef4f0..dfe1a80 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.14
+2.5.0-b.16