mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only use BOOST_ROOT

Browse source
This commit is contained in:
Alexander Grund 2020-07-16 12:59:05 +02:00
parent 32d16f773b
commit 01013cce2f
No known key found for this signature in database
GPG key ID: E92C451FC21EF13F
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -60,20 +60,20 @@ before_install:
# Cloning Boost libraries (fast nondeep cloning) # Cloning Boost libraries (fast nondeep cloning)
- PROJECT_DIR=`pwd` - PROJECT_DIR=`pwd`
- git --version - git --version
- BOOST=$HOME/boost-local - BOOST_ROOT=$HOME/boost-local
- git clone -b $BRANCH_TO_TEST --depth 1 https://github.com/boostorg/boost.git $BOOST - git clone -b $BRANCH_TO_TEST --depth 1 https://github.com/boostorg/boost.git $BOOST_ROOT
- cd $BOOST - cd $BOOST_ROOT
- git submodule update --init --depth 1 - git submodule update --init --depth 1
- ./bootstrap.sh - ./bootstrap.sh
- ./b2 headers - ./b2 headers
script: script:
- cd $PROJECT_DIR - cd $PROJECT_DIR
- export BOOST_ROOT=$BOOST - export BOOST_ROOT
# `--coverage` flags required to generate coverage info for Coveralls # `--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 - 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 # 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 - mkdir $PROJECT_DIR/build && cd $PROJECT_DIR/build
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-std=c++$CXX_STANDARD" - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-std=c++$CXX_STANDARD"
- cmake --build . --config Debug -- -j3 - cmake --build . --config Debug -- -j3

18
scripts/build.bat
View file

@ -7,24 +7,24 @@ rem (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.t
setlocal setlocal
rem error if BOOST_ROOT not set rem Need to set BOOST_ROOT and run from the source root directory
set BOOST=%BOOST_ROOT%
set PROJECT_DIR=%cd% set PROJECT_DIR=%cd%
cd %BOOST% cd %BOOST_ROOT%
b2.exe %PROJECT_DIR%\test -q %BUILD_ARGS% %* b2.exe %PROJECT_DIR%\test -q %BUILD_ARGS% %*
if errorlevel 1 exit /b %ERRORLEVEL% if errorlevel 1 exit /b %ERRORLEVEL%
cd %PROJECT_DIR% cd %PROJECT_DIR%
set BOOSTBOOK_DIR=%PROJECT_DIR%\bin\turtle\boostbook 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_ROOT%\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\dtd %BOOSTBOOK_DIR%\dtd
xcopy /Y /S /Q /I doc\boostbook %BOOSTBOOK_DIR% 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_ROOT%\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_ROOT%\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\images\callouts\*.png doc\html\images\callouts
if errorlevel 1 exit /b %ERRORLEVEL% if errorlevel 1 exit /b %ERRORLEVEL%
cd %BOOST% cd %BOOST_ROOT%
b2.exe %PROJECT_DIR%\doc -q %* b2.exe %PROJECT_DIR%\doc -q %*
if errorlevel 1 exit /b %ERRORLEVEL% if errorlevel 1 exit /b %ERRORLEVEL%

6
scripts/build.sh
View file

@ -7,14 +7,14 @@
set -eux set -eux
export BOOST="$BOOST_ROOT" # Need to set BOOST_ROOT and run from the source root directory
PROJECT_DIR="$(pwd)" PROJECT_DIR="$(pwd)"
cd "$BOOST" cd "$BOOST_ROOT"
./b2 "$PROJECT_DIR/test" -q "$@" ./b2 "$PROJECT_DIR/test" -q "$@"
cd "$PROJECT_DIR" cd "$PROJECT_DIR"
scripts/build_doc.sh "$@" scripts/build_doc.sh "$@"
cd "$BOOST" cd "$BOOST_ROOT"
./b2 "$PROJECT_DIR/doc//mock_examples" -q "$@" ./b2 "$PROJECT_DIR/doc//mock_examples" -q "$@"