aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-22 12:31:23 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-22 12:31:23 +0200
commit1fc77270c6af777adb80e1df917da7dc36c75d14 (patch)
tree538e7b4498fa3c1c77beb4714d3f0690dab0650f /etc
parent04318680fb6c36aca0ec8029d94dab0e960ac69a (diff)
Various tweaks
Diffstat (limited to 'etc')
-rwxr-xr-xetc/bootstrap/bbot-bootstrap-macos.sh9
-rw-r--r--etc/bootstrap/bbot-bootstrap-msvc.bat2
-rwxr-xr-xetc/bootstrap/bbot-bootstrap.sh10
3 files changed, 19 insertions, 2 deletions
diff --git a/etc/bootstrap/bbot-bootstrap-macos.sh b/etc/bootstrap/bbot-bootstrap-macos.sh
new file mode 100755
index 0000000..e0a8ac7
--- /dev/null
+++ b/etc/bootstrap/bbot-bootstrap-macos.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# open -a Terminal -n -F ~/bbot-bootstrap-macos.sh
+
+if ~/bbot-bootstrap.sh --cxx clang++ --build /tmp \
+ --environment "$HOME/environment"; then
+ sleep 2
+ sudo shutdown -h now
+fi
diff --git a/etc/bootstrap/bbot-bootstrap-msvc.bat b/etc/bootstrap/bbot-bootstrap-msvc.bat
index de8b297..4b60f5d 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc.bat
@@ -66,7 +66,7 @@ cd %BUILD%\bootstrap
@rem forever.
@rem
:restart
-curl -s -S -O --connect-timeout 5 --max-time 30^
+curl -s -S -O --connect-timeout 5 --max-time 60^
"tftp://%tftp%/build2-baseutils-x86_64-windows.zip"
@if errorlevel 1 goto restart
diff --git a/etc/bootstrap/bbot-bootstrap.sh b/etc/bootstrap/bbot-bootstrap.sh
index 65deddc..9473abe 100755
--- a/etc/bootstrap/bbot-bootstrap.sh
+++ b/etc/bootstrap/bbot-bootstrap.sh
@@ -100,7 +100,15 @@ run rm -rf "$build/bootstrap"
run mkdir -p "$build/bootstrap"
run cd "$build/bootstrap"
-run curl -s -S -O "tftp://$tftp/build2-toolchain.tar.xz"
+# We could be running on a new network which may take some time to setup.
+# And if we start before that happens, we will be hanging forever.
+#
+while true; do
+ diag "+ curl -s -S -O --connect-timeout 5 --max-time 60 tftp://$tftp/build2-toolchain.tar.xz"
+ if curl -s -S -O --connect-timeout 5 --max-time 60 "tftp://$tftp/build2-toolchain.tar.xz"; then
+ break
+ fi
+done
run tar -xf build2-toolchain.tar.xz
run rm build2-toolchain.tar.xz