Skip to content

Commit

Permalink
Finish v0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
promi committed May 1, 2017
2 parents 13dbcaa + 7185d50 commit e17eb15
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 23 deletions.
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ env:
- secure: "rO1SMrH3lv8LjM6JQ32i4Mw+3V7SoSKGR/updHdpOCNeU3n7ux6XdQIbJ5juMiapt7RCut2hfy2gBVUVjeK0l3qGJ7nwB+GS6EfZPpLmSlJQZmnyihhL0tNAx4ihgWfeama50frPwU90n+iC6hl5ArFKpuHWlLOBTPZzaWntS3j/z5TFwrtrN/y0VZZhrvlEiwL9HHPNMXTB7IYkEEDEZCJAlPB+v3dNqyazNn4SVLdvFuZF8NbYhln89a0kt4uvAMqrsvHqMHlb78Gok3oXfNDxWpTZWTauVtfKNeKpsgyHLAcyo8tXCcaodJuVOXfaWzKYjAWr3BClDVGLbIgXyG75PLkXNY1v0VMlNCj9YlUeNZSgFfKtQUq8viyyTdjjfFns/uymxR6UEeNdkltOuoZNMQOxgIpYqCQ0SRYfRPck7yT+H+di64zN5kyWIUPfjjwKKr4voWw6WEhlIcZhsICcS9GGKRA+NGWODJn94cOA7k5XwsyO1RV3Sd0na6/iTriUi7Z1k9FFm1mx7TeQxblo5l6QRcz0C8TrNfkHv7r56E08bv+XKNGS//X6nD1OXlIifdeAOsyzuHWxkeGV0ESvmEQbYEewmnNWSGSTPAANUC+w+2lDd70O3xnkmKbQjRCHa8uKrIDQS5a3Ny2bRizAwhwdR+j7zPIpXMIPe9g="

compiler:
- clang
- gcc
- clang

addons:
apt:
Expand All @@ -34,9 +34,9 @@ addons:
name: "promi/mumble-pluginbot-plusplus"
description: "Build submitted via Travis CI"
notification_email: [email protected]
build_command_prepend: "./configure; make clean"
build_command_prepend: "cov-configure --comptype gcc --compiler gcc-4.9 --template; ./configure; make clean"
build_command: "make -j 4"
branch_pattern: master
branch_pattern: coverity_scan

before_script:
- ./autogen.sh
Expand All @@ -45,8 +45,12 @@ before_script:
- echo "$CXX"
- $CXX --version

# https://github.com/travis-ci/travis-ci/issues/1975#issuecomment-216604414
before_install:
- test $TRAVIS_BRANCH != coverity_scan -o ${TRAVIS_JOB_NUMBER##*.} = 1 || exit 0
# - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-


script:
- test $TRAVIS_BRANCH != coverity_scan || exit 0
- ./configure && make && make check

#before_install:
# - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
37 changes: 21 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# mumble-pluginbot-plusplus

[![Build Status](https://travis-ci.org/promi/mumble-pluginbot-plusplus.svg?branch=master)](https://travis-ci.org/promi/mumble-pluginbot-plusplus)
[![Coverty Scan Status](https://scan.coverity.com/projects/12590/badge.svg?flat=1)](https://scan.coverity.com/projects/promi-mumble-pluginbot-plusplus)

## Introduction

Expand Down Expand Up @@ -50,7 +51,7 @@ What doesn't work:

The code is using modern C++ language features only present in C++14.

- GCC 4.9+ or Clang 3.8+
- GCC 4.9+ or Clang 3.6+
- autoconf
- automake
- libtool
Expand All @@ -64,45 +65,50 @@ The code is using modern C++ language features only present in C++14.

On Debian you can get the dependencies using Apt:

$ sudo apt-get install build-essential automake libtool pkg-config libopus-dev libssl-dev libprotobuf-dev libmpdclient-dev protobuf-compiler
sudo apt-get install build-essential automake libtool pkg-config libopus-dev libssl-dev libprotobuf-dev libmpdclient-dev protobuf-compiler

On Ubuntu 14.04 (Trusty Thar) (GCC) you have to also add the `ubuntu-toolchain-r/test` PPA:

sudo apt-add-repository "ppa:ubuntu-toolchain-r/test"
sudo apt-get install build-essential automake libtool g++-4.9 libopus-dev libssl-dev libprotobuf-dev libmpdclient-dev protobuf-compiler

## Building + Installing

The repository is autotools-based, you have to regenerate the configure script:

$ ./autogen.sh
./autogen.sh

Then the usual autotools process applies:

$ ./configure
$ make
$ sudo make install
./configure
make
sudo make install

There is experimental support for Debian Jessie, to build there you should invoke configure like this:
There is experimental support for Debian Jessie and Ubuntu Trusty, invoke configure like this:

$ CXX='g++ -std=c++1y' ./configure --without-libuv
CXX='g++ -std=c++1y' ./configure --without-libuv

It should also work without installing, libtool provides a wrapper script for this:
It also works without installing. libtool provides a wrapper script for this:

$ ./mumble-pluginbot-plusplus --help
./mumble-pluginbot-plusplus --help

A running mpd is currently necessary or the bot will crash, there is a script included to start mpd:

$ tools/start-mpd.sh
tools/start-mpd.sh

However the script expects a working mpd.conf in `~/.config/mumble-pluginbot-plusplus/mpd.conf`. You can start with the example script from the mumble-ruby-pluginbot repository:

https://github.com/MusicGenerator/mumble-ruby-pluginbot/blob/master/templates/mpd.conf

## Debugging

When using `gdb` you should either install first and invoke `gdb` as usual or you can use `libtool`s execute mode to debug without installing:
When using `gdb` either install first and invoke `gdb` as usual or use `libtool`s execute mode to debug without installing:

$ libtool --mode=execute gdb --args ./mumble-pluginbot-plusplus -h mumble.example.org ...
libtool --mode=execute gdb --args ./mumble-pluginbot-plusplus -h mumble.example.org ...

For the best debugging experience you should compile with debugging symbols and without optimizations:
For the best debugging experience compile with debugging symbols and without optimizations:

$ CXX='clang++ -std=c++14' CXXFLAGS='-O0 -ggdb' ./configure
CXX='clang++ -std=c++14' CXXFLAGS='-O0 -ggdb' ./configure

## License

Expand All @@ -120,4 +126,3 @@ The code consists of several libtool libraries and a binary:
- libmumble-pluginbot-plusplus-mumble - Utility classes to talk to a Mumble server
- libmumble-pluginbot-plusplus-mpd - Utility classes to talk to a MPD server
- mumble-pluginbot-plusplus - The main binary containing the core Bot and the enabled plugins

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AC_INIT(
[mumble-pluginbot-plusplus],
[0.8],
[0.9],
[https://github.com/promi/mumble-pluginbot-plusplus/issues],
[],
[https://github.com/promi/mumble-pluginbot-plusplus])
Expand Down

0 comments on commit e17eb15

Please sign in to comment.