Merge branch 'release/0.8'

.lgtm.yml

@@ -0,0 +1,43 @@
+path_classifiers:
+  library:
+    - libhwif/
+  test:
+    - test/
+
+extraction:
+  cpp:
+    prepare:
+      packages:
+        - libssl-dev
+        - doxygen
+        - uuid-dev
+        - pkg-config
+        - qt5-default
+        - qtbase5-dev
+        - qtbase5-dev-tools
+        - qtdeclarative5-dev
+        - qtmultimedia5-dev
+        - qtquickcontrols2-5-dev
+        - qtdeclarative5-dev-tools
+
+    after_prepare:    # Customizable step used by all languages.
+      - cmake --version
+
+    configure:    # Customizable step used only by C/C++ extraction.
+      command:
+        - cmake
+            -DCMAKE_BUILD_TYPE=Release
+            -DBUILD_TESTS=Off
+            -DTEST_COVERAGE=Off
+            -DBUILD_GTEST_FROM_SRC=Off
+            -H$LGTM_SRC
+            -B$LGTM_WORKSPACE
+
+    before_index:    # Customizable step used by all languages.
+      - echo "before_index"
+
+    index:    # Customizable step used by all languages.
+      build_command:
+        - cmake --build $LGTM_WORKSPACE --parallel
+
+  javascript:

.travis.yml

@@ -1,5 +1,3 @@
-sudo: required
-
 env:
   BUILD_DIR=/tmp/build
   SRC_DIR=/tmp/checkout
@@ -10,7 +8,7 @@ services:
 before_install:
   - docker pull ruschi/devlinuxqtquick2:latest
   - docker version
-  - docker run -itd --name build_container ruschi/devlinuxqtquick2
+  - docker run -itd  --privileged --name build_container ruschi/devlinuxqtquick2
   - docker exec build_container git clone https://github.com/truschival/DigitalRoosterGui.git $SRC_DIR
 
 script:

AzureBuildServer/Readme.md → AzureBuildServer/README.md

@@ -1,30 +1,30 @@
-How to create a Jenkins Buildserver on Azure
-===================
+#How to create a Jenkins Buildserver on Azure
 
 This repo contains snippets of information on how to interact with MS Azure.
 
 ---
 
-# Create a Virtual Machine from a cloud init file
+## Create a Virtual Machine from a cloud init file
 
 This command uses the smallest VM size Azure offers and initializes the VM with
 the file `jenkins-on-osdisk.yaml` meaning no sparate Data-Disk is created.  This
 repo contains some cloud init files that create a minimal VM with Jenkins and
 Docker.
 
+    ```sh
 	az vm create -g BuildServer --name JenkinsOnOsDisk  \
 	--image Canonical:UbuntuServer:16.04-LTS:latest \
 	--size Standard_A1   --admin-username thomas  \
 	--ssh-key-value id_rsa.pub \
 	--custom-data jenkins-on-osdisk.yaml
+    ```
 
-# Open and forward ports from the Internet to the VM
+## Open and forward ports from the Internet to the VM
 
 Per default a VM is not reachable from the Internet, to allow this we have to
 open a TCP port.
-
+
+	```sh
 	az vm open-port -g BuildServer --name JenkinsOnOsDisk \
 	--port 8080 --priority 1001
-
-
-
+    ```

CMakeLists.txt

@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH  ${CMAKE_SOURCE_DIR}/CMakeModules/)
 # Project Name
 MESSAGE( STATUS "Running ${CMAKE_COMMAND} v${CMAKE_VERSION}" )
 PROJECT(DigitalRooster
-	VERSION 0.7.1
+	VERSION 0.8.0
 	DESCRIPTION  "A digital alarm clock and podcast player"
 	LANGUAGES CXX C
 	)
@@ -50,7 +50,7 @@ endif(UNIX)
 
 SET(SYSTEM_TARGET_NAME "Host"
   CACHE STRING "Target: {Host|Rpi}")
-SET(SETTINGS_FILE_NAME "digitalrooster.json"
+SET(SETTINGS_FILE_NAME "${CMAKE_PROJECT_NAME}.json"
   CACHE STRING "application configuration file name")
 SET(WIFI_INTERFACE "/var/run/wpa_supplicant/wlp2s0"
   CACHE STRING "wpa_supplicant interface contrl socket path")
@@ -140,7 +140,7 @@ include_directories(${PROJECT_INCLUDE_DIR} ${GENERATED_DIR})
 SET(COMPONENT_NAME ${PROJECT_NAME})
 
 # Make debug libs visible per default ->  SET_TARGET_PROPERTIES
-SET(CMAKE_DEBUG_POSTFIX "_dbg")
+SET(CMAKE_DEBUG_POSTFIX "d")
 # (CMAKE_BINARY_DIR = where cmake was invoked and found project())
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY	"${PROJECT_BINARY_DIR}/bin/")
 # Folder for libraries (during build)
@@ -217,7 +217,7 @@ if(DOXYGEN_FOUND)
 	  )
 
     # detailed module doumentation is not always generated (no ALL after target)
-    add_custom_target(DOC
+    add_custom_target(apidoc
         ${DOXYGEN_EXECUTABLE} ${GENERATED_DIR}/Doxyfile
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Generate documentation"
@@ -280,7 +280,7 @@ SET(CPACK_COMPONENT_APIDOC_DISPLAY_NAME "API Documentation")
 SET(CPACK_COMPONENT_DEVELOP_DESCRIPTION "Components needed for development")
 SET(CPACK_COMPONENT_APIDOC_DESCRIPTION  "API Documentation")
 
-SET(CPACK_NSIS_CONTACT "t.ruschival@gmail.com")
+SET(CPACK_NSIS_CONTACT "thomas@ruschival.de")
 SET(CPACK_NSIS_MODIFY_PATH ON)
 
 INCLUDE(CPack)

CREDITS

@@ -0,0 +1,10 @@
+We gratefully acknowledge all those who reviewed or helped develop
+DigitalRooster.
+That includes everyone who provided commits, contribution to the 
+issue tracker, or via pull requests.
+
+Alphabetically by last name, contributors include:
+
+Ruschival, Thomas
+
+and hopefully soon more people

LICENSE

@@ -1,121 +1,16 @@
-DigitalRooster 
-
-Copyright 2018 by Thomas Ruschival <thomas@ruschival.de>
-
-licenced under the GNU PUBLIC LICENSE Version 3.
-
-DigitalRooster uses Qmlbridgeformaterialfonts software by Kevin Carlso
-(https://github.com/kevincarlson/QmlBridgeForMaterialDesignIcons)
-licenced under the SIL Open Font License, Version 1.1.
-
-DigitalRooster uses wpa_ctrl.h and wpa_ctrl.c 
-Copyright (c) 2002-2018, Jouni Malinen <j@w1.fi> and contributors 
-licensed under BSD license.
-
-The font materialdesignicons-webfont.ttf is licensed under SIL Open
-Font License, Version 1.1. (http://scripts.sil.org/OFL) and copyright
-belongs to:
-
-Copyright (c) 2014, Austin Andrews (http://materialdesignicons.com/),
-with Reserved Font Name Material Design Icons.  Copyright (c) 2014,
-Google (http://www.google.com/design/) uses the license at
-https://github.com/google/material-design-icons/blob/master/LICENSE
-
------------------------------------------------------------
-
-The fallback alarm "TempleBell" is recorded by Mike Koenig 
-License: Attribution 3.0
-http://soundbible.com/1531-Temple-Bell.html
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-
-The goals of the Open Font License (OFL) are to stimulate
-worldwide development of collaborative font projects, to support the
-font creation efforts of academic and linguistic communities, and to
-provide a free and open framework in which fonts may be shared and
-improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to,
-deleting, or substituting -- in part or in whole -- any of the
-components of the Original Version, by changing formats or by porting
-the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed,
-modify, redistribute, and sell modified and unmodified copies of the
-Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the
-corresponding Copyright Holder. This restriction only applies to the
-primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+DigitalRoosterGui  - A free Internet radio, podcast player and alarmclock 
 
+  Copyright (c) 2018 by Thomas Ruschival <thomas@ruschival.de>
+
+    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.
 
 ----------------------------------------------------------------------
                     GNU GENERAL PUBLIC LICENSE
@@ -738,93 +633,4 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
-
-
------------------------------------------------------------
-BSD license for wpa_supplicant code
-Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
------------------------------------------------------------
-
-This software may be distributed, used, and modified under the terms of
-BSD license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name(s) of the above-listed copyright holder(s) nor the
-   names of its contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+                     END OF TERMS AND CONDITIONS