ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add arch triplet to lib and plugins

pull/135/head
Simon Stürz 2017-01-19 15:54:48 +01:00 committed by Michael Zanetti
parent e947c83c17
commit 1ce508f665
9 changed files with 78 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/man/guhd.1 vendored
View File

@ -94,7 +94,7 @@ The logging database: \fI/var/log/guhd.sqlite\fR
.br
The systemd unit file: \fI/lib/systemd/system/guhd.service\fR
.br
The plugins directory: \fI/usr/lib/guh/plugins/\fR
The plugins directory: \fI/usr/lib/<arch-triplet>/guh/plugins/\fR
.SH SEE ALSO
Full developer documentation at: <https://developers.guh.io>
.br

2
libguh/guhsettings.cpp
View File

@ -236,7 +236,7 @@ QString GuhSettings::consoleLogPath()
{
QString consoleLogPath;
#ifdef SNAPPY
consoleLogPath = QString(qgetenv("SNAP_COMMON")) + "/guhd.log";
consoleLogPath = QString(qgetenv("SNAP_DATA")) + "/guhd.log";
#else
QString organisationName = QCoreApplication::instance()->organizationName();

2
libguh/libguh.pro
View File

@ -8,7 +8,7 @@ DEFINES += LIBGUH_LIBRARY
QMAKE_LFLAGS += -fPIC
target.path = /usr/lib
target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')
INSTALLS += target
# Avahi libs

30
plugins/deviceplugins/gpio/translations/de_DE.ts
View File

@ -4,20 +4,20 @@
<context>
<name>GpioController</name>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="41"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="41"/>
<source>Gpio Controller</source>
<extracomment>The name of the plugin Gpio Controller (127ead55-996a-44ac-ba82-fc3c634e018a)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="44"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="44"/>
<source>Raspberry Pi 2</source>
<extracomment>The name of the vendor (f0d00b66-bbd8-4a07-8591-ea48a61b229e)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="47"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="80"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="47"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="80"/>
<source>GPIO Switch</source>
<extracomment>The name of the DeviceClass (3885c520-e202-4435-88f6-3c35c362b2e6)
----------
@ -25,44 +25,44 @@ The name of the DeviceClass (75d54a59-f9b0-4bc4-a86c-6b1fc47e0663)</extracomment
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="50"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="50"/>
<source>GPIO</source>
<extracomment>The name of the paramType (9eda783f-6d9f-4d39-986d-d2cbfff5a7dd) of GPIO Switch</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="53"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="53"/>
<source>Pin number</source>
<extracomment>The name of the paramType (2204d278-7bc7-407f-ac82-ce3ae1d5779c) of GPIO Switch</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="56"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="56"/>
<source>Description</source>
<extracomment>The name of the paramType (504798eb-1faa-4703-a57a-2778e4bf9a67) of GPIO Switch</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="59"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="59"/>
<source>Power changed</source>
<extracomment>The name of the autocreated EventType (06843766-358e-44b0-8d52-2b46ef98459a)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="62"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="62"/>
<source>Power</source>
<extracomment>The name of the ParamType of StateType (06843766-358e-44b0-8d52-2b46ef98459a) of DeviceClass GPIO Switch</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="65"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="65"/>
<source>Set power</source>
<extracomment>The name of the autocreated ActionType (06843766-358e-44b0-8d52-2b46ef98459a)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="68"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="83"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="68"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="83"/>
<source>GPIO Button</source>
<extracomment>The name of the DeviceClass (6aff228b-0410-4ef9-9593-51e8639aacea)
----------
@ -70,19 +70,19 @@ The name of the DeviceClass (ffd2aa29-55cc-4824-ba95-c311784f7824)</extracomment
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="71"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="71"/>
<source>Pressed changed</source>
<extracomment>The name of the autocreated EventType (57f1b7cc-26c8-434b-ba04-d3077dc886c8)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="74"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="74"/>
<source>Pressed</source>
<extracomment>The name of the ParamType of StateType (57f1b7cc-26c8-434b-ba04-d3077dc886c8) of DeviceClass GPIO Button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="77"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="77"/>
<source>Beaglebone Black</source>
<extracomment>The name of the vendor (7835d14b-b455-49bd-9f31-72c6e8c3033d)</extracomment>
<translation type="unfinished"></translation>

30
plugins/deviceplugins/gpio/translations/en_US.ts
View File

@ -4,20 +4,20 @@
<context>
<name>GpioController</name>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="41"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="41"/>
<source>Gpio Controller</source>
<extracomment>The name of the plugin Gpio Controller (127ead55-996a-44ac-ba82-fc3c634e018a)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="44"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="44"/>
<source>Raspberry Pi 2</source>
<extracomment>The name of the vendor (f0d00b66-bbd8-4a07-8591-ea48a61b229e)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="47"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="80"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="47"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="80"/>
<source>GPIO Switch</source>
<extracomment>The name of the DeviceClass (3885c520-e202-4435-88f6-3c35c362b2e6)
----------
@ -25,44 +25,44 @@ The name of the DeviceClass (75d54a59-f9b0-4bc4-a86c-6b1fc47e0663)</extracomment
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="50"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="50"/>
<source>GPIO</source>
<extracomment>The name of the paramType (9eda783f-6d9f-4d39-986d-d2cbfff5a7dd) of GPIO Switch</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="53"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="53"/>
<source>Pin number</source>
<extracomment>The name of the paramType (2204d278-7bc7-407f-ac82-ce3ae1d5779c) of GPIO Switch</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="56"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="56"/>
<source>Description</source>
<extracomment>The name of the paramType (504798eb-1faa-4703-a57a-2778e4bf9a67) of GPIO Switch</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="59"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="59"/>
<source>Power changed</source>
<extracomment>The name of the autocreated EventType (06843766-358e-44b0-8d52-2b46ef98459a)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="62"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="62"/>
<source>Power</source>
<extracomment>The name of the ParamType of StateType (06843766-358e-44b0-8d52-2b46ef98459a) of DeviceClass GPIO Switch</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="65"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="65"/>
<source>Set power</source>
<extracomment>The name of the autocreated ActionType (06843766-358e-44b0-8d52-2b46ef98459a)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="68"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="83"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="68"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="83"/>
<source>GPIO Button</source>
<extracomment>The name of the DeviceClass (6aff228b-0410-4ef9-9593-51e8639aacea)
----------
@ -70,19 +70,19 @@ The name of the DeviceClass (ffd2aa29-55cc-4824-ba95-c311784f7824)</extracomment
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="71"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="71"/>
<source>Pressed changed</source>
<extracomment>The name of the autocreated EventType (57f1b7cc-26c8-434b-ba04-d3077dc886c8)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="74"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="74"/>
<source>Pressed</source>
<extracomment>The name of the ParamType of StateType (57f1b7cc-26c8-434b-ba04-d3077dc886c8) of DeviceClass GPIO Button</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/gpio/plugininfo.h" line="77"/>
<location filename="../../../../../build/plugins/deviceplugins/gpio/plugininfo.h" line="77"/>
<source>Beaglebone Black</source>
<extracomment>The name of the vendor (7835d14b-b455-49bd-9f31-72c6e8c3033d)</extracomment>
<translation type="unfinished"></translation>

12
plugins/deviceplugins/networkdetector/translations/de_DE.ts
View File

@ -4,37 +4,37 @@
<context>
<name>NetworkDetector</name>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="31"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="31"/>
<source>Network Detector</source>
<extracomment>The name of the plugin Network Detector (8e0f791e-b273-4267-8605-b7c2f55a68ab)</extracomment>
<translation>Netzwerk Detetor</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="34"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="34"/>
<source>guh</source>
<extracomment>The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6)</extracomment>
<translation>guh</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="37"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="37"/>
<source>Network Device</source>
<extracomment>The name of the DeviceClass (bd216356-f1ec-4324-9785-6982d2174e17)</extracomment>
<translation>Netwerk Gerät</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="40"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="40"/>
<source>host name</source>
<extracomment>The name of the paramType (44337c69-6101-4366-9913-ca9332da6b5c) of Network Device</extracomment>
<translation>Host Name</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="43"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="43"/>
<source>Device in network changed</source>
<extracomment>The name of the autocreated EventType (cb43e1b5-4f61-4538-bfa2-c33055c542cf)</extracomment>
<translation>Gerät im Netzwerk geändert</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="46"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="46"/>
<source>Device in network</source>
<extracomment>The name of the ParamType of StateType (cb43e1b5-4f61-4538-bfa2-c33055c542cf) of DeviceClass Network Device</extracomment>
<translation>Gerät im Netzwerk</translation>

12
plugins/deviceplugins/networkdetector/translations/en_US.ts
View File

@ -4,37 +4,37 @@
<context>
<name>NetworkDetector</name>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="31"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="31"/>
<source>Network Detector</source>
<extracomment>The name of the plugin Network Detector (8e0f791e-b273-4267-8605-b7c2f55a68ab)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="34"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="34"/>
<source>guh</source>
<extracomment>The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="37"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="37"/>
<source>Network Device</source>
<extracomment>The name of the DeviceClass (bd216356-f1ec-4324-9785-6982d2174e17)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="40"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="40"/>
<source>host name</source>
<extracomment>The name of the paramType (44337c69-6101-4366-9913-ca9332da6b5c) of Network Device</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="43"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="43"/>
<source>Device in network changed</source>
<extracomment>The name of the autocreated EventType (cb43e1b5-4f61-4538-bfa2-c33055c542cf)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/networkdetector/plugininfo.h" line="46"/>
<location filename="../../../../../build/plugins/deviceplugins/networkdetector/plugininfo.h" line="46"/>
<source>Device in network</source>
<extracomment>The name of the ParamType of StateType (cb43e1b5-4f61-4538-bfa2-c33055c542cf) of DeviceClass Network Device</extracomment>
<translation type="unfinished"></translation>

2
plugins/plugins.pri
View File

@ -33,6 +33,6 @@ translations.path = /usr/share/guh/translations
translations.files = $$[QT_SOURCE_TREE]/translations/*.qm
# Install plugin
target.path = /usr/lib/guh/plugins/
target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')/guh/plugins/
INSTALLS += target translations

35
snap/snapcraft.yaml
View File

@ -2,12 +2,13 @@ name: guhio
version: 0.1.0
summary: An open source IoT server
description: The guh daemon is a plugin based IoT (Internet of Things) server. The server works like a translator for devices, things and services and allows them to interact. With the powerful rule engine you are able to connect any device available in the system and create individual scenes and behaviors for your environment.
confinement: strict
confinement: devmode
grade: devel
apps:
guhd:
command: qt5-launch guhd -n -p
daemon: simple
plugs:
- network
- network-bind
@ -20,8 +21,15 @@ apps:
- bluez
- shutdown
guh-cli:
command: guh-cli
plugs:
- network
parts:
guhd:
# Building the whole guh project containig libguh and plugins
guh:
plugin: qmake
source: ../
options: [ CONFIG+=ccache, CONFIG+=disabletesting, CONFIG+=snappy ]
@ -29,6 +37,8 @@ parts:
project-files: [ guh.pro ]
build-packages:
- python
- ccache
- dpkg-dev
- rsync
- qtchooser
- qt5-qmake
@ -52,4 +62,23 @@ parts:
- libqt5sql5-sqlite
- logrotate
- avahi-daemon
after: [qt5conf]
after: [ guh-cli, guh-webinterface, qt5conf]
guh-cli:
plugin: python
python-version: python2
source: https://github.com/guh/guh-cli.git
source-type: git
build-packages:
- python-dev
- python-pip
- python-setuptools
build-packages:
- python-setuptools
guh-webinterface:
plugin: dump
source: https://jenkins.guh.io/view/guh-webinterface/job/guh-webinterface-all/lastBuild/artifact/guh-webinterface.tar.gz
source-type: tar
organize:
'*': guh-webinterface/