From df312bd38f8335e66dea39d7bccf25d20443d774 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 14 Jan 2025 10:14:57 +0200 Subject: Update submodules Specifically, updated to ODB 2.5.0. --- libbutl-odb/odb/sqlite/version.hxx | 18 +++++++++--------- libbutl-odb/odb/version.hxx | 18 +++++++++--------- libbutl-pkg-config/libpkg-config/version.h | 2 +- upstream/libpkg-config | 2 +- upstream/odb | 2 +- upstream/sqlite | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libbutl-odb/odb/sqlite/version.hxx b/libbutl-odb/odb/sqlite/version.hxx index 703cc5e..1d0e954 100644 --- a/libbutl-odb/odb/sqlite/version.hxx +++ b/libbutl-odb/odb/sqlite/version.hxx @@ -22,24 +22,24 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_SQLITE_VERSION_FULL 200004999995281ULL -#define LIBODB_SQLITE_VERSION_STR "2.5.0-b.28.20240731125623.c6da3d9c4e9f" -#define LIBODB_SQLITE_VERSION_ID "2.5.0-b.28.c6da3d9c4e9f" +#define LIBODB_SQLITE_VERSION_FULL 200005000000000ULL +#define LIBODB_SQLITE_VERSION_STR "2.5.0" +#define LIBODB_SQLITE_VERSION_ID "2.5.0" #define LIBODB_SQLITE_VERSION_MAJOR 2 #define LIBODB_SQLITE_VERSION_MINOR 5 #define LIBODB_SQLITE_VERSION_PATCH 0 -#define LIBODB_SQLITE_PRE_RELEASE true +#define LIBODB_SQLITE_PRE_RELEASE false -#define LIBODB_SQLITE_SNAPSHOT 20240731125623ULL -#define LIBODB_SQLITE_SNAPSHOT_ID "c6da3d9c4e9f" +#define LIBODB_SQLITE_SNAPSHOT 0ULL +#define LIBODB_SQLITE_SNAPSHOT_ID "" #include #ifdef LIBODB_VERSION_FULL -# if !(LIBODB_VERSION_FULL == 200004999995281ULL && LIBODB_SNAPSHOT == 20240731125623ULL) -# error incompatible libodb version, libodb == 2.5.0-b.28.20240731125623.c6da3d9c4e9f is required +# if !(LIBODB_VERSION_FULL == 200005000000000ULL) +# error incompatible libodb version, libodb == 2.5.0 is required # endif #endif @@ -60,6 +60,6 @@ // 2.2.0.a1 02019901 // 3.0.0.b2 02999952 // -#define LIBODB_SQLITE_VERSION 2049978 +#define LIBODB_SQLITE_VERSION 2050000 #endif // LIBODB_SQLITE_VERSION diff --git a/libbutl-odb/odb/version.hxx b/libbutl-odb/odb/version.hxx index 606b776..b708282 100644 --- a/libbutl-odb/odb/version.hxx +++ b/libbutl-odb/odb/version.hxx @@ -22,18 +22,18 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_VERSION_FULL 200004999995281ULL -#define LIBODB_VERSION_STR "2.5.0-b.28.20240731125623.c6da3d9c4e9f" -#define LIBODB_VERSION_ID "2.5.0-b.28.c6da3d9c4e9f" +#define LIBODB_VERSION_FULL 200005000000000ULL +#define LIBODB_VERSION_STR "2.5.0" +#define LIBODB_VERSION_ID "2.5.0" #define LIBODB_VERSION_MAJOR 2 #define LIBODB_VERSION_MINOR 5 #define LIBODB_VERSION_PATCH 0 -#define LIBODB_PRE_RELEASE true +#define LIBODB_PRE_RELEASE false -#define LIBODB_SNAPSHOT 20240731125623ULL -#define LIBODB_SNAPSHOT_ID "c6da3d9c4e9f" +#define LIBODB_SNAPSHOT 0ULL +#define LIBODB_SNAPSHOT_ID "" // Old/deprecated numeric version format is AABBCCDD where: @@ -55,11 +55,11 @@ // ODB interface version: minor, major, and alpha/beta versions. // -#define ODB_VERSION 20478 -#define ODB_VERSION_STR "2.5-b.28" +#define ODB_VERSION 20500 +#define ODB_VERSION_STR "2.5" // libodb version: interface version plus the bugfix version. // -#define LIBODB_VERSION 2049978 +#define LIBODB_VERSION 2050000 #endif // LIBODB_VERSION diff --git a/libbutl-pkg-config/libpkg-config/version.h b/libbutl-pkg-config/libpkg-config/version.h index 9eea7e7..854af05 100644 --- a/libbutl-pkg-config/libpkg-config/version.h +++ b/libbutl-pkg-config/libpkg-config/version.h @@ -23,7 +23,7 @@ #define LIBPKG_CONFIG_VERSION 1000020000ULL #define LIBPKG_CONFIG_VERSION_STR "0.1.2" #define LIBPKG_CONFIG_VERSION_ID "0.1.2" -#define LIBPKG_CONFIG_VERSION_FULL "0.1.2" +#define LIBPKG_CONFIG_VERSION_FULL "0.1.2+1" #define LIBPKG_CONFIG_VERSION_MAJOR 0 #define LIBPKG_CONFIG_VERSION_MINOR 1 diff --git a/upstream/libpkg-config b/upstream/libpkg-config index b5ad123..5f1053a 160000 --- a/upstream/libpkg-config +++ b/upstream/libpkg-config @@ -1 +1 @@ -Subproject commit b5ad12318b1474459b3c2550cecf6f4fb36271ee +Subproject commit 5f1053a4c03c250b891d40bfd680272f8ce14382 diff --git a/upstream/odb b/upstream/odb index c6da3d9..197e5bf 160000 --- a/upstream/odb +++ b/upstream/odb @@ -1 +1 @@ -Subproject commit c6da3d9c4e9f4263c754721d77f03f6a78309f54 +Subproject commit 197e5bfb323864dcefa38878fd3de8322a577194 diff --git a/upstream/sqlite b/upstream/sqlite index 02f282c..9770401 160000 --- a/upstream/sqlite +++ b/upstream/sqlite @@ -1 +1 @@ -Subproject commit 02f282c042431b429c19943dbbf532bcb0871763 +Subproject commit 9770401575801a4c1d7df373e6679de0904e14ff -- cgit v1.1