From 7882d3f3ee9d2605e53e755b19351c7097e3fb7c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 2 May 2017 09:14:58 +0200
Subject: Add VC14 bootstrap/environment batch files

---
 etc/bootstrap/bbot-bootstrap-msvc-14.bat | 169 +++++++++++++++++++++++++++++++
 etc/bootstrap/bbot-bootstrap-msvc-15.bat | 167 ++++++++++++++++++++++++++++++
 etc/bootstrap/bbot-bootstrap-msvc.bat    | 167 ------------------------------
 3 files changed, 336 insertions(+), 167 deletions(-)
 create mode 100644 etc/bootstrap/bbot-bootstrap-msvc-14.bat
 create mode 100644 etc/bootstrap/bbot-bootstrap-msvc-15.bat
 delete mode 100644 etc/bootstrap/bbot-bootstrap-msvc.bat

(limited to 'etc/bootstrap')

diff --git a/etc/bootstrap/bbot-bootstrap-msvc-14.bat b/etc/bootstrap/bbot-bootstrap-msvc-14.bat
new file mode 100644
index 0000000..d52831e
--- /dev/null
+++ b/etc/bootstrap/bbot-bootstrap-msvc-14.bat
@@ -0,0 +1,169 @@
+@echo off
+
+rem file      : etc/bootstrap/bbot-bootstrap-msvc-14.bat
+rem copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+rem license   : TBC; see accompanying LICENSE file
+
+setlocal EnableExtensions EnableDelayedExpansion
+
+set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio 14.0"
+set "VCVARS=%MSVC%\VC\vcvarsall.bat"
+set "VCARCH=amd64"
+rem set "VCARCH=amd64_x86"
+
+set "BUILD=C:\tmp"
+set "INSTALL=C:\build2"
+set "BOOTSTRAP=C:\bootstrap"
+set "ENVIRONMENTS=C:\environments"
+
+set "TFTP=196.254.111.222"
+rem set "TFTP=10.1.0.1:55123"
+set "VERBOSE=3"
+
+rem If we already have the bbot worker, assume we are bootstrapped.
+rem
+if exist %INSTALL%\bin\bbot-worker.exe (
+  set "PATH=%INSTALL%\bin;%PATH%"
+  bbot-worker.exe --startup --build %BUILD% --environments %ENVIRONMENTS%^
+ --tftp-host %TFTP% --verbose %VERBOSE%
+  goto end
+)
+
+rem Setup the compiler for the toolchain.
+rem
+call "%VCVARS%" %VCARCH%
+if errorlevel 1 goto error
+
+rem Use bootstrap tools.
+rem
+set "PATH=%BOOTSTRAP%\bin;%PATH%"
+
+rem Show the steps we are performing.
+rem
+@echo on
+
+@rem
+@rem Bootstrap the toolchain and then build bbot.
+@rem
+@if exist %BUILD%\bootstrap\ (
+  rmdir /S /Q %BUILD%\bootstrap
+  @if errorlevel 1 goto error
+)
+
+mkdir %BUILD%\bootstrap
+@if errorlevel 1 goto error
+
+@if exist %INSTALL% (
+  rmdir /S /Q %INSTALL%
+  @if errorlevel 1 goto error
+)
+
+cd %BUILD%\bootstrap
+
+@rem
+@rem Get the baseutils.
+@rem
+@rem We could be running on a new network which may take Windows some time
+@rem to digest. And if we start before that happens, we will be hanging
+@rem forever.
+@rem
+:restart
+curl -s -S -O --connect-timeout 5 --max-time 60^
+  "tftp://%tftp%/build2-baseutils-x86_64-windows.zip"
+@if errorlevel 1 goto restart
+
+unzip -q build2-baseutils-x86_64-windows.zip
+@if errorlevel 1 goto error
+
+del build2-baseutils-x86_64-windows.zip
+@if errorlevel 1 goto error
+
+move build2-baseutils-*-x86_64-windows %INSTALL%
+@if errorlevel 1 goto error
+
+
+@rem
+@rem Get the toolchain.
+@rem
+curl -s -S -O "tftp://%tftp%/build2-toolchain.tar.xz"
+@if errorlevel 1 goto error
+
+xz -d build2-toolchain.tar.xz
+@if errorlevel 1 goto error
+
+tar -xf build2-toolchain.tar
+@if errorlevel 1 goto error
+
+del build2-toolchain.tar
+@if errorlevel 1 goto error
+
+
+@rem
+@rem Get the repository certificate fingerprint.
+@rem
+curl -s -S -O "tftp://%tftp%/trust"
+@if errorlevel 1 goto error
+
+@set /P trust=<trust
+
+del trust
+@if errorlevel 1 goto error
+
+
+@rem
+@rem Bootstrap and install the toolchain.
+@rem
+@for /D %%d in (build2-toolchain-*) do set "bstrap=%%d"
+cd %bstrap%
+
+@rem Note: executing in a separate cmd.exe to preserve the echo mode.
+@rem
+cmd /C build-msvc.bat %INSTALL% %trust%
+@if errorlevel 1 goto error
+
+cd ..
+rmdir /S /Q %bstrap%
+@if errorlevel 1 goto error
+
+
+@rem
+@rem Switch to the bootstrapped utilities/toolchain.
+@rem
+@set "PATH=%INSTALL%\bin;%PATH%"
+
+
+@rem
+@rem Build and install the bbot worker.
+@rem
+@for /D %%d in (build2-toolchain-*) do set "config=%%d"
+cd %config%
+
+bpkg build --yes bbot
+@if errorlevel 1 goto error
+
+bpkg install bbot
+@if errorlevel 1 goto error
+
+cd ..
+rmdir /S /Q %config%
+@if errorlevel 1 goto error
+
+@rem
+@rem Finish off by uploading the result manifest produced by the bbot worker.
+@rem
+bbot-worker --bootstrap >manifest
+@if errorlevel 1 goto error
+
+curl -s -S --upload-file manifest "tftp://%tftp%/manifest"
+@if errorlevel 1 goto error
+
+@echo off
+goto end
+
+:error
+@echo off
+endlocal
+exit /b 1
+
+:end
+endlocal
diff --git a/etc/bootstrap/bbot-bootstrap-msvc-15.bat b/etc/bootstrap/bbot-bootstrap-msvc-15.bat
new file mode 100644
index 0000000..4818d09
--- /dev/null
+++ b/etc/bootstrap/bbot-bootstrap-msvc-15.bat
@@ -0,0 +1,167 @@
+@echo off
+
+rem file      : etc/bootstrap/bbot-bootstrap-msvc-15.bat
+rem copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+rem license   : TBC; see accompanying LICENSE file
+
+setlocal EnableExtensions EnableDelayedExpansion
+
+set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
+set "VCVARS=%MSVC%\VC\Auxiliary\Build\vcvars64.bat"
+
+set "BUILD=C:\tmp"
+set "INSTALL=C:\build2"
+set "BOOTSTRAP=C:\bootstrap"
+set "ENVIRONMENTS=C:\environments"
+
+set "TFTP=196.254.111.222"
+rem set "TFTP=10.1.0.1:55123"
+set "VERBOSE=3"
+
+rem If we already have the bbot worker, assume we are bootstrapped.
+rem
+if exist %INSTALL%\bin\bbot-worker.exe (
+  set "PATH=%INSTALL%\bin;%PATH%"
+  bbot-worker.exe --startup --build %BUILD% --environments %ENVIRONMENTS%^
+ --tftp-host %TFTP% --verbose %VERBOSE%
+  goto end
+)
+
+rem Setup the compiler for the toolchain.
+rem
+call "%VCVARS%"
+if errorlevel 1 goto error
+
+rem Use bootstrap tools.
+rem
+set "PATH=%BOOTSTRAP%\bin;%PATH%"
+
+rem Show the steps we are performing.
+rem
+@echo on
+
+@rem
+@rem Bootstrap the toolchain and then build bbot.
+@rem
+@if exist %BUILD%\bootstrap\ (
+  rmdir /S /Q %BUILD%\bootstrap
+  @if errorlevel 1 goto error
+)
+
+mkdir %BUILD%\bootstrap
+@if errorlevel 1 goto error
+
+@if exist %INSTALL% (
+  rmdir /S /Q %INSTALL%
+  @if errorlevel 1 goto error
+)
+
+cd %BUILD%\bootstrap
+
+@rem
+@rem Get the baseutils.
+@rem
+@rem We could be running on a new network which may take Windows some time
+@rem to digest. And if we start before that happens, we will be hanging
+@rem forever.
+@rem
+:restart
+curl -s -S -O --connect-timeout 5 --max-time 60^
+  "tftp://%tftp%/build2-baseutils-x86_64-windows.zip"
+@if errorlevel 1 goto restart
+
+unzip -q build2-baseutils-x86_64-windows.zip
+@if errorlevel 1 goto error
+
+del build2-baseutils-x86_64-windows.zip
+@if errorlevel 1 goto error
+
+move build2-baseutils-*-x86_64-windows %INSTALL%
+@if errorlevel 1 goto error
+
+
+@rem
+@rem Get the toolchain.
+@rem
+curl -s -S -O "tftp://%tftp%/build2-toolchain.tar.xz"
+@if errorlevel 1 goto error
+
+xz -d build2-toolchain.tar.xz
+@if errorlevel 1 goto error
+
+tar -xf build2-toolchain.tar
+@if errorlevel 1 goto error
+
+del build2-toolchain.tar
+@if errorlevel 1 goto error
+
+
+@rem
+@rem Get the repository certificate fingerprint.
+@rem
+curl -s -S -O "tftp://%tftp%/trust"
+@if errorlevel 1 goto error
+
+@set /P trust=<trust
+
+del trust
+@if errorlevel 1 goto error
+
+
+@rem
+@rem Bootstrap and install the toolchain.
+@rem
+@for /D %%d in (build2-toolchain-*) do set "bstrap=%%d"
+cd %bstrap%
+
+@rem Note: executing in a separate cmd.exe to preserve the echo mode.
+@rem
+cmd /C build-msvc.bat %INSTALL% %trust%
+@if errorlevel 1 goto error
+
+cd ..
+rmdir /S /Q %bstrap%
+@if errorlevel 1 goto error
+
+
+@rem
+@rem Switch to the bootstrapped utilities/toolchain.
+@rem
+@set "PATH=%INSTALL%\bin;%PATH%"
+
+
+@rem
+@rem Build and install the bbot worker.
+@rem
+@for /D %%d in (build2-toolchain-*) do set "config=%%d"
+cd %config%
+
+bpkg build --yes bbot
+@if errorlevel 1 goto error
+
+bpkg install bbot
+@if errorlevel 1 goto error
+
+cd ..
+rmdir /S /Q %config%
+@if errorlevel 1 goto error
+
+@rem
+@rem Finish off by uploading the result manifest produced by the bbot worker.
+@rem
+bbot-worker --bootstrap >manifest
+@if errorlevel 1 goto error
+
+curl -s -S --upload-file manifest "tftp://%tftp%/manifest"
+@if errorlevel 1 goto error
+
+@echo off
+goto end
+
+:error
+@echo off
+endlocal
+exit /b 1
+
+:end
+endlocal
diff --git a/etc/bootstrap/bbot-bootstrap-msvc.bat b/etc/bootstrap/bbot-bootstrap-msvc.bat
deleted file mode 100644
index 1cf5215..0000000
--- a/etc/bootstrap/bbot-bootstrap-msvc.bat
+++ /dev/null
@@ -1,167 +0,0 @@
-@echo off
-
-rem file      : etc/bootstrap/bbot-bootstrap-msvc.bat
-rem copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-rem license   : TBC; see accompanying LICENSE file
-
-setlocal EnableExtensions EnableDelayedExpansion
-
-set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
-set "VCVARS=%MSVC%\VC\Auxiliary\Build\vcvars64.bat"
-
-set "BUILD=C:\tmp"
-set "INSTALL=C:\build2"
-set "BOOTSTRAP=C:\bootstrap"
-set "ENVIRONMENTS=C:\environments"
-
-set "TFTP=196.254.111.222"
-rem set "TFTP=10.1.0.1:55123"
-set "VERBOSE=3"
-
-rem If we already have the bbot worker, assume we are bootstrapped.
-rem
-if exist %INSTALL%\bin\bbot-worker.exe (
-  set "PATH=%INSTALL%\bin;%PATH%"
-  bbot-worker.exe --startup --build %BUILD% --environments %ENVIRONMENTS%^
- --tftp-host %TFTP% --verbose %VERBOSE%
-  goto end
-)
-
-rem Setup the compiler for the toolchain.
-rem
-call "%VCVARS%"
-if errorlevel 1 goto error
-
-rem Use bootstrap tools.
-rem
-set "PATH=%BOOTSTRAP%\bin;%PATH%"
-
-rem Show the steps we are performing.
-rem
-@echo on
-
-@rem
-@rem Bootstrap the toolchain and then build bbot.
-@rem
-@if exist %BUILD%\bootstrap\ (
-  rmdir /S /Q %BUILD%\bootstrap
-  @if errorlevel 1 goto error
-)
-
-mkdir %BUILD%\bootstrap
-@if errorlevel 1 goto error
-
-@if exist %INSTALL% (
-  rmdir /S /Q %INSTALL%
-  @if errorlevel 1 goto error
-)
-
-cd %BUILD%\bootstrap
-
-@rem
-@rem Get the baseutils.
-@rem
-@rem We could be running on a new network which may take Windows some time
-@rem to digest. And if we start before that happens, we will be hanging
-@rem forever.
-@rem
-:restart
-curl -s -S -O --connect-timeout 5 --max-time 60^
-  "tftp://%tftp%/build2-baseutils-x86_64-windows.zip"
-@if errorlevel 1 goto restart
-
-unzip -q build2-baseutils-x86_64-windows.zip
-@if errorlevel 1 goto error
-
-del build2-baseutils-x86_64-windows.zip
-@if errorlevel 1 goto error
-
-move build2-baseutils-*-x86_64-windows %INSTALL%
-@if errorlevel 1 goto error
-
-
-@rem
-@rem Get the toolchain.
-@rem
-curl -s -S -O "tftp://%tftp%/build2-toolchain.tar.xz"
-@if errorlevel 1 goto error
-
-xz -d build2-toolchain.tar.xz
-@if errorlevel 1 goto error
-
-tar -xf build2-toolchain.tar
-@if errorlevel 1 goto error
-
-del build2-toolchain.tar
-@if errorlevel 1 goto error
-
-
-@rem
-@rem Get the repository certificate fingerprint.
-@rem
-curl -s -S -O "tftp://%tftp%/trust"
-@if errorlevel 1 goto error
-
-@set /P trust=<trust
-
-del trust
-@if errorlevel 1 goto error
-
-
-@rem
-@rem Bootstrap and install the toolchain.
-@rem
-@for /D %%d in (build2-toolchain-*) do set "bstrap=%%d"
-cd %bstrap%
-
-@rem Note: executing in a separate cmd.exe to preserve the echo mode.
-@rem
-cmd /C build-msvc.bat %INSTALL% %trust%
-@if errorlevel 1 goto error
-
-cd ..
-rmdir /S /Q %bstrap%
-@if errorlevel 1 goto error
-
-
-@rem
-@rem Switch to the bootstrapped utilities/toolchain.
-@rem
-@set "PATH=%INSTALL%\bin;%PATH%"
-
-
-@rem
-@rem Build and install the bbot worker.
-@rem
-@for /D %%d in (build2-toolchain-*) do set "config=%%d"
-cd %config%
-
-bpkg build --yes bbot
-@if errorlevel 1 goto error
-
-bpkg install bbot
-@if errorlevel 1 goto error
-
-cd ..
-rmdir /S /Q %config%
-@if errorlevel 1 goto error
-
-@rem
-@rem Finish off by uploading the result manifest produced by the bbot worker.
-@rem
-bbot-worker --bootstrap >manifest
-@if errorlevel 1 goto error
-
-curl -s -S --upload-file manifest "tftp://%tftp%/manifest"
-@if errorlevel 1 goto error
-
-@echo off
-goto end
-
-:error
-@echo off
-endlocal
-exit /b 1
-
-:end
-endlocal
-- 
cgit v1.1