perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update .travis.yml dist: xenial

This commit is contained in:
Markus Gans 2019-11-19 02:46:01 +01:00
parent cbe1179443
commit aacf27ff74
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@ -1,15 +1,13 @@
language: cpp language: cpp
dist: trusty dist: xenial
sudo: required sudo: required
compiler: compiler:
- gcc - gcc
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- g++-7 - g++
- autotools-dev - autotools-dev
- automake - automake
- autoconf - autoconf
@ -50,13 +48,10 @@ matrix:
- os: linux - os: linux
env: env:
- TEST="Coverity Scan" - TEST="Coverity Scan"
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- g++-7 - g++
- gpm - gpm
- libgpm-dev - libgpm-dev
- libcppunit-dev - libcppunit-dev
@ -66,25 +61,21 @@ matrix:
name: gansm/finalcut name: gansm/finalcut
description: Build submitted via Travis CI description: Build submitted via Travis CI
notification_email: guru.mail@muenster.de notification_email: guru.mail@muenster.de
build_command_prepend: "cov-configure --comptype gcc --compiler gcc-7 --template && autoreconf -v --install --force && ./configure --prefix=/usr CPPFLAGS='-DDEBUG' CXXFLAGS='-g -O0 -DDEBUG -DUNIT_TEST' --with-unit-test && make clean" build_command_prepend: "autoreconf -v --install --force && ./configure --prefix=/usr CPPFLAGS='-DDEBUG' CXXFLAGS='-g -O0 -DDEBUG -DUNIT_TEST' --with-unit-test && make clean"
build_command: "make V=1 -j10" build_command: "make V=1 -j10"
branch_pattern: master branch_pattern: master
before_install: before_install:
- eval "${MATRIX_EVAL}"
- lsb_release -a - lsb_release -a
- uname -a - uname -a
- whoami - whoami
- echo -n | openssl s_client -CApath /etc/ssl/certs/ -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt - echo -n | openssl s_client -CApath /etc/ssl/certs/ -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
script: script:
- cat /home/travis/build/gansm/finalcut/cov-int/scm_log.txt
- autoreconf -v --install --force - autoreconf -v --install --force
- ./configure --prefix=/usr CPPFLAGS="-DDEBUG" CXXFLAGS="-g -O0 -DDEBUG -DUNIT_TEST" --with-unit-test - ./configure --prefix=/usr CPPFLAGS="-DDEBUG" CXXFLAGS="-g -O0 -DDEBUG -DUNIT_TEST" --with-unit-test
- make V=1 -j10 - make V=1 -j10
- make check - make check
- cat test/*.log - cat test/*.log
after_script:
- echo "--------------- scm_log.txt ---------------"
- cat /home/travis/build/gansm/finalcut/cov-int/scm_log.txt
- echo "-------------------------------------------"
# #
# Coveralls + Codecov # Coveralls + Codecov
@ -92,9 +83,7 @@ matrix:
- os: linux - os: linux
env: env:
- TEST="Coveralls" - TEST="Coveralls"
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
before_install: before_install:
- eval "${MATRIX_EVAL}"
- lsb_release -a - lsb_release -a
- uname -a - uname -a
- pip install --user cpp-coveralls - pip install --user cpp-coveralls
@ -119,4 +108,3 @@ matrix:
- autoreconf -v --install --force - autoreconf -v --install --force
- ./configure --prefix=/usr - ./configure --prefix=/usr
- make -j10 - make -j10

12
examples/term-attributes.cpp
View File

@ -232,18 +232,18 @@ class AttribDemo : public finalcut::FWidget
void draw() override; void draw() override;
// Data member // Data member
int colors; FColor last_color;
}; };
//---------------------------------------------------------------------- //----------------------------------------------------------------------
AttribDemo::AttribDemo (finalcut::FWidget* parent) AttribDemo::AttribDemo (finalcut::FWidget* parent)
: finalcut::FWidget(parent) : finalcut::FWidget(parent)
, colors(getMaxColor()) , last_color(FColor(getMaxColor()))
{ {
if ( isMonochron() ) if ( isMonochron() )
colors = 1; last_color = 1;
else if ( colors > 16 ) else if ( last_color > 16 )
colors = 16; last_color = 16;
unsetFocusable(); unsetFocusable();
} }
@ -253,7 +253,7 @@ void AttribDemo::printColorLine()
{ {
auto parent = static_cast<AttribDlg*>(getParent()); auto parent = static_cast<AttribDlg*>(getParent());
for (FColor color{0}; color < FColor(colors); color++) for (FColor color{0}; color < last_color; color++)
{ {
print() << FColorPair(color, parent->bgcolor) << " # "; print() << FColorPair(color, parent->bgcolor) << " # ";
} }