From 6d599cb6fe2b3a9c2af85bc516ff412886acbae2 Mon Sep 17 00:00:00 2001 From: Nils <> Date: Sat, 2 Jan 2021 00:38:03 +0100 Subject: [PATCH] update template --- template/Makefile.in | 1 - template/documentation/readme.template | 6 +++--- template/engine/api.py | 2 +- template/engine/data.py | 2 +- template/engine/duration.py | 2 +- template/engine/history.py | 2 +- template/engine/input_midi.py | 2 +- template/engine/ly2cbox.py | 2 +- template/engine/metronome.py | 2 +- template/engine/midi.py | 2 +- template/engine/pitch.py | 2 +- template/engine/sampler_sf2.py | 2 +- template/engine/sequencer.py | 2 +- template/engine/session.py | 2 +- template/helper.py | 2 +- template/qtgui/about.py | 2 +- template/qtgui/chooseSessionDirectory.py | 2 +- template/qtgui/constantsAndConfigs.py | 2 +- template/qtgui/debugScript.py | 2 +- template/qtgui/eventloop.py | 2 +- template/qtgui/helper.py | 2 +- template/qtgui/mainwindow.py | 2 +- template/qtgui/menu.py | 2 +- template/qtgui/nsmclient.py | 2 +- template/qtgui/nsmsingleserver.py | 2 +- template/qtgui/submenus.py | 2 +- template/qtgui/usermanual.py | 2 +- template/start.py | 2 +- 28 files changed, 29 insertions(+), 30 deletions(-) diff --git a/template/Makefile.in b/template/Makefile.in index 63b700a..24c8c69 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -45,7 +45,6 @@ clean: rm -rf build/ rm -rf sitepackages rm -f "$(PROGRAM).bin" - rm -rf "$(PROGRAM).build" rm Makefile find . -type d -name "__pycache__" -exec rm -r {} + diff --git a/template/documentation/readme.template b/template/documentation/readme.template index 207484c..49d71a4 100644 --- a/template/documentation/readme.template +++ b/template/documentation/readme.template @@ -89,9 +89,9 @@ You can run after extracting the release archive or cloning from git, wit ### Calfbox "Calfbox" is the name of our internal realtime midi/audio python module. -* You can either choose to install the module systemwide, which will make running all Laborejo Software Suite programs more convenient (when run from the source dir). Please consult https://github.com/kfoltman/calfbox -* Or you just run `./configure` and `make calfbox` without subsequent install, which creates a `site-packages` directory in the source dir. -* A third option is ` --mute` which runs without sound at all and does not need calfbox. +* It is bundled with the application for a normal install. +* Or you could run `./configure` and `make calfbox` without subsequent install, which creates a `sitepackages` directory in the source dir. You can then run `./` directly from the source. +* A third option is `./ --mute` which runs without sound at all and does not need calfbox. ### From source directory with NSM The developer uses this way to develop and use the software, so it will always be as stable as the diff --git a/template/engine/api.py b/template/engine/api.py index 5e4a183..015eb76 100644 --- a/template/engine/api.py +++ b/template/engine/api.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ) diff --git a/template/engine/data.py b/template/engine/data.py index c8f53a4..168bd8d 100644 --- a/template/engine/data.py +++ b/template/engine/data.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/duration.py b/template/engine/duration.py index f6b12cb..66fa758 100644 --- a/template/engine/duration.py +++ b/template/engine/duration.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/history.py b/template/engine/history.py index 76a4135..0af3650 100644 --- a/template/engine/history.py +++ b/template/engine/history.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/input_midi.py b/template/engine/input_midi.py index 89621ea..c979977 100644 --- a/template/engine/input_midi.py +++ b/template/engine/input_midi.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/ly2cbox.py b/template/engine/ly2cbox.py index d1cad5f..7e3ecbe 100644 --- a/template/engine/ly2cbox.py +++ b/template/engine/ly2cbox.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/metronome.py b/template/engine/metronome.py index 0aac23e..f795e1b 100644 --- a/template/engine/metronome.py +++ b/template/engine/metronome.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/midi.py b/template/engine/midi.py index 6b8df3e..87447bf 100644 --- a/template/engine/midi.py +++ b/template/engine/midi.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/pitch.py b/template/engine/pitch.py index be0ea40..defef08 100644 --- a/template/engine/pitch.py +++ b/template/engine/pitch.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/sampler_sf2.py b/template/engine/sampler_sf2.py index 36b8e1c..f6fd675 100644 --- a/template/engine/sampler_sf2.py +++ b/template/engine/sampler_sf2.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ). diff --git a/template/engine/sequencer.py b/template/engine/sequencer.py index d3edd88..b0a3c57 100644 --- a/template/engine/sequencer.py +++ b/template/engine/sequencer.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/engine/session.py b/template/engine/session.py index b609376..4da4803 100644 --- a/template/engine/session.py +++ b/template/engine/session.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/helper.py b/template/helper.py index 6c2d771..cc273b5 100644 --- a/template/helper.py +++ b/template/helper.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) Most of this file is trivial code and does not reach the "Schaffenshöhe" for Urheberrecht. If it is: diff --git a/template/qtgui/about.py b/template/qtgui/about.py index 9dc66d6..b37931e 100644 --- a/template/qtgui/about.py +++ b/template/qtgui/about.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/chooseSessionDirectory.py b/template/qtgui/chooseSessionDirectory.py index c6689b2..2099c21 100644 --- a/template/qtgui/chooseSessionDirectory.py +++ b/template/qtgui/chooseSessionDirectory.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/constantsAndConfigs.py b/template/qtgui/constantsAndConfigs.py index d499ae6..9fdd66a 100644 --- a/template/qtgui/constantsAndConfigs.py +++ b/template/qtgui/constantsAndConfigs.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/debugScript.py b/template/qtgui/debugScript.py index e89dc0d..0cb6064 100644 --- a/template/qtgui/debugScript.py +++ b/template/qtgui/debugScript.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/eventloop.py b/template/qtgui/eventloop.py index 25818a9..10ab4cd 100644 --- a/template/qtgui/eventloop.py +++ b/template/qtgui/eventloop.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/helper.py b/template/qtgui/helper.py index f04e227..a0437a3 100644 --- a/template/qtgui/helper.py +++ b/template/qtgui/helper.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of Laborejo ( https://www.laborejo.org ) diff --git a/template/qtgui/mainwindow.py b/template/qtgui/mainwindow.py index 8ad730b..8851da8 100644 --- a/template/qtgui/mainwindow.py +++ b/template/qtgui/mainwindow.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/menu.py b/template/qtgui/menu.py index 2216787..bf6af9e 100644 --- a/template/qtgui/menu.py +++ b/template/qtgui/menu.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/nsmclient.py b/template/qtgui/nsmclient.py index e422261..e922ed9 100644 --- a/template/qtgui/nsmclient.py +++ b/template/qtgui/nsmclient.py @@ -9,7 +9,7 @@ With help from code fragments from https://github.com/attwad/python-osc ( DO WHA MIT License -Copyright 2014-2020 Nils Hilbricht https://www.laborejo.org +Copyright (c) since 2014: Laborejo Software Suite , All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, diff --git a/template/qtgui/nsmsingleserver.py b/template/qtgui/nsmsingleserver.py index 9891779..c31b1b6 100644 --- a/template/qtgui/nsmsingleserver.py +++ b/template/qtgui/nsmsingleserver.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/submenus.py b/template/qtgui/submenus.py index ca5b1f9..71ac248 100644 --- a/template/qtgui/submenus.py +++ b/template/qtgui/submenus.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/qtgui/usermanual.py b/template/qtgui/usermanual.py index 16c9969..15c752f 100644 --- a/template/qtgui/usermanual.py +++ b/template/qtgui/usermanual.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), diff --git a/template/start.py b/template/start.py index ee2733b..2eea2b0 100644 --- a/template/start.py +++ b/template/start.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2021, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ),