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

Merge pull request #36 from mat007/fix-travis-cxxflags

Browse source 
Fixed travis cxxflags
This commit is contained in:
Mathieu Champlon 2018-01-20 19:45:37 +01:00 • committed by GitHub
commit ed2a22a691
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -54,12 +54,10 @@ before_install:
- ./b2 headers - ./b2 headers
script: script:
- if [ "$CCFLAGS" != "" ]; then FLAGS="cxxflags=\"$CCFLAGS\" linkflags=\"$LINKFLAGS\""; else FLAGS=""; fi
- cd $PROJECT_DIR/build - cd $PROJECT_DIR/build
# `--coverage` flags required to generate coverage info for Coveralls
# ../../../b2 -q cxxflags="--coverage -std=$CXX_STANDARD" linkflags="--coverage"
- export BOOST_ROOT=$BOOST - export BOOST_ROOT=$BOOST
- ./build.sh cxxflags="--coverage -std=$CXX_STANDARD" linkflags="--coverage" # `--coverage` flags required to generate coverage info for Coveralls
- ./build.sh "cxxflags=-std=$CXX_STANDARD --coverage" "linkflags=--coverage"
after_success: after_success:
- COVERALS_DIR=$PROJECT_DIR/coverals - COVERALS_DIR=$PROJECT_DIR/coverals

44
build/build.sh
View file

@ -5,36 +5,28 @@
# Distributed under the Boost Software License, Version 1.0. # Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
run()
{
echo $@
$@
r=$?
if test $r -ne 0 ; then
exit $r
fi
}
copy() copy()
{ {
for dir; do true; done for dir; do true; done
run mkdir -p $dir mkdir -p $dir
run cp $@ cp $@
} }
run export BOOST=$BOOST_ROOT set -x
run cd ../test export BOOST=$BOOST_ROOT
run $BOOST/b2 -q "$@"
run cd ../build
run export BOOSTBOOK_DIR=../bin/turtle/boostbook cd ../test
run copy -r "$BOOST"/tools/boostbook/xsl $BOOSTBOOK_DIR $BOOST/b2 -q "$@"
run copy -r "$BOOST"/tools/boostbook/dtd $BOOSTBOOK_DIR cd ../build
run copy -r boostbook/* $BOOSTBOOK_DIR
run copy "$BOOST"/doc/src/boostbook.css ../doc/html export BOOSTBOOK_DIR=../bin/turtle/boostbook
run copy "$BOOST"/doc/src/images/*.png ../doc/html/images copy -r "$BOOST"/tools/boostbook/xsl $BOOSTBOOK_DIR
run copy "$BOOST"/doc/src/images/callouts/*.png ../doc/html/images/callouts copy -r "$BOOST"/tools/boostbook/dtd $BOOSTBOOK_DIR
run cd ../doc copy -r boostbook/* $BOOSTBOOK_DIR
run $BOOST/b2 -q "$@" copy "$BOOST"/doc/src/boostbook.css ../doc/html
run cd ../build copy "$BOOST"/doc/src/images/*.png ../doc/html/images
copy "$BOOST"/doc/src/images/callouts/*.png ../doc/html/images/callouts
cd ../doc
$BOOST/b2 -q "$C"
cd ../build