Skip to content

Commit

Permalink
Merge branch '0.10' of https://github.com/OpenLightingProject/ola int…
Browse files Browse the repository at this point in the history
…o master-resync
  • Loading branch information
peternewman committed Sep 28, 2018
2 parents 2826ef3 + 93448c8 commit 3a31718
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 3 deletions.
1 change: 1 addition & 0 deletions debian/Makefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ EXTRA_DIST += \
debian/source/lintian-overrides \
debian/source/local-options \
debian/tests/control \
debian/tests/hw.cc \
debian/watch
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: ola
Priority: optional
Maintainer: Wouter Verhelst <wouter@debian.org>
Uploaders: RenZO <renzo@imaginux.com>
Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev, libavahi-client-dev, python-numpy
Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi1-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev, libavahi-client-dev, python-numpy
Standards-Version: 3.9.8
Section: libs
Vcs-Git: https://github.com/OpenLightingProject/ola.git
Expand All @@ -13,7 +13,7 @@ Package: libola-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ola (= ${binary:Version}), libprotobuf-dev, ${misc:Depends}
Depends: ola (= ${binary:Version}), ${misc:Depends}, libprotobuf-dev
Description: Open Lighting Architecture - development libraries
The DMX512 standard for Digital MultipleX is used for digital
communication networks commonly used to control stage lighting and
Expand Down
12 changes: 11 additions & 1 deletion debian/tests/control
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
Test-Command: olad --help
Depends: ola

Test-Command: ola_rdm_get --list-pids
Depends: ola

Test-Command: rdm_responder_test.py --help
Depends: ola, ola-rdm-tests
Depends: ola-rdm-tests

Test-Command: set -e ; for py in $(pyversions -s 2>/dev/null) ; do cd "$ADTTMP" ; echo "Testing with $py:" ; $py -c "from ola.ClientWrapper import ClientWrapper; print(ClientWrapper)" ; done
Depends: python-all, ola, ola-python

Test-Command: pkg-config --cflags --libs libola
Depends: libola-dev, pkg-config

Test-Command: set -e; g++ -o linktest $(pkg-config --cflags --libs libola) debian/tests/hw.cc; ./linktest
Depends: libola-dev, g++, pkg-config
Restrictions: rw-build-tree
13 changes: 13 additions & 0 deletions debian/tests/hw.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include <iostream>
#include <ola/client/OlaClient.h>

int main(void) {
ola::io::LoopbackDescriptor d;
ola::client::OlaClient c(&d);

bool success = c.Setup();

std::cout << "Hello World!" << std::endl << "success: " << (success ? "t" : "f") << std::endl;

return success ? 0 : 1;
}

0 comments on commit 3a31718

Please sign in to comment.