aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2024-05-06 12:45:55 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2024-05-06 12:45:55 +0200
commitbb348181ecba31a35423a25d8e7058f43e8ced66 (patch)
tree01c6e14ca3fdd0cf99845b5c951b360c145796ff
parent987793088141ebffef885be349e260672bbc40c3 (diff)
Switch from libodb* to version from libbutl
-rw-r--r--bdep/buildfile3
-rw-r--r--bdep/version.hxx.in8
-rw-r--r--manifest2
-rw-r--r--repositories.manifest8
4 files changed, 1 insertions, 20 deletions
diff --git a/bdep/buildfile b/bdep/buildfile
index a71a85f..af911a0 100644
--- a/bdep/buildfile
+++ b/bdep/buildfile
@@ -10,8 +10,7 @@ xml{*}: extension = xml
import libs = libbpkg%lib{bpkg}
import libs += libbutl%lib{butl}
-import libs += libodb%lib{odb}
-import libs += libodb-sqlite%lib{odb-sqlite}
+import libs += libbutl%lib{butl-odb}
# @@ Why don't we generate these with wildcard patterns (and rules below with
# a for-loop)?
diff --git a/bdep/version.hxx.in b/bdep/version.hxx.in
index 7a0a666..cdf03db 100644
--- a/bdep/version.hxx.in
+++ b/bdep/version.hxx.in
@@ -43,14 +43,6 @@ $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$
$libbpkg.check(LIBBPKG_VERSION, LIBBPKG_SNAPSHOT)$
-#include <odb/version.hxx>
-
-$libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$
-
-#include <odb/sqlite/version.hxx>
-
-$libodb_sqlite.check(LIBODB_SQLITE_VERSION, LIBODB_SQLITE_SNAPSHOT)$
-
// User agent.
//
#if defined(_WIN32)
diff --git a/manifest b/manifest
index 523807e..7d2cc7c 100644
--- a/manifest
+++ b/manifest
@@ -18,7 +18,5 @@ depends: * build2 >= 0.16.0-
depends: * bpkg >= 0.16.0-
# @@ DEP Should probably become conditional dependency.
#requires: ? cli ; Only required if changing .cli files.
-depends: libodb [2.5.0-b.26.1 2.5.0-b.27)
-depends: libodb-sqlite [2.5.0-b.26.1 2.5.0-b.27)
depends: libbutl [0.17.0-a.0.1 0.17.0-a.1)
depends: libbpkg [0.17.0-a.0.1 0.17.0-a.1)
diff --git a/repositories.manifest b/repositories.manifest
index e3fa365..a216e33 100644
--- a/repositories.manifest
+++ b/repositories.manifest
@@ -8,11 +8,3 @@ location: ../libbutl.git##HEAD
:
role: prerequisite
location: ../libbpkg.git##HEAD
-
-:
-role: prerequisite
-location: https://git.codesynthesis.com/odb/libodb.git##HEAD
-
-:
-role: prerequisite
-location: https://git.codesynthesis.com/odb/libodb-sqlite.git##HEAD