Skip to content

Commit

Permalink
Only use BOOST_ROOT
Browse files Browse the repository at this point in the history
  • Loading branch information
Flamefire committed Jul 16, 2020
1 parent 32d16f7 commit 01013cc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,20 @@ before_install:
# Cloning Boost libraries (fast nondeep cloning)
- PROJECT_DIR=`pwd`
- git --version
- BOOST=$HOME/boost-local
- git clone -b $BRANCH_TO_TEST --depth 1 https://github.com/boostorg/boost.git $BOOST
- cd $BOOST
- BOOST_ROOT=$HOME/boost-local
- git clone -b $BRANCH_TO_TEST --depth 1 https://github.com/boostorg/boost.git $BOOST_ROOT
- cd $BOOST_ROOT
- git submodule update --init --depth 1
- ./bootstrap.sh
- ./b2 headers

script:
- cd $PROJECT_DIR
- export BOOST_ROOT=$BOOST
- export BOOST_ROOT
# `--coverage` flags required to generate coverage info for Coveralls
- scripts/build.sh --toolset=$CC "cxxflags=-std=c++$CXX_STANDARD -Wno-unused-local-typedefs -Wno-unused-function -Wno-deprecated-declarations --coverage" "linkflags=--coverage" -j3
# CMake build
- cd $BOOST && ./b2 --with-test --with-thread --with-chrono --with-system --with-atomic --with-date_time -a -j3 # Build required libs
- cd $BOOST_ROOT && ./b2 --with-test --with-thread --with-chrono --with-system --with-atomic --with-date_time -a -j3 # Build required libs
- mkdir $PROJECT_DIR/build && cd $PROJECT_DIR/build
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-std=c++$CXX_STANDARD"
- cmake --build . --config Debug -- -j3
Expand Down
18 changes: 9 additions & 9 deletions scripts/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ rem (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.t

setlocal

rem error if BOOST_ROOT not set
set BOOST=%BOOST_ROOT%
rem Need to set BOOST_ROOT and run from the source root directory

set PROJECT_DIR=%cd%

cd %BOOST%
cd %BOOST_ROOT%
b2.exe %PROJECT_DIR%\test -q %BUILD_ARGS% %*
if errorlevel 1 exit /b %ERRORLEVEL%

cd %PROJECT_DIR%
set BOOSTBOOK_DIR=%PROJECT_DIR%\bin\turtle\boostbook
xcopy /Y /S /Q /I %BOOST%\tools\boostbook\xsl %BOOSTBOOK_DIR%\xsl
xcopy /Y /S /Q /I %BOOST%\tools\boostbook\dtd %BOOSTBOOK_DIR%\dtd
xcopy /Y /S /Q /I %BOOST_ROOT%\tools\boostbook\xsl %BOOSTBOOK_DIR%\xsl
xcopy /Y /S /Q /I %BOOST_ROOT%\tools\boostbook\dtd %BOOSTBOOK_DIR%\dtd
xcopy /Y /S /Q /I doc\boostbook %BOOSTBOOK_DIR%
xcopy /Y /S /Q /I %BOOST%\doc\src\boostbook.css doc\html
xcopy /Y /S /Q /I %BOOST%\doc\src\images\*.png doc\html\images
xcopy /Y /S /Q /I %BOOST%\doc\src\images\callouts\*.png doc\html\images\callouts
xcopy /Y /S /Q /I %BOOST_ROOT%\doc\src\boostbook.css doc\html
xcopy /Y /S /Q /I %BOOST_ROOT%\doc\src\images\*.png doc\html\images
xcopy /Y /S /Q /I %BOOST_ROOT%\doc\src\images\callouts\*.png doc\html\images\callouts
if errorlevel 1 exit /b %ERRORLEVEL%

cd %BOOST%
cd %BOOST_ROOT%
b2.exe %PROJECT_DIR%\doc -q %*
if errorlevel 1 exit /b %ERRORLEVEL%
6 changes: 3 additions & 3 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

set -eux

export BOOST="$BOOST_ROOT"
# Need to set BOOST_ROOT and run from the source root directory
PROJECT_DIR="$(pwd)"

cd "$BOOST"
cd "$BOOST_ROOT"
./b2 "$PROJECT_DIR/test" -q "$@"

cd "$PROJECT_DIR"
scripts/build_doc.sh "$@"

cd "$BOOST"
cd "$BOOST_ROOT"
./b2 "$PROJECT_DIR/doc//mock_examples" -q "$@"

0 comments on commit 01013cc

Please sign in to comment.