From 7382e5ed177672f2287e8d94a2a7dda7d705da2e Mon Sep 17 00:00:00 2001 From: "C.D. MacEachern" Date: Thu, 10 Oct 2019 12:03:32 -0400 Subject: [PATCH] 2.0.1 zip release --- CHANGELOG | 5 +- LICENSES.txt | 6 +- README.md | 44 ++--------- controls.cpp | 3 + license.txt => gpl.txt | 0 lgpl.txt | 165 +++++++++++++++++++++++++++++++++++++++++ main.cpp | 4 + openroll-config.h | 2 +- openroll.pro | 19 +++-- scoreboard.cpp | 3 + 10 files changed, 203 insertions(+), 48 deletions(-) rename license.txt => gpl.txt (100%) create mode 100644 lgpl.txt diff --git a/CHANGELOG b/CHANGELOG index adc189a..e66a5f8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ - +2.0.1: * BUG: clicking test sound disabled play/pause until reset button pressed. Removed that limitation. +* Dynamically linked build for LGPL compliance and easier releases +* Licenses files renamed and cleaned up LICENSES.txt file +* README reduced and simplified. 2.0.0: * Huge speedboost on load diff --git a/LICENSES.txt b/LICENSES.txt index eb1dbd2..c9cca26 100644 --- a/LICENSES.txt +++ b/LICENSES.txt @@ -1,10 +1,14 @@ +Qt framework is used under the Lesser GNU Public License, version 3. See (https://www.gnu.org/licenses/lgpl-3.0.txt) for terms, and +GNU Public License, version 3 (https://www.gnu.org/licenses/gpl-3.0.txt), on which it is based. Both licenses are provided with +openroll as 'lgpl.txt' and 'gpl.txt' in the installation directory. + Image files in provided in Openroll provided from Google, copyright (c) 2014, Google (https://material.io/tools/icons/), used under Apache License 2.0, found at: https://www.apache.org/licenses/LICENSE-2.0.html "airhorn.wav" by guitarguy1985 (http://soundbible.com/1450-Air-Horn.html) is licensed by C.D. MacEachern under CC Sampling Plus 1.0 (https://creativecommons.org/licenses/sampling+/1.0/legalcode) -"basketballbuzzer.wav" by nofeedbak (http://soundbible.com/1495-Basketball-Buzzer.html) is license by C.D. MacEachern +"basketballbuzzer.wav" by nofeedbak (http://soundbible.com/1495-Basketball-Buzzer.html) is licensed by C.D. MacEachern under CC Sampling Plus 1.0 (https://creativecommons.org/licenses/sampling+/1.0/legalcode) diff --git a/README.md b/README.md index 91c42bc..1cb3ff8 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,17 @@ # Openroll -[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) + +[![License: LGPL v3](https://img.shields.io/badge/License-LGPLv3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) Openroll is a free and open-source scoreboard and match timer for IBJJF-rules Brazilian Jiu-Jitsu. It is not affiliated with the IBJJF in any way. [![Download Openroll](https://img.shields.io/sourceforge/dt/openroll.svg)](https://sourceforge.net/projects/openroll/files/latest/download) -# Installation -[![Download Openroll](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/openroll/files/latest/download) - -# Development -To build debug and/or release builds on a Windows machine, you will need: - -* MSYS2: using msys2.exe interpreter install packages 'qt5-static' and 'qt-creator' to be -able to build Qt 5 statically for Windows using MinGW-w64 toolchain. The details are at: -[https://wiki.qt.io/MSYS2](MSYS2 Wiki). - -## Troubleshooting Builds -Make sure first that you can build and run a Qt program by opening Qt Creator -and loading an example project. If you can't build it hopefully you'll be given -a hint as to what you need to do or what went wrong and you can Google the -error code/string. Troubleshooting building Openroll is outside the scope of -this document. - ## Licenses + This file is part of Openroll. Copyright (C) 2019 C.D.MacEachern -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 the [GNU General Public -License](https://www.gnu.org/licenses/). - -Images are licensed by C.D. MacEachern under [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -from Google (C) 2014. -See file LICENSES.txt for more details. - -Sound files are licensed by C.D. MacEachern under [CC BY -3.0](https://creativecommons.org/licenses/by/3.0/legalcode). See file -LICENSES.txt for more details. +See LICENSES.txt file for attributions and licensing details. LGPLv3 is provided as 'lgpl.txt', +and GPLv3 is provided as 'gpl.txt' with the installation. diff --git a/controls.cpp b/controls.cpp index e9cfee4..a8a6e6d 100644 --- a/controls.cpp +++ b/controls.cpp @@ -2,6 +2,9 @@ #include "openroll-config.h" #include "scoreboard.h" #include "ui_controls.h" +#ifdef QT_DEBUG +#include "logger.h" +#endif #include #include #include diff --git a/license.txt b/gpl.txt similarity index 100% rename from license.txt rename to gpl.txt diff --git a/lgpl.txt b/lgpl.txt new file mode 100644 index 0000000..6163256 --- /dev/null +++ b/lgpl.txt @@ -0,0 +1,165 @@ +GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + + +This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + +0. Additional Definitions. + +As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + +"The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + +An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + +A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + +The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + +The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + +1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + +2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + +a) under this License, provided that you make a good faith effort to +ensure that, in the event an Application does not supply the +function or data, the facility still operates, and performs +whatever part of its purpose remains meaningful, or + +b) under the GNU GPL, with none of the additional permissions of +this License applicable to that copy. + +3. Object Code Incorporating Material from Library Header Files. + +The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + +a) Give prominent notice with each copy of the object code that the +Library is used in it and that the Library and its use are +covered by this License. + +b) Accompany the object code with a copy of the GNU GPL and this license +document. + +4. Combined Works. + +You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + +a) Give prominent notice with each copy of the Combined Work that +the Library is used in it and that the Library and its use are +covered by this License. + +b) Accompany the Combined Work with a copy of the GNU GPL and this license +document. + +c) For a Combined Work that displays copyright notices during +execution, include the copyright notice for the Library among +these notices, as well as a reference directing the user to the +copies of the GNU GPL and this license document. + +d) Do one of the following: + +0) Convey the Minimal Corresponding Source under the terms of this +License, and the Corresponding Application Code in a form +suitable for, and under terms that permit, the user to +recombine or relink the Application with a modified version of +the Linked Version to produce a modified Combined Work, in the +manner specified by section 6 of the GNU GPL for conveying +Corresponding Source. + +1) Use a suitable shared library mechanism for linking with the +Library. A suitable mechanism is one that (a) uses at run time +a copy of the Library already present on the user's computer +system, and (b) will operate properly with a modified version +of the Library that is interface-compatible with the Linked +Version. + +e) Provide Installation Information, but only if you would otherwise +be required to provide such information under section 6 of the +GNU GPL, and only to the extent that such information is +necessary to install and execute a modified version of the +Combined Work produced by recombining or relinking the +Application with a modified version of the Linked Version. (If +you use option 4d0, the Installation Information must accompany +the Minimal Corresponding Source and Corresponding Application +Code. If you use option 4d1, you must provide the Installation +Information in the manner specified by section 6 of the GNU GPL +for conveying Corresponding Source.) + +5. Combined Libraries. + +You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + +a) Accompany the combined library with a copy of the same work based +on the Library, uncombined with any other library facilities, +conveyed under the terms of this License. + +b) Give prominent notice with the combined library that part of it +is a work based on the Library, and explaining where to find the +accompanying uncombined form of the same work. + +6. Revised Versions of the GNU Lesser General Public License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/main.cpp b/main.cpp index e1d9350..117c8cb 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,8 @@ #include "controls.h" #include +#ifdef QT_DEBUG #include "logger.h" +#endif #include int main(int argc, char *argv[]) { @@ -13,8 +15,10 @@ int main(int argc, char *argv[]) { &Controls::onAboutToQuit); controls.show(); +#ifdef QT_DEBUG qInfo() << "Using log file named: " << logger::filename; logger::attach(); +#endif return app.exec(); } diff --git a/openroll-config.h b/openroll-config.h index 38c4c4c..ab27a6f 100644 --- a/openroll-config.h +++ b/openroll-config.h @@ -5,7 +5,7 @@ const QString MAJOR_VERSION = "2"; const QString MINOR_VERSION = "0"; -const QString PATCH_VERSION = "0"; +const QString PATCH_VERSION = "1"; const QString OPENROLL_VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + PATCH_VERSION; #endif // OPENROLLCONFIG_H diff --git a/openroll.pro b/openroll.pro index 026af9e..d260e01 100644 --- a/openroll.pro +++ b/openroll.pro @@ -2,7 +2,7 @@ QT += multimedia widgets TARGET = openroll TEMPLATE = app -VERSION = 2.0.0 +VERSION = 2.0.1 # for Windows resource-file QMAKE_TARGET_COMPANY = "Barker Software" @@ -36,23 +36,30 @@ FORMS += \ RESOURCES += \ resources.qrc -# supported by UnixMake specs only, put these in DESTDIR with TARGET +# only works with Unix makefiles, Windows you have to copy these manually or with script DISTFILES += \ AUTHORS \ CHANGELOG \ LICENSES.txt \ README.md \ - license.txt + gpl.txt \ + lgpl.txt -win32: { +win32 { RC_ICONS = openroll.ico +#ifdef QT_DEBUG + CONFIG += console +#else + CONFIG -= console +#endif } -osx: { +osx { # Same, but for Apple, use osx tool to convert .ico to .icns file first ICON = openroll.icns + CONFIG += app_bundle } -linux: { +linux { } diff --git a/scoreboard.cpp b/scoreboard.cpp index 21671e6..9c7f439 100644 --- a/scoreboard.cpp +++ b/scoreboard.cpp @@ -1,5 +1,8 @@ #include "scoreboard.h" #include "ui_scoreboard.h" +#ifdef QT_DEBUG +#include "logger.h" +#endif #include /**