Merge pull request #2838 from ann0see/move/moveDist

.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/

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 \

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

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)

distributions/jamulus-server.desktop.in → 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;

distributions/jamulus.desktop.in → 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;

distributions/raspijamulus.sh → 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 ---------###"

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