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/environments/default-msvc-14.bat | 54 ++++++++++++++++++++++++++++++++++
 etc/environments/default-msvc-15.bat | 56 ++++++++++++++++++++++++++++++++++++
 etc/environments/default-msvc.bat    | 56 ------------------------------------
 3 files changed, 110 insertions(+), 56 deletions(-)
 create mode 100644 etc/environments/default-msvc-14.bat
 create mode 100644 etc/environments/default-msvc-15.bat
 delete mode 100644 etc/environments/default-msvc.bat

(limited to 'etc/environments')

diff --git a/etc/environments/default-msvc-14.bat b/etc/environments/default-msvc-14.bat
new file mode 100644
index 0000000..2af8136
--- /dev/null
+++ b/etc/environments/default-msvc-14.bat
@@ -0,0 +1,54 @@
+@echo off
+
+rem file      : etc/environments/default-msvc-14.bat
+rem copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+rem license   : TBC; see accompanying LICENSE file
+
+rem
+rem Environment setup script for C/C++ compilation with Visual Studio 14.
+rem
+
+rem %1  - target
+rem %2  - bbot executable
+rem %3+ - bbot options
+
+setlocal EnableExtensions EnableDelayedExpansion
+
+set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio 14.0"
+set "VCVARS=%MSVC%\VC\vcvarsall.bat"
+
+rem Based on target determine what we are building. If the target is
+rem not specified, then we build 64-bit by default.
+rem
+rem Note that an empty argument is passed as "" (literal quotes).
+rem
+if "_%1_" == "_x86_64-microsoft-win32-msvc14.0_" (
+  set "VCARCH=amd64"
+) else (
+  if "_%1_" == "_i386-microsoft-win32-msvc14.0_" (
+    set "VCARCH=amd64_x86"
+  ) else (
+    if _%1_ == _""_ (
+      set "VCARCH=amd64"
+    ) else (
+      echo error: unknown target %1
+      goto error
+    )
+  )
+)
+
+call "%VCVARS%" %VCARCH%
+if errorlevel 1 goto error
+
+%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=cl config.cxx=cl
+if errorlevel 1 goto error
+
+goto end
+
+:error
+@echo off
+endlocal
+exit /b 1
+
+:end
+endlocal
diff --git a/etc/environments/default-msvc-15.bat b/etc/environments/default-msvc-15.bat
new file mode 100644
index 0000000..6eecc71
--- /dev/null
+++ b/etc/environments/default-msvc-15.bat
@@ -0,0 +1,56 @@
+@echo off
+
+rem file      : etc/environments/default-msvc-15.bat
+rem copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+rem license   : TBC; see accompanying LICENSE file
+
+rem
+rem Environment setup script for C/C++ compilation with Visual Studio 15.
+rem
+
+rem %1  - target
+rem %2  - bbot executable
+rem %3+ - bbot options
+
+setlocal EnableExtensions EnableDelayedExpansion
+
+set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
+
+set "VCVARS32=%MSVC%\VC\Auxiliary\Build\vcvarsamd64_x86.bat"
+set "VCVARS64=%MSVC%\VC\Auxiliary\Build\vcvars64.bat"
+
+rem Based on target determine what we are building. If the target is
+rem not specified, then we build 64-bit by default.
+rem
+rem Note that an empty argument is passed as "" (literal quotes).
+rem
+if "_%1_" == "_x86_64-microsoft-win32-msvc14.1_" (
+  set "VCVARS=%VCVARS64%"
+) else (
+  if "_%1_" == "_i386-microsoft-win32-msvc14.1_" (
+    set "VCVARS=%VCVARS32%"
+  ) else (
+    if _%1_ == _""_ (
+      set "VCVARS=%VCVARS64%"
+    ) else (
+      echo error: unknown target %1
+      goto error
+    )
+  )
+)
+
+call "%VCVARS%"
+if errorlevel 1 goto error
+
+%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=cl config.cxx=cl
+if errorlevel 1 goto error
+
+goto end
+
+:error
+@echo off
+endlocal
+exit /b 1
+
+:end
+endlocal
diff --git a/etc/environments/default-msvc.bat b/etc/environments/default-msvc.bat
deleted file mode 100644
index 40ec364..0000000
--- a/etc/environments/default-msvc.bat
+++ /dev/null
@@ -1,56 +0,0 @@
-@echo off
-
-rem file      : etc/environments/default-msvc.bat
-rem copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-rem license   : TBC; see accompanying LICENSE file
-
-rem
-rem Environment setup script for C/C++ compilation with Visual Studio 15.
-rem
-
-rem %1  - target
-rem %2  - bbot executable
-rem %3+ - bbot options
-
-setlocal EnableExtensions EnableDelayedExpansion
-
-set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
-
-set "VCVARS32=%MSVC%\VC\Auxiliary\Build\vcvarsamd64_x86.bat"
-set "VCVARS64=%MSVC%\VC\Auxiliary\Build\vcvars64.bat"
-
-rem Based on target determine what we are building. If the target is
-rem not specified, then we build 64-bit by default.
-rem
-rem Note that an empty argument is passed as "" (literal quotes).
-rem
-if "_%1_" == "_x86_64-microsoft-win32-msvc14.1_" (
-  set "VCVARS=%VCVARS64%"
-) else (
-  if "_%1_" == "_i386-microsoft-win32-msvc14.1_" (
-    set "VCVARS=%VCVARS32%"
-  ) else (
-    if _%1_ == _""_ (
-      set "VCVARS=%VCVARS64%"
-    ) else (
-      echo error: unknown target %1
-      goto error
-    )
-  )
-)
-
-call "%VCVARS%"
-if errorlevel 1 goto error
-
-%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=cl config.cxx=cl
-if errorlevel 1 goto error
-
-goto end
-
-:error
-@echo off
-endlocal
-exit /b 1
-
-:end
-endlocal
-- 
cgit v1.1