From 654f4a62f6760135ceae7110908faa9de0a37470 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 6 May 2024 13:41:55 +0200 Subject: Drop sqlite submodule and related infrastructure --- .gitmodules | 4 ---- build/bootstrap.build | 2 +- buildfile | 2 +- libsqlite3 | 1 - submodules/sqlite | 1 - 5 files changed, 2 insertions(+), 8 deletions(-) delete mode 120000 libsqlite3 delete mode 160000 submodules/sqlite diff --git a/.gitmodules b/.gitmodules index 04e71bb..86337fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,10 +16,6 @@ [submodule "doc/style"] path = doc/style url = ../style.git -[submodule "submodules/sqlite"] - path = submodules/sqlite - url = https://git.build2.org/packaging/sqlite/sqlite.git - update = none [submodule "submodules/libbuild2-kconfig"] path = submodules/libbuild2-kconfig url = https://github.com/build2/libbuild2-kconfig.git diff --git a/build/bootstrap.build b/build/bootstrap.build index cc51f83..0a20cb1 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -8,7 +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/ libbpkg/ bpkg/ bdep/ +subprojects += libbutl/ build2/ libbpkg/ bpkg/ bdep/ subprojects += libbuild2-*/ subprojects += tests/*/ diff --git a/buildfile b/buildfile index 83748ed..6ff7784 100644 --- a/buildfile +++ b/buildfile @@ -21,7 +21,7 @@ build2_repo="https://stage.build2.org/1" # # NOTE: see also subprojects in bootstrap.build if changing anything here. # -d = libbutl/ build2/ libsqlite3/ libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/ +d = libbutl/ build2/ libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/ if ($build.meta_operation == 'dist') d += tests/*/ diff --git a/libsqlite3 b/libsqlite3 deleted file mode 120000 index 3ab815d..0000000 --- a/libsqlite3 +++ /dev/null @@ -1 +0,0 @@ -submodules/sqlite/libsqlite3 \ No newline at end of file diff --git a/submodules/sqlite b/submodules/sqlite deleted file mode 160000 index 5b013b5..0000000 --- a/submodules/sqlite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5b013b5507eb14bf51e565ec844d1fc462302f65 -- cgit v1.1