diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | build/bootstrap.build | 2 | ||||
| -rw-r--r-- | buildfile | 15 | ||||
| l--------- | libbuild2-kconfig | 1 | ||||
| m--------- | submodules/libbuild2-kconfig | 0 | ||||
| -rw-r--r-- | tests/README | 2 | ||||
| l--------- | tests/libbuild2-kconfig-tests | 1 |
7 files changed, 17 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index fc587b0..8c319ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -32,3 +32,6 @@ path = submodules/pkgconf url = https://git.build2.org/packaging/pkgconf/pkgconf.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 2317224..7d4dccc 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -3,6 +3,8 @@ project = build2-toolchain amalgamation = # Disable amalgamation. +subprojects = {*/ -build/ -doc/ -tests/ -submodules/} +subprojects += tests/*/ using version using config @@ -9,9 +9,6 @@ build2_repo="https://stage.build2.org/1" # build2_repo="https://pkg.cppget.org/1/queue/alpha" # build2_repo="https://pkg.cppget.org/1/alpha" -d = libpkgconf/ libbutl/ build2/ \ -libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ bdep/ doc/ - i = \ INSTALL \ UPGRADE \ @@ -22,12 +19,16 @@ BOOTSTRAP-WINDOWS-MSVC \ BOOTSTRAP-WINDOWS-CLANG \ BOOTSTRAP-WINDOWS-MINGW -./: $d \ - doc{$i README} \ - legal{LICENSE AUTHORS} \ - cli{$i} \ +# Note: see also subprojects in bootstrap.build. +# +./: {*/ -build/ -tests/ -submodules/} \ + doc{$i README} \ + legal{LICENSE AUTHORS} \ + cli{$i} \ manifest +./: tests/*/ tests/doc{README} + # Obtain the build2, bpkg, bdep, and toolchain versions. # bp = $recall($build.path) diff --git a/libbuild2-kconfig b/libbuild2-kconfig new file mode 120000 index 0000000..b65cb37 --- /dev/null +++ b/libbuild2-kconfig @@ -0,0 +1 @@ +submodules/libbuild2-kconfig/libbuild2-kconfig
\ No newline at end of file diff --git a/submodules/libbuild2-kconfig b/submodules/libbuild2-kconfig new file mode 160000 +Subproject 7d048c3581252baecaa85e21c98458338669a6c diff --git a/tests/README b/tests/README new file mode 100644 index 0000000..6084038 --- /dev/null +++ b/tests/README @@ -0,0 +1,2 @@ +This subdirectory contains external tests for projects (such as build system +modules) found in the root directory. diff --git a/tests/libbuild2-kconfig-tests b/tests/libbuild2-kconfig-tests new file mode 120000 index 0000000..2b2f3a7 --- /dev/null +++ b/tests/libbuild2-kconfig-tests @@ -0,0 +1 @@ +../submodules/libbuild2-kconfig/libbuild2-kconfig-tests
\ No newline at end of file |