[CI] try integrate new MacOs on Travis

This commit is contained in:
Edouard DUPIN 2015-10-15 22:46:16 +02:00
parent 293e32b2b4
commit 78e237d281
5 changed files with 57 additions and 17 deletions

View File

@ -1,11 +1,15 @@
language:
- cpp
#dist: trusty
sudo: false
#sudo: required
os:
- linux
- osx
# - mingw
branches:
only:
@ -19,15 +23,27 @@ addons:
packages:
- g++-4.9
env:
- CONF=debug BUILDER=clang
- CONF=debug BUILDER=gcc
matrix:
include:
- os: linux
env: CONF=debug BUILDER=gcc GCOV=--gcov
- os: linux
env: CONF=release BUILDER=clang
- os: linux
env: CONF=release BUILDER=gcc
exclude:
- os: mingw
env: CONF=debug BUILDER=clang
install:
- uname -a
- printenv
- pip install --user lutin
env:
- CONF=debug BOARD=Linux BUILDER=clang GCOV=
- CONF=release BOARD=Linux BUILDER=clang GCOV=
- CONF=debug BOARD=Linux BUILDER=gcc GCOV=
- CONF=release BOARD=Linux BUILDER=gcc GCOV=
- CONF=debug BOARD=Linux BUILDER=gcc GCOV=--gcov
before_script:
- cd ..
@ -37,17 +53,34 @@ before_script:
- git clone https://github.com/generic-library/gtest-lutin.git --recursive
- pwd
- ls -l
- if [ "$BUILDER" == "gcc" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi
- if [ "$BUILDER" == "gcc" ]; then
export COMPILATOR_OPTION="--compilator-version=4.9";
else
export COMPILATOR_OPTION="";
fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
export PATH=$PATH:/Users/travis/Library/Python/2.7/bin/;
fi
- if [ "$TRAVIS_OS_NAME" == "mingw" ]; then
export TARGET="-t Windows";
export COMPILATOR_OPTION="";
else
export TARGET="";
fi
script:
- lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p etk-test
- lutin -w -j4 -C -P $TARGET -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p etk-test
after_script:
- if [ "$GCOV" != "" ]; then python ./warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/etk/ ; fi
- if [ "$GCOV" != "" ]; then
python ./warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/etk/;
fi
- ./out/Linux_x86_64/$CONF/staging/$BUILDER/etk-test/usr/bin/etk-test -l6 | tee out_test.txt
- if [ "$GCOV" != "" ]; then python ./test_send.py --file=out_test.txt; fi
- if [ "$GCOV" != "" ]; then lutin -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF -p etk?gcov; fi
- if [ "$GCOV" != "" ]; then python ./coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/etk/etk_coverage.json; fi
- if [ "$GCOV" != "" ]; then
python ./test_send.py --file=out_test.txt;
lutin -C -P -c $TARGET $BUILDER $COMPILATOR_OPTION -m $CONF -p etk?gcov;
python ./coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/etk/etk_coverage.json;
fi
notifications:
email:

View File

@ -237,7 +237,7 @@ namespace etk {
#ifdef ETK_BUILD_LINEARMATH
return btSqrt(length2());
#else
#if __CPP_VERSION__ >= 2011
#if __CPP_VERSION__ >= 2011 && !defined(__TARGET_OS__MacOs) && !defined(__TARGET_OS__IOs)
return std::sqrt(length2());
#else
return sqrt(length2());

View File

@ -158,7 +158,7 @@ namespace etk {
#ifdef ETK_BUILD_LINEARMATH
return btSqrt(length2());
#else
#if __CPP_VERSION__ >= 2011
#if __CPP_VERSION__ >= 2011 && !defined(__TARGET_OS__MacOs) && !defined(__TARGET_OS__IOs)
return std::sqrt(length2());
#else
return sqrt(length2());

View File

@ -153,7 +153,7 @@ namespace etk {
#ifdef ETK_BUILD_LINEARMATH
return btSqrt(length2());
#else
#if __CPP_VERSION__ >= 2011
#if __CPP_VERSION__ >= 2011 && !defined(__TARGET_OS__MacOs) && !defined(__TARGET_OS__IOs)
return std::sqrt(length2());
#else
return sqrt(length2());

View File

@ -77,8 +77,15 @@ def create(target, module_name):
my_module.add_export_flag('c', "-DDEBUG_LEVEL=3")
my_module.add_export_flag('c', "-DDEBUG=1")
# Bor backtrace display :
if target.name != "Windows":
my_module.add_export_flag('link', "-ldl -rdynamic")
if target.name != "Windows" \
and target.name != "MacOs" \
and target.name != "IOs":
my_module.add_export_flag('link', [
'-ldl',
'-rdynamic'])
elif target.name != "Windows":
my_module.add_export_flag('link', [
'-ldl'])
my_module.compile_version("c++", 2011)
my_module.add_optionnal_module_depend('minizip', ["c++", "-DETK_BUILD_MINIZIP"])