Move resources into common dir, cleanup debug scripts

Signed-off-by: falkTX <falktx@falktx.com>

.gitignore

@@ -9,6 +9,6 @@
 *.zip
 qrc_*.hpp
 ui_*.hpp
-/systray/mod-app
+/src/systray/mod-app
 /utils/win64-plugins.iss
 /utils/win64-version.iss

Makefile

@@ -251,8 +251,8 @@ clean:
 	$(MAKE) clean -C src/mod-host
 	$(MAKE) clean -C src/mod-ui/utils
 	$(MAKE) clean -C src/systray
-	rm -rf src/mod-midi-merger/build
 	rm -rf build
+	rm -rf build-midi-merger
 	rm -rf build-plugin-stamps
 	rm -rf build-pedalboard
 	rm -rf build-ui
@@ -587,7 +587,7 @@ build-midi-merger/Makefile: $(BOOTSTRAP_FILES)
 src/mod-app-asio/mod-app-asio.dll: src/mod-app-asio/*.c
 	./utils/run.sh $(PAWPAW_TARGET) $(MAKE) -C src/mod-app-asio
 
-src/systray/mod-app$(APP_EXT): src/systray/main.cpp src/systray/mod-app.hpp src/systray/mod-app.ui src/systray/widgets.hpp
+src/systray/mod-app$(APP_EXT): src/systray/main.cpp src/systray/mod-app.hpp src/systray/mod-app.qrc src/systray/mod-app.ui src/systray/widgets.hpp
 	./utils/run.sh $(PAWPAW_TARGET) $(MAKE) -C src/systray
 
 # ---------------------------------------------------------------------------------------------------------------------

src/systray/Makefile

@@ -95,14 +95,16 @@ $(TARGET): $(OBJS)
 ifeq ($(MACOS),true)
 	install_name_tool -change "@rpath/QtCore.framework/Versions/5/QtCore" "@executable_path/../Frameworks/QtCore.framework/QtCore" $@
 	install_name_tool -change "@rpath/QtGui.framework/Versions/5/QtGui" "@executable_path/../Frameworks/QtGui.framework/QtGui" $@
+	install_name_tool -change "@rpath/QtOpenGL.framework/Versions/5/QtOpenGL" "@executable_path/../Frameworks/QtOpenGL.framework/QtOpenGL" $@
+	install_name_tool -change "@rpath/QtPrintSupport.framework/Versions/5/QtPrintSupport" "@executable_path/../Frameworks/QtPrintSupport.framework/QtPrintSupport" $@
 	install_name_tool -change "@rpath/QtSvg.framework/Versions/5/QtSvg" "@executable_path/../Frameworks/QtSvg.framework/QtSvg" $@
 	install_name_tool -change "@rpath/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/../Frameworks/QtWidgets.framework/QtWidgets" $@
 endif
 
 main.cpp.o: main.cpp mod-app.hpp qrc_mod-app.hpp ui_mod-app.hpp widgets.hpp
 	$(CXX) $< $(CXXFLAGS) $(QT5_FLAGS) -c -o $@
 
-mod-app.rc.o: mod-app.rc mod-logo.ico
+mod-app.rc.o: mod-app.rc
 	$(WINDRES) $< -O coff -o $@
 
 qrc_mod-app.hpp: mod-app.qrc

src/systray/mod-app.qrc

@@ -1,5 +1,5 @@
 <RCC version="1.0">
     <qresource prefix="/">
-        <file>mod-logo.svg</file>
+        <file>../../res/mod-logo.svg</file>
     </qresource>
 </RCC>

src/systray/mod-app.rc

@@ -1,2 +1,2 @@
-id ICON "mod-logo.ico"
-401 ICON "mod-logo.ico"
+id ICON "../../res/mod-logo.ico"
+401 ICON "../../res/mod-logo.ico"

src/systray/mod-app.ui

@@ -57,7 +57,7 @@
             <string notr="true"/>
            </property>
            <property name="pixmap">
-            <pixmap resource="mod-app.qrc">:/mod-logo.svg</pixmap>
+            <pixmap resource="mod-app.qrc">:/res/mod-logo.svg</pixmap>
            </property>
            <property name="scaledContents">
             <bool>true</bool>

utils/debug/jackd

@@ -21,15 +21,15 @@ else
 fi
 
 if [ -e jackd.exe ]; then
-    source ../PawPaw/local.env win64
+    source ../src/PawPaw/local.env win64
     JACKD="wine jackd.exe"
     JACK_DRIVER="portaudio"
     JACK_DRIVER_DEVICE="ASIO::WineASIO Driver"
     JACK_DRIVER_OPTS=""
     JACK_SESSION="-C ./jack/jack-session.conf -X winmme"
     PATH_SEP=';'
 elif [ -e mod-app.app ]; then
-    source ../PawPaw/local.env macos-universal-10.15
+    source ../src/PawPaw/local.env macos-universal-10.15
     JACKD="./mod-app.app/Contents/MacOS/jackd"
     JACK_DRIVER="coreaudio"
     JACK_DRIVER_DEVICE="BuiltInSpeakerDevice"
@@ -39,11 +39,11 @@ elif [ -e mod-app.app ]; then
     export DYLD_LIBRARY_PATH="${PAWPAW_PREFIX}/lib"
     export JACK_DRIVER_DIR="$(pwd)/mod-app.app/Contents/MacOS/jack"
 else
-    source ../PawPaw/local.env linux
+    source ../src/PawPaw/local.env linux
     JACKD="./jackd"
     JACK_DRIVER="portaudio"
-    JACK_DRIVER_DEVICE="ALSA::pulse"
-    JACK_DRIVER_OPTS="-c 2"
+    JACK_DRIVER_DEVICE="JACK::system"
+    JACK_DRIVER_OPTS=""
     JACK_SESSION="-C ./jack/jack-session-alsamidi.conf"
     PATH_SEP=':'
     export LD_BIND_NOW=1

utils/debug/mod-ui

@@ -15,14 +15,14 @@ function convert_path() {
 }
 
 if [ -e mod-ui.exe ]; then
-    source ../PawPaw/local.env win64
+    source ../src/PawPaw/local.env win64
     PATH_SEP=';'
 elif [ -e mod-app.app ]; then
-    source ../PawPaw/local.env macos-universal-10.15
+    source ../src/PawPaw/local.env macos-universal-10.15
     export DYLD_LIBRARY_PATH="${PAWPAW_PREFIX}/lib"
     PATH_SEP=':'
 else
-    source ../PawPaw/local.env linux
+    source ../src/PawPaw/local.env linux
     export LD_LIBRARY_PATH="${PAWPAW_PREFIX}/lib"
     PATH_SEP=':'
 fi
@@ -71,14 +71,11 @@ mkdir -p "${DOCS_DIR}/MOD App/user-files/SFZ Instruments"
 mkdir -p "${DOCS_DIR}/MOD App/user-files/Aida DSP Models"
 mkdir -p "${DOCS_DIR}/MOD App/user-files/NAM Models"
 
-cd ../mod-ui
-
-if [ -e ../build/mod-ui.exe ]; then
-    rm -f utils/libjack64.dll
-    ln -s $(realpath ../build/libjack64.dll) utils/libjack64.dll
-fi
+cd ../src/mod-ui
 
 export MOD_DEFAULT_PEDALBOARD="$(convert_path $(pwd)/default.pedalboard)"
 export MOD_HTML_DIR="$(convert_path $(pwd)/html)"
 
+echo "Starting webserver using http://localhost:${MOD_DEVICE_WEBSERVER_PORT}/..."
+
 exec ${PYTHON} -c "from mod import webserver; webserver.run()"

utils/win64/win64-installer.iss

@@ -24,7 +24,7 @@ Name: plugins; Description: "LV2 plugins"; Types: normal; Flags: fixed;
 
 [Files]
 ; icon
-Source: "..\..\src\systray\mod-logo.ico"; DestDir: "{app}"; Flags: ignoreversion;
+Source: "..\..\res\mod-logo.ico"; DestDir: "{app}"; Flags: ignoreversion;
 ; jack + mod-host
 Source: "..\..\build\jackd.exe"; DestDir: "{app}"; Flags: ignoreversion;
 Source: "..\..\build\libjack64.dll"; DestDir: "{app}"; Flags: ignoreversion;
@@ -137,6 +137,7 @@ Source: "..\..\build\html\resources\pedals\*.css"; DestDir: "{app}\html\resource
 Source: "..\..\build\html\resources\pedals\*.png"; DestDir: "{app}\html\resources\pedals"; Flags: ignoreversion;
 Source: "..\..\build\html\resources\templates\*.html"; DestDir: "{app}\html\resources\templates"; Flags: ignoreversion;
 Source: "..\..\build\lib\*.*"; DestDir: "{app}\lib"; Flags: ignoreversion;
+Source: "..\..\build\lib\Cryptodome\*.*"; DestDir: "{app}\lib\Cryptodome"; Flags: ignoreversion;
 Source: "..\..\build\lib\PIL\*.*"; DestDir: "{app}\lib\PIL"; Flags: ignoreversion;
 Source: "..\..\build\mod\*.py"; DestDir: "{app}\mod"; Flags: ignoreversion;
 Source: "..\..\build\mod\communication\*.py"; DestDir: "{app}\mod\communication"; Flags: ignoreversion;