diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | bdep | 0 | ||||
| -rw-r--r-- | build-mingw.bat | 20 | ||||
| -rw-r--r-- | build-msvc.bat | 20 | ||||
| -rwxr-xr-x | build.sh | 18 | ||||
| -rw-r--r-- | build/bootstrap.build | 2 | ||||
| -rw-r--r-- | buildfile | 4 |
7 files changed, 42 insertions, 25 deletions
diff --git a/.gitmodules b/.gitmodules index 8104695..5aeb1a3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,9 @@ [submodule "bpkg"] path = bpkg url = ../bpkg.git +[submodule "bdep"] + path = bdep + url = ../bdep.git [submodule "doc/style"] path = doc/style url = ../etc/style.git diff --git a/bdep b/bdep new file mode 160000 +Subproject 8537e2275ac875affe8411cfacbb0fa98259cba diff --git a/build-mingw.bat b/build-mingw.bat index e454abf..ff9d3de 100644 --- a/build-mingw.bat +++ b/build-mingw.bat @@ -47,7 +47,7 @@ rem set "BUILD2_REPO=https://pkg.cppget.org/1/queue" rem set "BUILD2_REPO=https://pkg.cppget.org/1/alpha" ) -rem Bpkg configuration directory. +rem The bpkg configuration directory. rem set "cver=0.7-a.0" set "cdir=build2-toolchain-%cver%" @@ -241,7 +241,7 @@ move /y build2\b.exe build2\b-boot.exe build2\b-boot --version @if errorlevel 1 goto error -@rem Build and stage the toolchain. +@rem Build and stage the build system and the package manager. @rem cd .. @@ -252,7 +252,7 @@ build2\build2\b-boot %verbose% configure^ config.install.data_root=root\stage @if errorlevel 1 goto error -build2\build2\b-boot %verbose% install +build2\build2\b-boot %verbose% install: build2\ bpkg\ @if errorlevel 1 goto error @rem The where command is not available on XP without the resource kit. @@ -269,7 +269,7 @@ b-stage --version bpkg-stage --version @if errorlevel 1 goto error -@rem Rebuild via package manager. +@rem Build the entire toolchain from packages. @rem cd .. @@ -295,10 +295,10 @@ bpkg-stage %verbose% add %BUILD2_REPO% bpkg-stage %verbose% fetch %timeout% %trust% @if errorlevel 1 goto error -bpkg-stage %verbose% build %timeout% --for install --yes build2 bpkg +bpkg-stage %verbose% build %timeout% --for install --yes build2 bpkg bdep @if errorlevel 1 goto error -bpkg-stage %verbose% install build2 bpkg +bpkg-stage %verbose% install build2 bpkg bdep @if errorlevel 1 goto error where b @@ -307,16 +307,22 @@ where b where bpkg @rem @if errorlevel 1 goto error +where bdep +@rem @if errorlevel 1 goto error + b --version @if errorlevel 1 goto error bpkg --version @if errorlevel 1 goto error +bdep --version +@if errorlevel 1 goto error + @rem Clean up stage. @rem cd %owd% -b %verbose% uninstall +b %verbose% uninstall: build2\ bpkg\ @if errorlevel 1 goto error @echo off diff --git a/build-msvc.bat b/build-msvc.bat index 26488c1..48e55d8 100644 --- a/build-msvc.bat +++ b/build-msvc.bat @@ -40,7 +40,7 @@ rem set "BUILD2_REPO=https://pkg.cppget.org/1/queue" rem set "BUILD2_REPO=https://pkg.cppget.org/1/alpha" ) -rem Bpkg configuration directory. +rem The bpkg configuration directory. rem set "cver=0.7-a.0" set "cdir=build2-toolchain-%cver%" @@ -207,7 +207,7 @@ move /y build2\b.exe build2\b-boot.exe build2\b-boot --version @if errorlevel 1 goto error -@rem Build and stage the toolchain. +@rem Build and stage the build system and the package manager. @rem cd .. @@ -218,7 +218,7 @@ build2\build2\b-boot %verbose% configure^ config.install.data_root=root\stage @if errorlevel 1 goto error -build2\build2\b-boot %verbose% install +build2\build2\b-boot %verbose% install: build2\ bpkg\ @if errorlevel 1 goto error where b-stage @@ -233,7 +233,7 @@ b-stage --version bpkg-stage --version @if errorlevel 1 goto error -@rem Rebuild via package manager. +@rem Build the entire toolchain from packages. @rem cd .. @@ -259,10 +259,10 @@ bpkg-stage %verbose% add %BUILD2_REPO% bpkg-stage %verbose% fetch %timeout% %trust% @if errorlevel 1 goto error -bpkg-stage %verbose% build %timeout% --for install --yes build2 bpkg +bpkg-stage %verbose% build %timeout% --for install --yes build2 bpkg bdep @if errorlevel 1 goto error -bpkg-stage %verbose% install build2 bpkg +bpkg-stage %verbose% install build2 bpkg bdep @if errorlevel 1 goto error where b @@ -271,16 +271,22 @@ where b where bpkg @if errorlevel 1 goto error +where bdep +@if errorlevel 1 goto error + b --version @if errorlevel 1 goto error bpkg --version @if errorlevel 1 goto error +bdep --version +@if errorlevel 1 goto error + @rem Clean up stage. @rem cd %owd% -b %verbose% uninstall +b %verbose% uninstall: build2/ bpkg/ @if errorlevel 1 goto error @echo off @@ -14,7 +14,7 @@ if test -z "$BUILD2_REPO"; then # BUILD2_REPO="https://pkg.cppget.org/1/alpha" fi -# Bpkg configuration directory. +# The bpkg configuration directory. # cver="0.7-a.0" cdir="build2-toolchain-$cver" @@ -248,7 +248,7 @@ run build2/b-boot $verbose config.cxx="$cxx" config.bin.lib=static build2/exe{b} mv build2/b build2/b-boot run build2/b-boot --version -# Stage. +# Build and stage the build system and the package manager. # run cd .. @@ -260,7 +260,7 @@ config.install.root="$idir" \ config.install.data_root=root/stage \ config.install.sudo="$conf_sudo" -run build2/build2/b-boot $verbose install +run build2/build2/b-boot $verbose install: build2/ bpkg/ run which b-stage run which bpkg-stage @@ -268,7 +268,7 @@ run which bpkg-stage run b-stage --version run bpkg-stage --version -# Install. +# Build the entire toolchain from packages. # run cd .. run mkdir "$cdir" @@ -285,19 +285,21 @@ config.install.sudo="$conf_sudo" run bpkg-stage $verbose add "$BUILD2_REPO" run bpkg-stage $verbose $bpkg_fetch_ops fetch -run bpkg-stage $verbose $bpkg_build_ops build --for install --yes build2 bpkg -run bpkg-stage $verbose install build2 bpkg +run bpkg-stage $verbose $bpkg_build_ops build --for install --yes build2 bpkg bdep +run bpkg-stage $verbose install build2 bpkg bdep run which b run which bpkg +run which bdep run b --version run bpkg --version +run bdep --version -# Clean up. +# Clean up stage. # run cd "$owd" -run b $verbose uninstall +run b $verbose uninstall: build2/ bpkg/ diag diag "Toolchain installation: $idir/bin" diff --git a/build/bootstrap.build b/build/bootstrap.build index 855ba67..2e23ac5 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -4,7 +4,7 @@ project = build2-toolchain subprojects = libpkgconf libbutl build2 \ -libsqlite3 libodb libodb-sqlite libbpkg bpkg +libsqlite3 libodb libodb-sqlite libbpkg bpkg bdep using version using config @@ -2,11 +2,11 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -# Note that the project directories order is important (prerequisites goes +# Note that the project directories order is important (prerequisites go # first). # d = libpkgconf/ libbutl/ build2/ \ -libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ doc/ +libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ bdep/ doc/ i = \ INSTALL \ |