4 files changed, 14 insertions, 10 deletions
diff --git a/etc/bootstrap/bbot-bootstrap-mingw.bat b/etc/bootstrap/bbot-bootstrap-mingw.bat
index 1280c1c..9db41c8 100644
--- a/etc/bootstrap/bbot-bootstrap-mingw.bat
+++ b/etc/bootstrap/bbot-bootstrap-mingw.bat
@@ -14,6 +14,7 @@ set "ENVIRONMENTS=C:\environments"
 set "TFTP=196.254.111.222"
 rem set "TFTP=10.1.0.1:55123"
 set "VERBOSE=3"
+set "TIMEOUT=600"
 
 rem If we already have the bbot worker, assume we are bootstrapped.
 rem
@@ -132,7 +133,7 @@ cd %bstrap%
 
 @rem Note: executing in a separate cmd.exe to preserve the echo mode.
 @rem
-cmd /C build-mingw.bat g++ %INSTALL% %trust%
+cmd /C build-mingw.bat --timeout %TIMEOUT% g++ %INSTALL% %trust%
 @if errorlevel 1 goto error
 
 cd ..
@@ -146,7 +147,7 @@ rmdir /S /Q %bstrap%
 @for /D %%d in (build2-toolchain-*) do set "config=%%d"
 cd %config%
 
-bpkg build --yes bbot
+bpkg --fetch-timeout %TIMEOUT% build --yes bbot
 @if errorlevel 1 goto error
 
 bpkg install bbot
diff --git a/etc/bootstrap/bbot-bootstrap-msvc-14.bat b/etc/bootstrap/bbot-bootstrap-msvc-14.bat
index 376fe69..4e317da 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc-14.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc-14.bat
@@ -19,6 +19,7 @@ set "ENVIRONMENTS=C:\environments"
 set "TFTP=196.254.111.222"
 rem set "TFTP=10.1.0.1:55123"
 set "VERBOSE=3"
+set "TIMEOUT=600"
 
 rem If we already have the bbot worker, assume we are bootstrapped.
 rem
@@ -119,7 +120,7 @@ cd %bstrap%
 
 @rem Note: executing in a separate cmd.exe to preserve the echo mode.
 @rem
-cmd /C build-msvc.bat %INSTALL% %trust%
+cmd /C build-msvc.bat --timeout %TIMEOUT% %INSTALL% %trust%
 @if errorlevel 1 goto error
 
 cd ..
@@ -139,7 +140,7 @@ rmdir /S /Q %bstrap%
 @for /D %%d in (build2-toolchain-*) do set "config=%%d"
 cd %config%
 
-bpkg build --yes bbot
+bpkg --fetch-timeout %TIMEOUT% build --yes bbot
 @if errorlevel 1 goto error
 
 bpkg install bbot
diff --git a/etc/bootstrap/bbot-bootstrap-msvc-15.bat b/etc/bootstrap/bbot-bootstrap-msvc-15.bat
index 87d36b5..f1005ad 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc-15.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc-15.bat
@@ -17,6 +17,7 @@ set "ENVIRONMENTS=C:\environments"
 set "TFTP=196.254.111.222"
 rem set "TFTP=10.1.0.1:55123"
 set "VERBOSE=3"
+set "TIMEOUT=600"
 
 rem If we already have the bbot worker, assume we are bootstrapped.
 rem
@@ -117,7 +118,7 @@ cd %bstrap%
 
 @rem Note: executing in a separate cmd.exe to preserve the echo mode.
 @rem
-cmd /C build-msvc.bat %INSTALL% %trust%
+cmd /C build-msvc.bat --timeout %TIMEOUT% %INSTALL% %trust%
 @if errorlevel 1 goto error
 
 cd ..
@@ -137,7 +138,7 @@ rmdir /S /Q %bstrap%
 @for /D %%d in (build2-toolchain-*) do set "config=%%d"
 cd %config%
 
-bpkg build --yes bbot
+bpkg --fetch-timeout %TIMEOUT% build --yes bbot
 @if errorlevel 1 goto error
 
 bpkg install bbot
diff --git a/etc/bootstrap/bbot-bootstrap.sh b/etc/bootstrap/bbot-bootstrap.sh
index ec046ca..e5ffe80 100755
--- a/etc/bootstrap/bbot-bootstrap.sh
+++ b/etc/bootstrap/bbot-bootstrap.sh
@@ -71,14 +71,15 @@ while test $# -ne 0; do
   esac
 done
 
-# Defaults that can be changed for testing.
+# Defaults that can be changed for testing or further customization.
 #
-# Note: build_options is an array-like (expanded unquoted).
+# Note: build_options is array-like (expanded unquoted).
 #
 tftp="196.254.111.222"
 install="/usr/local"
 build_options=
 verbose=3
+timeout=600
 
 #install="/tmp/bbot-install"
 #tftp="127.0.0.1:55123"
@@ -120,7 +121,7 @@ run rm trust
 #
 bstrap="$(echo build2-toolchain-*)"
 run cd "$bstrap"
-run ./build.sh --trust "$trust" $build_options "$cxx"
+run ./build.sh --timeout "$timeout" --trust "$trust" $build_options "$cxx"
 run cd ..
 run rm -r "$bstrap"
 
@@ -128,7 +129,7 @@ run rm -r "$bstrap"
 #
 config="$(echo build2-toolchain-*)"
 run cd "$config"
-run bpkg build --yes bbot
+run bpkg --fetch-timeout "$timeout" build --yes bbot
 run bpkg install bbot
 run cd ..
 run rm -r "$config"