From 0f5aeb724e5cb59003d14166b0e5d919f6d67d01 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Tue, 6 Sep 2022 18:31:29 +0200 Subject: [PATCH] Refactoring: Move Linux distribution/ files to linux/ --- .gitignore | 14 +++--- Jamulus.pro | 20 ++++----- distributions/debian/jamulus.install | 6 --- {distributions => linux}/Jamulus.1 | 0 {distributions => linux}/debian/changelog | 0 {distributions => linux}/debian/compat | 0 {distributions => linux}/debian/control | 0 {distributions => linux}/debian/copyright | 0 .../debian/jamulus-headless.install | 0 .../debian/jamulus-headless.postinst | 0 .../debian/jamulus-headless.service | 0 linux/debian/jamulus.install | 6 +++ {distributions => linux}/debian/rules | 0 {distributions => linux}/debian/source/format | 0 {distributions => linux}/debian/watch | 0 linux/deploy_deb.sh | 2 +- .../jamulus-server.desktop.in | 2 +- {distributions => linux}/jamulus.desktop.in | 2 +- {distributions => linux}/raspijamulus.sh | 8 ++-- .../res/io.jamulus.jamulus.png | Bin .../res/io.jamulus.jamulus.svg | 0 .../res/io.jamulus.jamulusserver.svg | 0 src/res/jamulus-icon-2020.svg | 27 ----------- src/res/jamulus-server-icon-2020.svg | 42 ------------------ tools/update-copyright-notices.sh | 2 +- 25 files changed, 31 insertions(+), 100 deletions(-) delete mode 100644 distributions/debian/jamulus.install rename {distributions => linux}/Jamulus.1 (100%) rename {distributions => linux}/debian/changelog (100%) rename {distributions => linux}/debian/compat (100%) rename {distributions => linux}/debian/control (100%) rename {distributions => linux}/debian/copyright (100%) rename {distributions => linux}/debian/jamulus-headless.install (100%) rename {distributions => linux}/debian/jamulus-headless.postinst (100%) rename {distributions => linux}/debian/jamulus-headless.service (100%) create mode 100644 linux/debian/jamulus.install rename {distributions => linux}/debian/rules (100%) rename {distributions => linux}/debian/source/format (100%) rename {distributions => linux}/debian/watch (100%) rename {distributions => linux}/jamulus-server.desktop.in (95%) rename {distributions => linux}/jamulus.desktop.in (96%) rename {distributions => linux}/raspijamulus.sh (91%) rename distributions/jamulus.png => src/res/io.jamulus.jamulus.png (100%) rename distributions/jamulus.svg => src/res/io.jamulus.jamulus.svg (100%) rename distributions/jamulus-server.svg => src/res/io.jamulus.jamulusserver.svg (100%) delete mode 100644 src/res/jamulus-icon-2020.svg delete mode 100644 src/res/jamulus-server-icon-2020.svg diff --git a/.gitignore b/.gitignore index 6cfad1a917..069d1f6bab 100644 --- a/.gitignore +++ b/.gitignore @@ -35,15 +35,15 @@ jamulus.vcxproj jamulus.vcxproj.filters Jamulus.app/ .DS_Store -distributions/opus* -distributions/jack2 -distributions/claudio_piano.sf2 -distributions/fluidsynth* -distributions/jamulus.desktop -distributions/jamulus-server.desktop +linux/opus* +linux/jack2 +linux/claudio_piano.sf2 +linux/fluidsynth* +linux/jamulus.desktop +linux/jamulus-server.desktop .xcode Debug-iphoneos/ Jamulus.xcodeproj jamulus_plugin_import.cpp .github_release_changelog.md -debian/ +/debian/ diff --git a/Jamulus.pro b/Jamulus.pro index 03a6a39ad1..25760de8e5 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -326,29 +326,29 @@ win32 { } APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX) desktop.path = $$APPSDIR - QMAKE_SUBSTITUTES += distributions/jamulus.desktop.in distributions/jamulus-server.desktop.in - desktop.files = distributions/jamulus.desktop distributions/jamulus-server.desktop + QMAKE_SUBSTITUTES += linux/jamulus.desktop.in linux/jamulus-server.desktop.in + desktop.files = linux/jamulus.desktop linux/jamulus-server.desktop isEmpty(ICONSDIR) { ICONSDIR = share/icons/hicolor/512x512/apps } ICONSDIR = $$absolute_path($$ICONSDIR, $$PREFIX) icons.path = $$ICONSDIR - icons.files = distributions/jamulus.png + icons.files = src/res/io.jamulus.jamulus.png isEmpty(ICONSDIR_SVG) { ICONSDIR_SVG = share/icons/hicolor/scalable/apps/ } ICONSDIR_SVG = $$absolute_path($$ICONSDIR_SVG, $$PREFIX) icons_svg.path = $$ICONSDIR_SVG - icons_svg.files = distributions/jamulus.svg distributions/jamulus-server.svg + icons_svg.files = src/res/io.jamulus.jamulus.svg src/res/io.jamulus.jamulusserver.svg isEmpty(MANDIR) { MANDIR = share/man/man1 } MANDIR = $$absolute_path($$MANDIR, $$PREFIX) man.path = $$MANDIR - man.files = distributions/Jamulus.1 + man.files = linux/Jamulus.1 INSTALLS += target desktop icons icons_svg man } @@ -683,11 +683,11 @@ DISTFILES += ChangeLog \ COPYING \ CONTRIBUTING.md \ README.md \ - distributions/jamulus.desktop.in \ - distributions/jamulus-server.desktop.in \ - distributions/jamulus.png \ - distributions/jamulus.svg \ - distributions/jamulus-server.svg \ + linux/jamulus.desktop.in \ + linux/jamulus-server.desktop.in \ + src/res/io.jamulus.jamulus.png \ + src/res/io.jamulus.jamulus.svg \ + src/res/io.jamulus.jamulusserver.svg \ src/translation/translation_de_DE.qm \ src/translation/translation_fr_FR.qm \ src/translation/translation_ko_KR.qm \ diff --git a/distributions/debian/jamulus.install b/distributions/debian/jamulus.install deleted file mode 100644 index 216f02e85e..0000000000 --- a/distributions/debian/jamulus.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/bin/jamulus -usr/share/applications/jamulus.desktop -usr/share/applications/jamulus-server.desktop -usr/share/icons/hicolor/512x512/apps/jamulus.png -usr/share/icons/hicolor/scalable/apps/jamulus.svg -usr/share/icons/hicolor/scalable/apps/jamulus-server.svg diff --git a/distributions/Jamulus.1 b/linux/Jamulus.1 similarity index 100% rename from distributions/Jamulus.1 rename to linux/Jamulus.1 diff --git a/distributions/debian/changelog b/linux/debian/changelog similarity index 100% rename from distributions/debian/changelog rename to linux/debian/changelog diff --git a/distributions/debian/compat b/linux/debian/compat similarity index 100% rename from distributions/debian/compat rename to linux/debian/compat diff --git a/distributions/debian/control b/linux/debian/control similarity index 100% rename from distributions/debian/control rename to linux/debian/control diff --git a/distributions/debian/copyright b/linux/debian/copyright similarity index 100% rename from distributions/debian/copyright rename to linux/debian/copyright diff --git a/distributions/debian/jamulus-headless.install b/linux/debian/jamulus-headless.install similarity index 100% rename from distributions/debian/jamulus-headless.install rename to linux/debian/jamulus-headless.install diff --git a/distributions/debian/jamulus-headless.postinst b/linux/debian/jamulus-headless.postinst similarity index 100% rename from distributions/debian/jamulus-headless.postinst rename to linux/debian/jamulus-headless.postinst diff --git a/distributions/debian/jamulus-headless.service b/linux/debian/jamulus-headless.service similarity index 100% rename from distributions/debian/jamulus-headless.service rename to linux/debian/jamulus-headless.service diff --git a/linux/debian/jamulus.install b/linux/debian/jamulus.install new file mode 100644 index 0000000000..04967bde01 --- /dev/null +++ b/linux/debian/jamulus.install @@ -0,0 +1,6 @@ +usr/bin/jamulus +usr/share/applications/jamulus.desktop +usr/share/applications/jamulus-server.desktop +usr/share/icons/hicolor/512x512/apps/io.jamulus.jamulus.png +usr/share/icons/hicolor/scalable/apps/io.jamulus.jamulus.svg +usr/share/icons/hicolor/scalable/apps/io.jamulus.jamulusserver.svg diff --git a/distributions/debian/rules b/linux/debian/rules similarity index 100% rename from distributions/debian/rules rename to linux/debian/rules diff --git a/distributions/debian/source/format b/linux/debian/source/format similarity index 100% rename from distributions/debian/source/format rename to linux/debian/source/format diff --git a/distributions/debian/watch b/linux/debian/watch similarity index 100% rename from distributions/debian/watch rename to linux/debian/watch diff --git a/linux/deploy_deb.sh b/linux/deploy_deb.sh index a3ea9508bc..6d769b5a48 100755 --- a/linux/deploy_deb.sh +++ b/linux/deploy_deb.sh @@ -5,7 +5,7 @@ set -eu -o pipefail TARGET_ARCH="${TARGET_ARCH:-amd64}" -cp -r distributions/debian . +cp -r linux/debian . # get the jamulus version from pro file VERSION=$(grep -oP 'VERSION = \K\w[^\s\\]*' Jamulus.pro) diff --git a/distributions/jamulus-server.desktop.in b/linux/jamulus-server.desktop.in similarity index 95% rename from distributions/jamulus-server.desktop.in rename to linux/jamulus-server.desktop.in index d5ad2a65b3..6232c9c855 100644 --- a/distributions/jamulus-server.desktop.in +++ b/linux/jamulus-server.desktop.in @@ -12,7 +12,7 @@ GenericName[nl]=Software voor jamsessies over internet GenericName[sk]=Softvér na džemovanie cez internet GenericName[sv]=Mjukvara för Jam Sessioner över Internet Exec=$$TARGET -s -Icon=jamulus-server +Icon=io.jamulus.jamulusserver Terminal=false Type=Application Categories=AudioVideo;Audio;Mixer;Qt; diff --git a/distributions/jamulus.desktop.in b/linux/jamulus.desktop.in similarity index 96% rename from distributions/jamulus.desktop.in rename to linux/jamulus.desktop.in index fd366bdb2b..265c496be0 100644 --- a/distributions/jamulus.desktop.in +++ b/linux/jamulus.desktop.in @@ -11,7 +11,7 @@ GenericName[nl]=Software voor jamsessies over internet GenericName[sk]=Softvér na džemovanie cez internet GenericName[sv]=Mjukvara för Jam Sessioner över Internet Exec=$$TARGET -Icon=jamulus +Icon=io.jamulus.jamulus Terminal=false Type=Application Categories=AudioVideo;Audio;Mixer;Qt; diff --git a/distributions/raspijamulus.sh b/linux/raspijamulus.sh similarity index 91% rename from distributions/raspijamulus.sh rename to linux/raspijamulus.sh index af0eb2909f..23205738be 100755 --- a/distributions/raspijamulus.sh +++ b/linux/raspijamulus.sh @@ -1,7 +1,7 @@ #!/bin/bash # This script is intended to setup a clean Raspberry Pi system for running Jamulus -# This needs to be run from the distributions/ folder +# This needs to be run from the linux/ folder readonly OPUS="opus-1.3.1" NCORES=$(nproc) @@ -86,7 +86,7 @@ fi # compile Jamulus with external Opus library cd .. -qmake "CONFIG+=opus_shared_lib raspijamulus headless" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" "INCLUDEPATH+=distributions/jack2/common" "QMAKE_LIBDIR+=distributions/jack2/build/common" Jamulus.pro +qmake "CONFIG+=opus_shared_lib raspijamulus headless" "INCLUDEPATH+=linux/${OPUS}/include" "QMAKE_LIBDIR+=linux/${OPUS}/.libs" "INCLUDEPATH+=linux/jack2/common" "QMAKE_LIBDIR+=linux/jack2/build/common" Jamulus.pro make "-j${NCORES}" # get first USB audio sound card device @@ -113,8 +113,8 @@ fi #sudo mount -o remount,size=128M /dev/shm # start Jack2 and Jamulus in headless mode -export LD_LIBRARY_PATH="distributions/${OPUS}/.libs:distributions/jack2/build:distributions/jack2/build/common" -distributions/jack2/build/jackd -R -T --silent -P70 -p16 -t2000 -d alsa "-dhw:${ADEVICE}" -p 128 -n 3 -r 48000 -s & +export LD_LIBRARY_PATH="linux/${OPUS}/.libs:linux/jack2/build:linux/jack2/build/common" +linux/jack2/build/jackd -R -T --silent -P70 -p16 -t2000 -d alsa "-dhw:${ADEVICE}" -p 128 -n 3 -r 48000 -s & ./Jamulus -n -i ${JAMULUSINIFILE} -c anygenre3.jamulus.io & echo "###---------- PRESS ANY KEY TO TERMINATE THE JAMULUS SESSION ---------###" diff --git a/distributions/jamulus.png b/src/res/io.jamulus.jamulus.png similarity index 100% rename from distributions/jamulus.png rename to src/res/io.jamulus.jamulus.png diff --git a/distributions/jamulus.svg b/src/res/io.jamulus.jamulus.svg similarity index 100% rename from distributions/jamulus.svg rename to src/res/io.jamulus.jamulus.svg diff --git a/distributions/jamulus-server.svg b/src/res/io.jamulus.jamulusserver.svg similarity index 100% rename from distributions/jamulus-server.svg rename to src/res/io.jamulus.jamulusserver.svg diff --git a/src/res/jamulus-icon-2020.svg b/src/res/jamulus-icon-2020.svg deleted file mode 100644 index 5e08a45cc2..0000000000 --- a/src/res/jamulus-icon-2020.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/res/jamulus-server-icon-2020.svg b/src/res/jamulus-server-icon-2020.svg deleted file mode 100644 index 404a6da3f8..0000000000 --- a/src/res/jamulus-server-icon-2020.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - diff --git a/tools/update-copyright-notices.sh b/tools/update-copyright-notices.sh index d2795788ae..00cad8f198 100755 --- a/tools/update-copyright-notices.sh +++ b/tools/update-copyright-notices.sh @@ -10,4 +10,4 @@ find android ios linux mac src windows -regex '.*\.\(cpp\|h\|mm\)' -not -regex ' sed -re 's/(\*.*Copyright.*[^-][0-9]{4})(\s*-\s*\b[0-9]{4})?\s*$/\1-'"${YEAR}"'/' -i "${file}" done -sed -re 's/^( [0-9]{4}-)[0-9]{4}( The Jamulus)/\1'"${YEAR}"'\2/' -i distributions/debian/copyright +sed -re 's/^( [0-9]{4}-)[0-9]{4}( The Jamulus)/\1'"${YEAR}"'\2/' -i linux/debian/copyright