From 1967d67234b79ca7555a4dddda2b4761b10de250 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 7 Oct 2019 14:57:39 +0200 Subject: Add bootstrap/environment batch files for Clang targeting MSVC --- etc/environments/default-clang.bat | 71 ++++++++++++++++++++++++++++++++++++ etc/environments/default-msvc-15.bat | 49 ------------------------- etc/environments/default-msvc-16.bat | 49 ------------------------- etc/environments/default-msvc.bat | 57 +++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 98 deletions(-) create mode 100644 etc/environments/default-clang.bat delete mode 100644 etc/environments/default-msvc-15.bat delete mode 100644 etc/environments/default-msvc-16.bat create mode 100644 etc/environments/default-msvc.bat (limited to 'etc/environments') diff --git a/etc/environments/default-clang.bat b/etc/environments/default-clang.bat new file mode 100644 index 0000000..52e0e4a --- /dev/null +++ b/etc/environments/default-clang.bat @@ -0,0 +1,71 @@ +@echo off + +rem file : etc/environments/default-clang.bat +rem copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +rem license : TBC; see accompanying LICENSE file + +rem +rem Environment setup script for C/C++ compilation with Clang targeting +rem MSVC. +rem + +rem %1 - target +rem %2 - bbot executable +rem %3+ - bbot options + +setlocal EnableExtensions EnableDelayedExpansion + +rem If the MSVC variable is set, then set up the environment via the MSVC +rem command prompt rather than letting Clang find some default (note that +rem in the latter case, clang++ should be in PATH). +rem +rem Note also that MSVC_VER must always be set. + +rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community" +rem set "MSVC_VER=14.1" + +set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" +set "MSVC_VER=14.2" + +set "VCVARS32=VC\Auxiliary\Build\vcvarsamd64_x86.bat" +set "VCVARS64=VC\Auxiliary\Build\vcvars64.bat" + +set "CXX=clang++" + +rem Based on target determine what we are building. +rem +if "_%1_" == "_x86_64-microsoft-win32-msvc%MSVC_VER%_" ( + set "VCVARS=%VCVARS64%" + set "mode=config.cc.coptions+=-m64" +) else ( + if "_%1_" == "_i686-microsoft-win32-msvc%MSVC_VER%_" ( + set "VCVARS=%VCVARS32%" + set "mode=config.cc.coptions+=-m32" + ) else ( + if "_%1_" == "_i386-microsoft-win32-msvc%MSVC_VER%_" ( + set "VCVARS=%VCVARS32%" + set "mode=config.cc.coptions+=-m32" + ) else ( + echo error: unknown target %1 + goto error + ) + ) +) + +if not "_%MSVC%_" == "__" ( + call "%MSVC%\%VCVARS%" + if errorlevel 1 goto error +) + +%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=cl config.cxx=%CXX% %mode% +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 deleted file mode 100644 index 9d746c6..0000000 --- a/etc/environments/default-msvc-15.bat +++ /dev/null @@ -1,49 +0,0 @@ -@echo off - -rem file : etc/environments/default-msvc-15.bat -rem copyright : Copyright (c) 2014-2019 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. -rem -if "_%1_" == "_x86_64-microsoft-win32-msvc14.1_" ( - set "VCVARS=%VCVARS64%" -) else ( - if "_%1_" == "_i386-microsoft-win32-msvc14.1_" ( - set "VCVARS=%VCVARS32%" - ) 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-16.bat b/etc/environments/default-msvc-16.bat deleted file mode 100644 index f8c5055..0000000 --- a/etc/environments/default-msvc-16.bat +++ /dev/null @@ -1,49 +0,0 @@ -@echo off - -rem file : etc/environments/default-msvc-16.bat -rem copyright : Copyright (c) 2014-2019 Code Synthesis Ltd -rem license : TBC; see accompanying LICENSE file - -rem -rem Environment setup script for C/C++ compilation with Visual Studio 16. -rem - -rem %1 - target -rem %2 - bbot executable -rem %3+ - bbot options - -setlocal EnableExtensions EnableDelayedExpansion - -set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\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. -rem -if "_%1_" == "_x86_64-microsoft-win32-msvc14.2_" ( - set "VCVARS=%VCVARS64%" -) else ( - if "_%1_" == "_i386-microsoft-win32-msvc14.2_" ( - set "VCVARS=%VCVARS32%" - ) 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 new file mode 100644 index 0000000..a7d4f16 --- /dev/null +++ b/etc/environments/default-msvc.bat @@ -0,0 +1,57 @@ +@echo off + +rem file : etc/environments/default-msvc.bat +rem copyright : Copyright (c) 2014-2019 Code Synthesis Ltd +rem license : TBC; see accompanying LICENSE file + +rem +rem Environment setup script for C/C++ compilation with Visual Studio. +rem + +rem %1 - target +rem %2 - bbot executable +rem %3+ - bbot options + +setlocal EnableExtensions EnableDelayedExpansion + +rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community" +rem set "MSVC_VER=14.1" + +set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" +set "MSVC_VER=14.2" + +set "VCVARS32=VC\Auxiliary\Build\vcvarsamd64_x86.bat" +set "VCVARS64=VC\Auxiliary\Build\vcvars64.bat" + +rem Based on target determine what we are building. +rem +if "_%1_" == "_x86_64-microsoft-win32-msvc%MSVC_VER%_" ( + set "VCVARS=%VCVARS64%" +) else ( + if "_%1_" == "_i686-microsoft-win32-msvc%MSVC_VER%_" ( + set "VCVARS=%VCVARS32%" + ) else ( + if "_%1_" == "_i386-microsoft-win32-msvc%MSVC_VER%_" ( + set "VCVARS=%VCVARS32%" + ) else ( + echo error: unknown target %1 + goto error + ) + ) +) + +call "%MSVC%\%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