From 6399c95d4ee9bbe5313a28c2116d5e6d161607bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 21 Aug 2018 22:16:45 +0200 Subject: [PATCH] Add monitor package --- ...l => nymea-remoteproxy-monitor.install.in} | 0 monitor/monitor.cpp | 21 +++++++++++++++++++ monitor/monitor.pro | 10 ++++----- nymea-remoteproxy.pri | 2 +- nymea-remoteproxy.pro | 9 +++++++- 5 files changed, 35 insertions(+), 7 deletions(-) rename debian/{nymea-remoteproxy-monitor.install => nymea-remoteproxy-monitor.install.in} (100%) diff --git a/debian/nymea-remoteproxy-monitor.install b/debian/nymea-remoteproxy-monitor.install.in similarity index 100% rename from debian/nymea-remoteproxy-monitor.install rename to debian/nymea-remoteproxy-monitor.install.in diff --git a/monitor/monitor.cpp b/monitor/monitor.cpp index 1b48168..ad20952 100644 --- a/monitor/monitor.cpp +++ b/monitor/monitor.cpp @@ -1,3 +1,24 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Simon Stürz * + * * + * This file is part of nymea-remoteproxy. * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #include "monitor.h" Monitor::Monitor(const QString &serverName, QObject *parent) : QObject(parent) diff --git a/monitor/monitor.pro b/monitor/monitor.pro index 49dbf05..d455aa8 100644 --- a/monitor/monitor.pro +++ b/monitor/monitor.pro @@ -3,6 +3,11 @@ include(../nymea-remoteproxy.pri) TARGET = nymea-remoteproxy-monitor TEMPLATE = app +HEADERS += \ + monitorclient.h \ + terminalwindow.h \ + monitor.h + SOURCES += main.cpp \ monitorclient.cpp \ terminalwindow.cpp \ @@ -12,8 +17,3 @@ LIBS += -lncurses target.path = /usr/bin INSTALLS += target - -HEADERS += \ - monitorclient.h \ - terminalwindow.h \ - monitor.h diff --git a/nymea-remoteproxy.pri b/nymea-remoteproxy.pri index 11a8db2..0d27513 100644 --- a/nymea-remoteproxy.pri +++ b/nymea-remoteproxy.pri @@ -5,7 +5,7 @@ QT -= gui SERVER_NAME=nymea-remoteproxy API_VERSION_MAJOR=0 API_VERSION_MINOR=1 -SERVER_VERSION=0.1.1 +SERVER_VERSION=0.1.2 DEFINES += SERVER_NAME_STRING=\\\"$${SERVER_NAME}\\\" \ SERVER_VERSION_STRING=\\\"$${SERVER_VERSION}\\\" \ diff --git a/nymea-remoteproxy.pro b/nymea-remoteproxy.pro index aeb7020..b2c93ec 100644 --- a/nymea-remoteproxy.pro +++ b/nymea-remoteproxy.pro @@ -1,7 +1,11 @@ include(nymea-remoteproxy.pri) TEMPLATE=subdirs -SUBDIRS += server client monitor libnymea-remoteproxy libnymea-remoteproxyclient tests +SUBDIRS += server client libnymea-remoteproxy libnymea-remoteproxyclient tests + +!disablemonitor { + SUBDIRS+=monitor +} server.depends = libnymea-remoteproxy client.depends = libnymea-remoteproxyclient @@ -15,3 +19,6 @@ message("Qt version:" $$[QT_VERSION]) coverage { message("Building with coverage report") } ccache { message("Building with ccache support") } +disablemonitor { + message("Building without the monitor") +}