aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2024-05-06 13:38:42 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2024-05-06 13:38:42 +0200
commitde4e04575f47b94d08324b536f4aeaf19bd80d3d (patch)
treefcf325d9accbd9b6519cc3e880b8b1565cbfd726
parenteaa166efe644c74f86add43474559ef018f63f49 (diff)
Drop libodb* submodules and related infrastructure
-rw-r--r--.gitmodules8
-rw-r--r--build/bootstrap.build3
-rw-r--r--buildfile3
m---------libodb0
m---------libodb-sqlite0
5 files changed, 2 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules
index 7f7ef04..04e71bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,14 +16,6 @@
[submodule "doc/style"]
path = doc/style
url = ../style.git
-[submodule "libodb"]
- path = libodb
- url = https://scm.codesynthesis.com/odb/libodb.git
- update = none
-[submodule "libodb-sqlite"]
- path = libodb-sqlite
- url = https://scm.codesynthesis.com/odb/libodb-sqlite.git
- update = none
[submodule "submodules/sqlite"]
path = submodules/sqlite
url = https://git.build2.org/packaging/sqlite/sqlite.git
diff --git a/build/bootstrap.build b/build/bootstrap.build
index e965af7..cc51f83 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -8,8 +8,7 @@ amalgamation = # Disable amalgamation.
# Note: list them (mostly) explicitly without using wildcards to handle stray
# subdirectories in the root (debian/, installation location, etc).
#
-subprojects += libbutl/ build2/ libsqlite3/ libodb/ \
- libodb-sqlite/ libbpkg/ bpkg/ bdep/
+subprojects += libbutl/ build2/ libsqlite3/ libbpkg/ bpkg/ bdep/
subprojects += libbuild2-*/
subprojects += tests/*/
diff --git a/buildfile b/buildfile
index 4343280..83748ed 100644
--- a/buildfile
+++ b/buildfile
@@ -21,8 +21,7 @@ build2_repo="https://stage.build2.org/1"
#
# NOTE: see also subprojects in bootstrap.build if changing anything here.
#
-d = libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \
-libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/
+d = libbutl/ build2/ libsqlite3/ libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/
if ($build.meta_operation == 'dist')
d += tests/*/
diff --git a/libodb b/libodb
deleted file mode 160000
-Subproject 0074faad1b27f3cd52a606c438e4f1375956d73
diff --git a/libodb-sqlite b/libodb-sqlite
deleted file mode 160000
-Subproject 73598cebc38cb5875cb6245b794cfb1194c61cc