From a1da55b92f16797fc79e2a12fa803d5c1a90eada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 27 Jul 2021 11:49:46 +0200 Subject: [PATCH] Update install paths and copyright license headers --- client/client.pro | 2 +- client/main.cpp | 2 +- libnymea-remoteproxy/tcpsocketserver.h | 46 ++++++++++-------- .../tcpsocketconnection.cpp | 47 +++++++++++-------- .../tcpsocketconnection.h | 46 ++++++++++-------- monitor/monitor.pro | 2 +- server/main.cpp | 2 +- server/server.pro | 2 +- tests/test-offline/test-offline.pro | 2 +- tests/test-online/test-online.pro | 2 +- 10 files changed, 86 insertions(+), 67 deletions(-) diff --git a/client/client.pro b/client/client.pro index c50791f..4af05f0 100644 --- a/client/client.pro +++ b/client/client.pro @@ -11,7 +11,7 @@ LIBS += -L$$top_builddir/libnymea-remoteproxyclient/ -lnymea-remoteproxyclient SOURCES += main.cpp \ proxyclient.cpp -target.path = /usr/bin +target.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += target HEADERS += \ diff --git a/client/main.cpp b/client/main.cpp index adfc87f..c7586a6 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) "a server application as client perspective.\n\n" "Version: %1\n" "API version: %2\n\n" - "Copyright %3 2018 Simon Stürz \n") + "Copyright %3 2021 nymea GmbH \n") .arg(SERVER_VERSION_STRING) .arg(API_VERSION_STRING) .arg(QChar(0xA9))); diff --git a/libnymea-remoteproxy/tcpsocketserver.h b/libnymea-remoteproxy/tcpsocketserver.h index 5d6af91..82bea88 100644 --- a/libnymea-remoteproxy/tcpsocketserver.h +++ b/libnymea-remoteproxy/tcpsocketserver.h @@ -1,23 +1,29 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * * - * Copyright (C) 2019 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 . * - * * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +* +* Copyright 2013 - 2020, nymea GmbH +* Contact: contact@nymea.io +* +* This file is part of nymea. +* This project including source code and documentation is protected by copyright law, and +* remains the property of nymea GmbH. All rights, including reproduction, publication, +* editing and translation, are reserved. The use of this project is subject to the terms of a +* license agreement to be concluded with nymea GmbH in accordance with the terms +* of use of nymea GmbH, available under https://nymea.io/license +* +* GNU General Public License Usage +* Alternatively, this project may be redistributed and/or modified under +* the terms of the GNU General Public License as published by the Free Software Foundation, +* GNU version 3. this project 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 project. +* If not, see . +* +* For any further details and any questions please contact us under contact@nymea.io +* or see our FAQ/Licensing Information on https://nymea.io/license/faq +* +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #ifndef TCPSOCKETSERVER_H #define TCPSOCKETSERVER_H diff --git a/libnymea-remoteproxyclient/tcpsocketconnection.cpp b/libnymea-remoteproxyclient/tcpsocketconnection.cpp index 4ad69a3..213573b 100644 --- a/libnymea-remoteproxyclient/tcpsocketconnection.cpp +++ b/libnymea-remoteproxyclient/tcpsocketconnection.cpp @@ -1,25 +1,32 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * * - * Copyright (C) 2019 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 . * - * * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +* +* Copyright 2013 - 2020, nymea GmbH +* Contact: contact@nymea.io +* +* This file is part of nymea. +* This project including source code and documentation is protected by copyright law, and +* remains the property of nymea GmbH. All rights, including reproduction, publication, +* editing and translation, are reserved. The use of this project is subject to the terms of a +* license agreement to be concluded with nymea GmbH in accordance with the terms +* of use of nymea GmbH, available under https://nymea.io/license +* +* GNU General Public License Usage +* Alternatively, this project may be redistributed and/or modified under +* the terms of the GNU General Public License as published by the Free Software Foundation, +* GNU version 3. this project 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 project. +* If not, see . +* +* For any further details and any questions please contact us under contact@nymea.io +* or see our FAQ/Licensing Information on https://nymea.io/license/faq +* +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "tcpsocketconnection.h" + Q_LOGGING_CATEGORY(dcRemoteProxyClientTcpSocket, "RemoteProxyClientTcpSocket") namespace remoteproxyclient { diff --git a/libnymea-remoteproxyclient/tcpsocketconnection.h b/libnymea-remoteproxyclient/tcpsocketconnection.h index 934536e..384a8dc 100644 --- a/libnymea-remoteproxyclient/tcpsocketconnection.h +++ b/libnymea-remoteproxyclient/tcpsocketconnection.h @@ -1,23 +1,29 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * * - * Copyright (C) 2019 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 . * - * * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +* +* Copyright 2013 - 2020, nymea GmbH +* Contact: contact@nymea.io +* +* This file is part of nymea. +* This project including source code and documentation is protected by copyright law, and +* remains the property of nymea GmbH. All rights, including reproduction, publication, +* editing and translation, are reserved. The use of this project is subject to the terms of a +* license agreement to be concluded with nymea GmbH in accordance with the terms +* of use of nymea GmbH, available under https://nymea.io/license +* +* GNU General Public License Usage +* Alternatively, this project may be redistributed and/or modified under +* the terms of the GNU General Public License as published by the Free Software Foundation, +* GNU version 3. this project 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 project. +* If not, see . +* +* For any further details and any questions please contact us under contact@nymea.io +* or see our FAQ/Licensing Information on https://nymea.io/license/faq +* +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #ifndef TCPSOCKETCONNECTION_H #define TCPSOCKETCONNECTION_H diff --git a/monitor/monitor.pro b/monitor/monitor.pro index d455aa8..983cb61 100644 --- a/monitor/monitor.pro +++ b/monitor/monitor.pro @@ -15,5 +15,5 @@ SOURCES += main.cpp \ LIBS += -lncurses -target.path = /usr/bin +target.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += target diff --git a/server/main.cpp b/server/main.cpp index 0a8a67a..1e95df4 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) "registered nymea deamons to establish a tunnel connection.\n\n" "Version: %1\n" "API version: %2\n\n" - "Copyright %3 2018 Simon Stürz \n") + "Copyright %3 2021 nymea GmbH \n") .arg(SERVER_VERSION_STRING) .arg(API_VERSION_STRING) .arg(QChar(0xA9))); diff --git a/server/server.pro b/server/server.pro index eb044bb..2689bdf 100644 --- a/server/server.pro +++ b/server/server.pro @@ -10,7 +10,7 @@ LIBS += -L$$top_builddir/libnymea-remoteproxy/ -lnymea-remoteproxy SOURCES += main.cpp \ remoteproxyserverapplication.cpp -target.path = /usr/bin +target.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += target HEADERS += \ diff --git a/tests/test-offline/test-offline.pro b/tests/test-offline/test-offline.pro index 51e64f3..c6db854 100644 --- a/tests/test-offline/test-offline.pro +++ b/tests/test-offline/test-offline.pro @@ -10,5 +10,5 @@ HEADERS += nymea-remoteproxy-tests-offline.h SOURCES += nymea-remoteproxy-tests-offline.cpp -target.path = /usr/bin +target.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += target diff --git a/tests/test-online/test-online.pro b/tests/test-online/test-online.pro index 30c87ab..9f20b41 100644 --- a/tests/test-online/test-online.pro +++ b/tests/test-online/test-online.pro @@ -7,5 +7,5 @@ HEADERS += nymea-remoteproxy-tests-online.h SOURCES += nymea-remoteproxy-tests-online.cpp -target.path = /usr/bin +target.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += target