diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | README-GIT | 4 | ||||
| -rw-r--r-- | build/bootstrap.build | 3 | ||||
| -rw-r--r-- | buildfile | 3 | ||||
| m--------- | libpkgconf | 0 |
5 files changed, 9 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 7d5212c..da031f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ path = libodb-sqlite url = http://scm.codesynthesis.com/odb/libodb-sqlite.git update = none +[submodule "libpkgconf"] + path = libpkgconf + url = http://git.build2.org/packaging/pkgconf/libpkgconf.git @@ -24,8 +24,8 @@ A few additional notes: commits)' next to submodules (i.e., git "thinks" you have modified the member project by "setting back" its subproject commit). -2. The libsqlite3 and libodb* submodules are not updated by default (e.g., - with the above command). This is achieved with: +2. The libpkgconf, libsqlite3 and libodb* submodules are not updated by default + (e.g., with the above command). This is achieved with: git config --file .gitmodules submodule.libsqlite3.update none diff --git a/build/bootstrap.build b/build/bootstrap.build index 51063de..855ba67 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -3,7 +3,8 @@ # license : MIT; see accompanying LICENSE file project = build2-toolchain -subprojects = libbutl build2 libsqlite3 libodb libodb-sqlite libbpkg bpkg +subprojects = libpkgconf libbutl build2 \ +libsqlite3 libodb libodb-sqlite libbpkg bpkg using version using config @@ -5,7 +5,8 @@ # Note that the project directories order is important (prerequisites goes # first). # -d = libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ doc/ +d = libpkgconf/ libbutl/ build2/ \ +libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ doc/ i = \ INSTALL \ diff --git a/libpkgconf b/libpkgconf new file mode 160000 +Subproject a8e4f1dbbd4d2f293fe8b3d507e5feab6e20a68 |