From 77494be8f9694d98c4f92f516a2c776cf8483134 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Tue, 29 Oct 2019 04:12:02 +0200 Subject: [PATCH 01/21] Adds QtCreator project files to .gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index b41ca378ac..5be47ba928 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,8 @@ javascript/new-src/node_modules .cproject .settings .vscode/ +# QtCreator project files +*.config +*.creator* +*.files +*.includes From 6eb22f051b19bd81098a797af103b35e9ee018f6 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Tue, 29 Oct 2019 04:12:32 +0200 Subject: [PATCH 02/21] Add a lint blacklist so lint checks don't fail for autogenerated files. --- .travis-ci.sh | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 466503673f..66d525bab4 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -11,6 +11,19 @@ COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coveri PYCHECKER_BLACKLIST="threading,unittest,cmd,optparse,google,google.protobuf,ssl,fftpack,lapack_lite,mtrand" +LINT_BLACKLIST=$(cat < Date: Tue, 29 Oct 2019 04:14:38 +0200 Subject: [PATCH 03/21] Proper escaping for when a \ is in the README --- plugins/convert_README_to_header.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/convert_README_to_header.sh b/plugins/convert_README_to_header.sh index 86b1b42f09..e64c215822 100755 --- a/plugins/convert_README_to_header.sh +++ b/plugins/convert_README_to_header.sh @@ -30,8 +30,8 @@ outfilename=`basename $outfile`; # See http://stackoverflow.com/a/16576291 # On Mac OS's sed, \n is not recognized as a newline character, but # \[actual newline] works -desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\"/\\\"/g' -e 's/\n/\\\\n"\\ -"/g' "$path/README.md"`; +desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's#\\\#\\\\\\\#g' -e 's#\"#\\\"#g' -e 's#\n#\\\\n"\\ +"#g' "$path/README.md"`; identifier=`echo "PLUGINS_${plugin}_${outfilename%.h}_H_" | tr '[:lower:]' '[:upper:]'` From 9edc0b0112c2274cb259031721a84952abd85305 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Tue, 29 Oct 2019 13:13:52 +0200 Subject: [PATCH 04/21] Removed line at request of Peter --- .travis-ci.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 66d525bab4..4d293ec72f 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -20,7 +20,6 @@ LINT_BLACKLIST=$(cat < Date: Wed, 30 Oct 2019 04:03:11 +0200 Subject: [PATCH 05/21] SNAKE_CASE and other consistency changes. --- .travis-ci.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 4d293ec72f..3ba65f41ab 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -11,7 +11,7 @@ COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coveri PYCHECKER_BLACKLIST="threading,unittest,cmd,optparse,google,google.protobuf,ssl,fftpack,lapack_lite,mtrand" -LINT_BLACKLIST=$(cat <&1 | grep -v "\(duplicate word\)" | wc -l) @@ -147,7 +147,7 @@ elif [[ $TASK = 'spellintian-duplicates' ]]; then make builtfiles; travis_fold end "make_builtfiles" spellingfiles=$(eval "find ./ -type f -and ! \( \ - $SPELLINGBLACKLIST \ + $SPELLING_BLACKLIST \ \) | xargs") # count the number of spellintian errors spellingerrors=$(zrun spellintian $spellingfiles 2>&1 | wc -l) @@ -173,7 +173,7 @@ elif [[ $TASK = 'codespell' ]]; then make builtfiles; travis_fold end "make_builtfiles" spellingfiles=$(eval "find ./ -type f -and ! \( \ - $SPELLINGBLACKLIST \ + $SPELLING_BLACKLIST \ \) | xargs") # count the number of codespell errors spellingerrors=$(zrun codespell --check-filenames --check-hidden --quiet 2 --regex "[a-zA-Z0-9][\\-'a-zA-Z0-9]+[a-zA-Z0-9]" --exclude-file .codespellignore $spellingfiles 2>&1 | wc -l) From c33151cdb613544b6ce82e843815725e91a52f99 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Thu, 31 Oct 2019 00:40:51 +0200 Subject: [PATCH 06/21] Fixed an embarrasing oversight. --- .travis-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 3ba65f41ab..16df5a7da4 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -19,7 +19,7 @@ LINT_BLACKLIST=$(cat <<-EO_LINT_BL -wholename "./config.h" -or \ -wholename "./plugins/*/messages/*ConfigMessages.pb.*" -or \ -wholename "./tools/ola_trigger/config.tab.*" -or \ - -wholename "./tools/ola_trigger/lex.yy.cpp" -or \ + -wholename "./tools/ola_trigger/lex.yy.cpp" EO_LINT_BL ) From 02ddd338d114de41fe3818b46e594011100c9378 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Thu, 31 Oct 2019 01:29:59 +0200 Subject: [PATCH 07/21] Spelling fixes... --- include/ola/io/OutputStream.h | 2 +- plugins/osc/README.developer.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ola/io/OutputStream.h b/include/ola/io/OutputStream.h index f8a4182a80..a0eeb6121b 100644 --- a/include/ola/io/OutputStream.h +++ b/include/ola/io/OutputStream.h @@ -14,7 +14,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * OutputStream.h - * A class that you can write structed data to. + * A class that you can write structured data to. * Copyright (C) 2012 Simon Newton */ diff --git a/plugins/osc/README.developer.md b/plugins/osc/README.developer.md index b1de49bdf4..cecc37b21e 100644 --- a/plugins/osc/README.developer.md +++ b/plugins/osc/README.developer.md @@ -228,7 +228,7 @@ Chapter 2, Plugin Boilerplate We need to reserve a plugin ID in `common/protocol/Ola.proto`. Before you pick a plugin ID, please send a message to the -[mailing list](mailto:open-lighting@googlegroups.com) so we can co-ordinate +[mailing list](mailto:open-lighting@googlegroups.com) so we can coordinate plugin IDs. Once we've assigned a plugin ID, we can run `make` in the top directory. From f1331574e08613c3e7e8a9fb6a1b19ffb651b4c4 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Thu, 31 Oct 2019 02:00:06 +0200 Subject: [PATCH 08/21] Switched sed back from '#' to '/' at Peters' request. --- plugins/convert_README_to_header.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/convert_README_to_header.sh b/plugins/convert_README_to_header.sh index e64c215822..daa66b62bf 100755 --- a/plugins/convert_README_to_header.sh +++ b/plugins/convert_README_to_header.sh @@ -30,7 +30,7 @@ outfilename=`basename $outfile`; # See http://stackoverflow.com/a/16576291 # On Mac OS's sed, \n is not recognized as a newline character, but # \[actual newline] works -desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's#\\\#\\\\\\\#g' -e 's#\"#\\\"#g' -e 's#\n#\\\\n"\\ +desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\\\/\\\\\\\/g' -e 's/\"/\\\"/g' -e 's/\n/\\\\n"\\ "#g' "$path/README.md"`; identifier=`echo "PLUGINS_${plugin}_${outfilename%.h}_H_" | tr '[:lower:]' '[:upper:]'` From 2f1b143e8fae84a19dd1e6ae351a57167913a1fc Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 3 Nov 2019 20:57:26 +0200 Subject: [PATCH 09/21] Fix spellintian "issue" --- COPYING | 4 ++-- LGPL | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/COPYING b/COPYING index a2f935aa90..3b56bfd7c7 100644 --- a/COPYING +++ b/COPYING @@ -7,8 +7,8 @@ of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] + as the successor of the GNU Library General Public License, version 2, + hence the version number 2.1.] Preamble diff --git a/LGPL b/LGPL index a2f935aa90..3b56bfd7c7 100644 --- a/LGPL +++ b/LGPL @@ -7,8 +7,8 @@ of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] + as the successor of the GNU Library General Public License, version 2, + hence the version number 2.1.] Preamble From 203fc3c2da992cbee4e3c711980c9a7eb116e414 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Wed, 6 Nov 2019 03:24:14 +0200 Subject: [PATCH 10/21] undo spellintian suggested fix of LGPL --- COPYING | 4 ++-- LGPL | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/COPYING b/COPYING index 3b56bfd7c7..a2f935aa90 100644 --- a/COPYING +++ b/COPYING @@ -7,8 +7,8 @@ of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library General Public License, version 2, - hence the version number 2.1.] + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] Preamble diff --git a/LGPL b/LGPL index 3b56bfd7c7..a2f935aa90 100644 --- a/LGPL +++ b/LGPL @@ -7,8 +7,8 @@ of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library General Public License, version 2, - hence the version number 2.1.] + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] Preamble From 5e90d9c86e5d1970bb2cf763b2a84c93292eecde Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Nov 2019 02:31:45 +0200 Subject: [PATCH 11/21] Switch Master to Ubuntu 18.04 LTS --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86eb638ad7..da9a2ad090 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,7 +104,7 @@ matrix: - PROTOBUF='3.6' - LIBFTDI='1' - os: linux - dist: xenial + dist: bionic compiler: clang env: TASK='compile' python: '2.7' From 0875169d42484d6f818a86b03619d23ec51f2a5f Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Nov 2019 02:35:17 +0200 Subject: [PATCH 12/21] Swicth Master Travis tests to Ubuntu 18.04 also remove all OS X tests of libftdi0 and CPPUnit 1.13. --- .travis.yml | 46 +--------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index da9a2ad090..74d13abf59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,50 +43,6 @@ addons: matrix: fast_finish: true include: - - os: osx - osx_image: xcode9.3 - compiler: clang - env: - - TASK='compile' - - CPPUNIT='1.13' - - LIBFTDI='0' - - os: osx - osx_image: xcode9.3 - compiler: clang - env: - - TASK='compile' - - CPPUNIT='1.14' - - LIBFTDI='0' - - os: osx - osx_image: xcode9.3 - compiler: gcc - env: - - TASK='compile' - - CPPUNIT='1.13' - - LIBFTDI='0' - - os: osx - osx_image: xcode9.3 - compiler: gcc - env: - - TASK='compile' - - CPPUNIT='1.14' - - LIBFTDI='0' - - os: osx - osx_image: xcode9.3 - compiler: clang - env: - - TASK='compile' - - CPPUNIT='1.13' - - PROTOBUF='3.6' - - LIBFTDI='1' - - os: osx - osx_image: xcode9.3 - compiler: gcc - env: - - TASK='compile' - - CPPUNIT='1.13' - - PROTOBUF='3.6' - - LIBFTDI='1' - os: osx osx_image: xcode9.3 compiler: clang @@ -116,7 +72,7 @@ matrix: - ubuntu-toolchain-r-test - llvm-toolchain-xenial-6.0 - os: linux - dist: xenial + dist: bionic compiler: gcc env: TASK='compile' python: '2.7' From f3490d3d501f856f3242f4b4c829c4bebffe7296 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Nov 2019 02:43:06 +0200 Subject: [PATCH 13/21] This time *all* references to xenial were removed, not just in the compile envs. --- .travis.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74d13abf59..b4277c270d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,7 +70,7 @@ matrix: - *core_build_clang_latest sources: - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-6.0 + - llvm-toolchain-bionic-6.0 - os: linux dist: bionic compiler: gcc @@ -83,7 +83,7 @@ matrix: sources: - ubuntu-toolchain-r-test - os: linux - dist: xenial + dist: bionic compiler: gcc env: TASK='coverage' addons: @@ -93,7 +93,7 @@ matrix: sources: - ubuntu-toolchain-r-test - os: linux - dist: xenial + dist: bionic compiler: gcc env: TASK='coverity' addons: @@ -105,7 +105,7 @@ matrix: sources: - ubuntu-toolchain-r-test - os: linux - dist: xenial + dist: bionic env: TASK='doxygen' addons: apt: @@ -116,21 +116,21 @@ matrix: sources: - ubuntu-toolchain-r-test - os: linux - dist: xenial + dist: bionic env: TASK='lint' addons: apt: packages: - *core_build - os: linux - dist: xenial + dist: bionic env: TASK='check-licences' addons: apt: packages: - *core_build - os: linux - dist: xenial + dist: bionic env: TASK='spellintian' addons: apt: @@ -138,7 +138,7 @@ matrix: - *core_build - moreutils - os: linux - dist: xenial + dist: bionic env: TASK='spellintian-duplicates' addons: apt: @@ -146,7 +146,7 @@ matrix: - *core_build - moreutils - os: linux - dist: xenial + dist: bionic env: TASK='codespell' addons: apt: @@ -154,20 +154,20 @@ matrix: - *core_build - moreutils - os: linux - dist: xenial + dist: bionic env: TASK='jshint' addons: apt: packages: - os: linux - dist: xenial + dist: bionic env: TASK='flake8' addons: apt: packages: - *base_build - os: linux - dist: xenial + dist: bionic env: TASK='pychecker' python: '2.7' addons: @@ -175,7 +175,7 @@ matrix: packages: - *base_build - os: linux - dist: xenial + dist: bionic env: TASK='pychecker-wip' python: '2.7' addons: @@ -184,22 +184,22 @@ matrix: - *base_build allow_failures: - os: linux - dist: xenial + dist: bionic compiler: gcc env: TASK='coverage' - os: linux - dist: xenial + dist: bionic compiler: gcc env: TASK='coverity' - os: linux - dist: xenial + dist: bionic env: TASK='pychecker-wip' python: '2.7' - os: linux - dist: xenial + dist: bionic env: TASK='spellintian' - os: linux - dist: xenial + dist: bionic env: TASK='spellintian-duplicates' env: From d6b90ead2b8ae79300b79b52ff1e96dcfe88a9f6 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Nov 2019 13:53:16 +0200 Subject: [PATCH 14/21] Undo changes to travis test matrix. --- .travis.yml | 84 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index b4277c270d..86eb638ad7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,50 @@ addons: matrix: fast_finish: true include: + - os: osx + osx_image: xcode9.3 + compiler: clang + env: + - TASK='compile' + - CPPUNIT='1.13' + - LIBFTDI='0' + - os: osx + osx_image: xcode9.3 + compiler: clang + env: + - TASK='compile' + - CPPUNIT='1.14' + - LIBFTDI='0' + - os: osx + osx_image: xcode9.3 + compiler: gcc + env: + - TASK='compile' + - CPPUNIT='1.13' + - LIBFTDI='0' + - os: osx + osx_image: xcode9.3 + compiler: gcc + env: + - TASK='compile' + - CPPUNIT='1.14' + - LIBFTDI='0' + - os: osx + osx_image: xcode9.3 + compiler: clang + env: + - TASK='compile' + - CPPUNIT='1.13' + - PROTOBUF='3.6' + - LIBFTDI='1' + - os: osx + osx_image: xcode9.3 + compiler: gcc + env: + - TASK='compile' + - CPPUNIT='1.13' + - PROTOBUF='3.6' + - LIBFTDI='1' - os: osx osx_image: xcode9.3 compiler: clang @@ -60,7 +104,7 @@ matrix: - PROTOBUF='3.6' - LIBFTDI='1' - os: linux - dist: bionic + dist: xenial compiler: clang env: TASK='compile' python: '2.7' @@ -70,9 +114,9 @@ matrix: - *core_build_clang_latest sources: - ubuntu-toolchain-r-test - - llvm-toolchain-bionic-6.0 + - llvm-toolchain-xenial-6.0 - os: linux - dist: bionic + dist: xenial compiler: gcc env: TASK='compile' python: '2.7' @@ -83,7 +127,7 @@ matrix: sources: - ubuntu-toolchain-r-test - os: linux - dist: bionic + dist: xenial compiler: gcc env: TASK='coverage' addons: @@ -93,7 +137,7 @@ matrix: sources: - ubuntu-toolchain-r-test - os: linux - dist: bionic + dist: xenial compiler: gcc env: TASK='coverity' addons: @@ -105,7 +149,7 @@ matrix: sources: - ubuntu-toolchain-r-test - os: linux - dist: bionic + dist: xenial env: TASK='doxygen' addons: apt: @@ -116,21 +160,21 @@ matrix: sources: - ubuntu-toolchain-r-test - os: linux - dist: bionic + dist: xenial env: TASK='lint' addons: apt: packages: - *core_build - os: linux - dist: bionic + dist: xenial env: TASK='check-licences' addons: apt: packages: - *core_build - os: linux - dist: bionic + dist: xenial env: TASK='spellintian' addons: apt: @@ -138,7 +182,7 @@ matrix: - *core_build - moreutils - os: linux - dist: bionic + dist: xenial env: TASK='spellintian-duplicates' addons: apt: @@ -146,7 +190,7 @@ matrix: - *core_build - moreutils - os: linux - dist: bionic + dist: xenial env: TASK='codespell' addons: apt: @@ -154,20 +198,20 @@ matrix: - *core_build - moreutils - os: linux - dist: bionic + dist: xenial env: TASK='jshint' addons: apt: packages: - os: linux - dist: bionic + dist: xenial env: TASK='flake8' addons: apt: packages: - *base_build - os: linux - dist: bionic + dist: xenial env: TASK='pychecker' python: '2.7' addons: @@ -175,7 +219,7 @@ matrix: packages: - *base_build - os: linux - dist: bionic + dist: xenial env: TASK='pychecker-wip' python: '2.7' addons: @@ -184,22 +228,22 @@ matrix: - *base_build allow_failures: - os: linux - dist: bionic + dist: xenial compiler: gcc env: TASK='coverage' - os: linux - dist: bionic + dist: xenial compiler: gcc env: TASK='coverity' - os: linux - dist: bionic + dist: xenial env: TASK='pychecker-wip' python: '2.7' - os: linux - dist: bionic + dist: xenial env: TASK='spellintian' - os: linux - dist: bionic + dist: xenial env: TASK='spellintian-duplicates' env: From 07f7d27277f737df75134a44b284e49639d4e2e5 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 10 Nov 2019 12:08:41 +0000 Subject: [PATCH 15/21] Fix the allowed failures OS X list after the merge --- .travis.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index 169b7b1edb..373365b62a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -256,12 +256,29 @@ matrix: - TASK='compile' - CPPUNIT='1.14' - LIBFTDI='0' + - os: osx + osx_image: xcode9.3 + compiler: clang + env: + - TASK='compile' + - CPPUNIT='1.13' + - PROTOBUF='3.6' + - LIBFTDI='1' + - os: osx + osx_image: xcode9.3 + compiler: gcc + env: + - TASK='compile' + - CPPUNIT='1.13' + - PROTOBUF='3.6' + - LIBFTDI='1' - os: osx osx_image: xcode9.3 compiler: clang env: - TASK='compile' - CPPUNIT='1.14' + - PROTOBUF='3.6' - LIBFTDI='1' - os: osx osx_image: xcode9.3 @@ -269,6 +286,7 @@ matrix: env: - TASK='compile' - CPPUNIT='1.14' + - PROTOBUF='3.6' - LIBFTDI='1' - os: linux dist: xenial From 46dad86739c6cfad68a37f15ec5e12c81bc63b52 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Nov 2019 14:20:01 +0200 Subject: [PATCH 16/21] Undid debug changes. --- common/rdm/DiscoveryAgent.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/rdm/DiscoveryAgent.cpp b/common/rdm/DiscoveryAgent.cpp index e4c412020a..b06305ef85 100644 --- a/common/rdm/DiscoveryAgent.cpp +++ b/common/rdm/DiscoveryAgent.cpp @@ -119,7 +119,6 @@ void DiscoveryAgent::InitDiscovery( // push the first range on to the branch stack UID lower(0, 0); m_uid_ranges.push(new UIDRange(lower, UID::AllDevices(), NULL)); - //m_uid_ranges.push(new UIDRange(UID(4096, 0), UID(8192, 0), NULL)); m_unmute_count = 0; m_target->UnMuteAll(m_unmute_callback.get()); @@ -131,7 +130,6 @@ void DiscoveryAgent::InitDiscovery( * devices (incremental only). */ void DiscoveryAgent::UnMuteComplete() { - OLA_INFO << "UnMuteComplete Callback!"; if (m_uid_ranges.empty()) { // Abort() was called return; From 676f39aa2db1d472ed465403e06cda9c63daabc3 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Nov 2019 14:56:19 +0200 Subject: [PATCH 17/21] Fixed regex oversight, also move to next line to prevent future oversight --- plugins/convert_README_to_header.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/convert_README_to_header.sh b/plugins/convert_README_to_header.sh index daa66b62bf..92a47f1daa 100755 --- a/plugins/convert_README_to_header.sh +++ b/plugins/convert_README_to_header.sh @@ -30,8 +30,8 @@ outfilename=`basename $outfile`; # See http://stackoverflow.com/a/16576291 # On Mac OS's sed, \n is not recognized as a newline character, but # \[actual newline] works -desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\\\/\\\\\\\/g' -e 's/\"/\\\"/g' -e 's/\n/\\\\n"\\ -"#g' "$path/README.md"`; +desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\\\/\\\\\\\/g' -e 's/\"/\\\"/g'\ + -e 's/\n/\\\\n/g' "$path/README.md"`; identifier=`echo "PLUGINS_${plugin}_${outfilename%.h}_H_" | tr '[:lower:]' '[:upper:]'` From a54ee4d2f63c658637f03cd0357d26ded2a31a2d Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Nov 2019 15:52:59 +0200 Subject: [PATCH 18/21] Modified regex to insert newlines. --- plugins/convert_README_to_header.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/convert_README_to_header.sh b/plugins/convert_README_to_header.sh index 92a47f1daa..49bd1c608a 100755 --- a/plugins/convert_README_to_header.sh +++ b/plugins/convert_README_to_header.sh @@ -31,7 +31,7 @@ outfilename=`basename $outfile`; # On Mac OS's sed, \n is not recognized as a newline character, but # \[actual newline] works desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\\\/\\\\\\\/g' -e 's/\"/\\\"/g'\ - -e 's/\n/\\\\n/g' "$path/README.md"`; + -e 's/\n/\\\\n\" \+ \n\"/g' "$path/README.md"`; identifier=`echo "PLUGINS_${plugin}_${outfilename%.h}_H_" | tr '[:lower:]' '[:upper:]'` From 133d3e0351b52dfab45459148bf55042d05e9a84 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Nov 2019 16:35:31 +0200 Subject: [PATCH 19/21] remove unneeded \+ --- plugins/convert_README_to_header.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/convert_README_to_header.sh b/plugins/convert_README_to_header.sh index 49bd1c608a..4dd39d058b 100755 --- a/plugins/convert_README_to_header.sh +++ b/plugins/convert_README_to_header.sh @@ -31,7 +31,7 @@ outfilename=`basename $outfile`; # On Mac OS's sed, \n is not recognized as a newline character, but # \[actual newline] works desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\\\/\\\\\\\/g' -e 's/\"/\\\"/g'\ - -e 's/\n/\\\\n\" \+ \n\"/g' "$path/README.md"`; + -e 's/\n/\\\\n\"\n\"/g' "$path/README.md"`; identifier=`echo "PLUGINS_${plugin}_${outfilename%.h}_H_" | tr '[:lower:]' '[:upper:]'` From 426654ce6978c115b3c4f690127655b98268bb8a Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Mon, 11 Nov 2019 01:55:28 +0200 Subject: [PATCH 20/21] Explicitely switches script to bash, correctly renders newlines and checks for sed failure. newlines need to be checked on OS X --- plugins/convert_README_to_header.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/convert_README_to_header.sh b/plugins/convert_README_to_header.sh index 4dd39d058b..1bec4df85e 100755 --- a/plugins/convert_README_to_header.sh +++ b/plugins/convert_README_to_header.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # A simple script to build a C++ header file containing the plugin description # from the plugin's README.md @@ -31,7 +31,13 @@ outfilename=`basename $outfile`; # On Mac OS's sed, \n is not recognized as a newline character, but # \[actual newline] works desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\\\/\\\\\\\/g' -e 's/\"/\\\"/g'\ - -e 's/\n/\\\\n\"\n\"/g' "$path/README.md"`; + -e 's/\n/\\\\n\"\ +\"/g' "$path/README.md"`; + +if (( $? != 0 )); then + echo 'Sed failed to generate $desc' + exit 1 +fi identifier=`echo "PLUGINS_${plugin}_${outfilename%.h}_H_" | tr '[:lower:]' '[:upper:]'` From 80908c31a62416024b44ae138bf375410ae0ee00 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Mon, 11 Nov 2019 02:16:27 +0200 Subject: [PATCH 21/21] revert --- plugins/convert_README_to_header.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/plugins/convert_README_to_header.sh b/plugins/convert_README_to_header.sh index 1bec4df85e..e7bf244828 100755 --- a/plugins/convert_README_to_header.sh +++ b/plugins/convert_README_to_header.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # A simple script to build a C++ header file containing the plugin description # from the plugin's README.md @@ -31,13 +31,8 @@ outfilename=`basename $outfile`; # On Mac OS's sed, \n is not recognized as a newline character, but # \[actual newline] works desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\\\/\\\\\\\/g' -e 's/\"/\\\"/g'\ - -e 's/\n/\\\\n\"\ -\"/g' "$path/README.md"`; - -if (( $? != 0 )); then - echo 'Sed failed to generate $desc' - exit 1 -fi + -e 's/\n/\\\\n"\\ +"/g' "$path/README.md"`; identifier=`echo "PLUGINS_${plugin}_${outfilename%.h}_H_" | tr '[:lower:]' '[:upper:]'`