From de4e04575f47b94d08324b536f4aeaf19bd80d3d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 6 May 2024 13:38:42 +0200 Subject: Drop libodb* submodules and related infrastructure --- .gitmodules | 8 -------- build/bootstrap.build | 3 +-- buildfile | 3 +-- libodb | 1 - libodb-sqlite | 1 - 5 files changed, 2 insertions(+), 14 deletions(-) delete mode 160000 libodb delete mode 160000 libodb-sqlite 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 index 0074faa..0000000 --- a/libodb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0074faad1b27f3cd52a606c438e4f1375956d731 diff --git a/libodb-sqlite b/libodb-sqlite deleted file mode 160000 index 73598ce..0000000 --- a/libodb-sqlite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 73598cebc38cb5875cb6245b794cfb1194c61cce -- cgit v1.1