From 7d2449b7da10686d08cbfab718946e8c24a622ee Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 14 Sep 2015 21:11:04 +0200 Subject: [PATCH] [DEV] update Build interface --- .travis.yml | 19 ++++++++++++------- lutin_esvg.py | 22 ++++++++++++++++++++-- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0825ed5..7a7731b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ language: sudo: false -compiler: - - clang - - gcc - os: - linux - osx @@ -26,8 +22,18 @@ addons: install: - 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 .. + - wget http://atria-soft.com/ci/coverage_send.py + - wget http://atria-soft.com/ci/test_send.py + - wget http://atria-soft.com/ci/warning_send.py - git clone https://github.com/atria-soft/etk.git - git clone https://github.com/atria-soft/exml.git - git clone https://github.com/atria-soft/libagg.git @@ -35,11 +41,10 @@ before_script: - git clone https://github.com/generic-library/freetype-lutin.git --recursive - pwd - ls -l - - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi - - if [ "$CXX" == "g++" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi + - if [ "$BUILDER" == "gcc" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi script: - - lutin -C -P -c$BUILDER $COMPILATOR_OPTION -mdebug -p esvg + - lutin -w -j4 -C -P -c $BUILDER $COMPILATOR_OPTION -m $CONF $GCOV -p esvg notifications: email: diff --git a/lutin_esvg.py b/lutin_esvg.py index 1cc1d85..38f1dfd 100644 --- a/lutin_esvg.py +++ b/lutin_esvg.py @@ -22,8 +22,26 @@ def create(target): 'esvg/Rectangle.cpp', 'esvg/Renderer.cpp', 'esvg/Stroking.cpp', - 'esvg/Text.cpp']) - myModule.add_export_path(tools.get_current_path(__file__)) + 'esvg/Text.cpp' + ]) + + myModule.add_header_file([ + 'esvg/Base.h', + 'esvg/Circle.h', + 'esvg/Ellipse.h', + 'esvg/Group.h', + 'esvg/Line.h', + 'esvg/esvg.h', + 'esvg/Path.h', + 'esvg/Polygon.h', + 'esvg/Polyline.h', + 'esvg/Rectangle.h', + 'esvg/Renderer.h', + 'esvg/Stroking.h', + 'esvg/Text.h' + ]) + + myModule.add_path(tools.get_current_path(__file__)) # add the currrent module at the return myModule