boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/response-file-feature

Browse Source
This commit is contained in:
Rene Rivera
2020-12-21 19:07:37 -06:00
parent f62f474ed3 02bf50d3f7
commit bc36ce8134
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
doc/jamfile.jam
View File

@@ -62,6 +62,17 @@ explicit index ;
install html : index : <location>$(doc-dir) <dependency>website-html ;
explicit html ;
make index.html : : @make_redir_html : <location>.. ;
actions make_redir_html
{
echo @($(<):E=<html><head><meta http-equiv="refresh" content="0; URL=doc/html/index.html"></head><body>
Automatic redirection failed, please go to
<a href="doc/html/index.html">doc/html/index.html</a>.
<!-- Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
</body></html>)
}
explicit index.html ;
alias standalone-html : html ;
if $(website)
@@ -117,5 +128,5 @@ actions website-publish
alias boostdoc ;
explicit boostdoc ;
alias boostrelease : standalone-html ;
alias boostrelease : standalone-html index.html ;
explicit boostrelease ;

4
src/engine/vswhere_usability_wrapper.cmd
View File

@@ -32,7 +32,7 @@ for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
REM Visual Studio 2019 (16.X, toolset 14.2)
set VSWHERE_LMT=-version "[16.0,17.0)"
SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT%
SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% %VSWHERE_PRERELEASE%
for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
endlocal
echo Found with vswhere %%i
@@ -57,4 +57,4 @@ for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
:no-vswhere
endlocal
echo could not find "vswhere"
exit /B 1
exit /B 1