aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-02-08 15:02:54 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-02-08 15:02:54 +0200
commit8397957451972d36434625f8853718655d656b1f (patch)
tree57d8fa5673b760cc78d54a29243b61c5186c5acb
parent813f60db0b7713a376f44c59f940d4ebc1c1dfdf (diff)
Update build script to update for install
This omits building tests.
-rw-r--r--build-mingw.bat4
-rw-r--r--build-msvc.bat4
-rwxr-xr-xbuild.sh4
3 files changed, 6 insertions, 6 deletions
diff --git a/build-mingw.bat b/build-mingw.bat
index 98f5597..e454abf 100644
--- a/build-mingw.bat
+++ b/build-mingw.bat
@@ -232,7 +232,7 @@ cmd /C bootstrap-mingw.bat %cxx% -static
build2\b-boot --version
@if errorlevel 1 goto error
-build2\b-boot %verbose% config.cxx=%cxx% config.bin.lib=static
+build2\b-boot %verbose% config.cxx=%cxx% config.bin.lib=static build2\exe{b}
@if errorlevel 1 goto error
move /y build2\b.exe build2\b-boot.exe
@@ -295,7 +295,7 @@ bpkg-stage %verbose% add %BUILD2_REPO%
bpkg-stage %verbose% fetch %timeout% %trust%
@if errorlevel 1 goto error
-bpkg-stage %verbose% build %timeout% --yes build2 bpkg
+bpkg-stage %verbose% build %timeout% --for install --yes build2 bpkg
@if errorlevel 1 goto error
bpkg-stage %verbose% install build2 bpkg
diff --git a/build-msvc.bat b/build-msvc.bat
index 9cc11a0..26488c1 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -198,7 +198,7 @@ cmd /C bootstrap-msvc.bat %cxx%
build2\b-boot --version
@if errorlevel 1 goto error
-build2\b-boot %verbose% config.cxx=%cxx% config.bin.lib=static
+build2\b-boot %verbose% config.cxx=%cxx% config.bin.lib=static build2\exe{b}
@if errorlevel 1 goto error
move /y build2\b.exe build2\b-boot.exe
@@ -259,7 +259,7 @@ bpkg-stage %verbose% add %BUILD2_REPO%
bpkg-stage %verbose% fetch %timeout% %trust%
@if errorlevel 1 goto error
-bpkg-stage %verbose% build %timeout% --yes build2 bpkg
+bpkg-stage %verbose% build %timeout% --for install --yes build2 bpkg
@if errorlevel 1 goto error
bpkg-stage %verbose% install build2 bpkg
diff --git a/build.sh b/build.sh
index 48ff666..b451c7a 100755
--- a/build.sh
+++ b/build.sh
@@ -244,7 +244,7 @@ run build2/b-boot --version
# Bootstrap, stage 2.
#
-run build2/b-boot $verbose config.cxx="$cxx" config.bin.lib=static
+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
@@ -285,7 +285,7 @@ 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 --yes build2 bpkg
+run bpkg-stage $verbose $bpkg_build_ops build --for install --yes build2 bpkg
run bpkg-stage $verbose install build2 bpkg
run which b