Browse Source

Makefile updates; Add cadence script+desktop files

tags/v0.9.0
falkTX 11 years ago
parent
commit
e56ceb9f23
5 changed files with 156 additions and 54 deletions
  1. +60
    -51
      Makefile
  2. +40
    -0
      data/cadence
  3. +50
    -0
      data/cadence.desktop
  4. +6
    -0
      src/carla-discovery/Makefile
  5. +0
    -3
      src/carla-discovery/carla-discovery.cpp

+ 60
- 51
Makefile View File

@@ -51,112 +51,112 @@ tools: \
src/ui_settings_app.py src/ui_settings_jack.py

src/ui_cadence.py: src/ui/cadence.ui
$(PYUIC) -o src/ui_cadence.py $<
$(PYUIC) $< -o $@

src/ui_catarina.py: src/ui/catarina.ui
$(PYUIC) -o src/ui_catarina.py $<
$(PYUIC) $< -o $@

src/ui_catarina_addgroup.py: src/ui/catarina_addgroup.ui
$(PYUIC) -o src/ui_catarina_addgroup.py $<
$(PYUIC) $< -o $@

src/ui_catarina_removegroup.py: src/ui/catarina_removegroup.ui
$(PYUIC) -o src/ui_catarina_removegroup.py $<
$(PYUIC) $< -o $@

src/ui_catarina_renamegroup.py: src/ui/catarina_renamegroup.ui
$(PYUIC) -o src/ui_catarina_renamegroup.py $<
$(PYUIC) $< -o $@

src/ui_catarina_addport.py: src/ui/catarina_addport.ui
$(PYUIC) -o src/ui_catarina_addport.py $<
$(PYUIC) $< -o $@

src/ui_catarina_removeport.py: src/ui/catarina_removeport.ui
$(PYUIC) -o src/ui_catarina_removeport.py $<
$(PYUIC) $< -o $@

src/ui_catarina_renameport.py: src/ui/catarina_renameport.ui
$(PYUIC) -o src/ui_catarina_renameport.py $<
$(PYUIC) $< -o $@

src/ui_catarina_connectports.py: src/ui/catarina_connectports.ui
$(PYUIC) -o src/ui_catarina_connectports.py $<
$(PYUIC) $< -o $@

src/ui_catarina_disconnectports.py: src/ui/catarina_disconnectports.ui
$(PYUIC) -o src/ui_catarina_disconnectports.py $<
$(PYUIC) $< -o $@

src/ui_catia.py: src/ui/catia.ui
$(PYUIC) -o src/ui_catia.py $<
$(PYUIC) $< -o $@

src/ui_claudia.py: src/ui/claudia.ui
$(PYUIC) -o src/ui_claudia.py $<
$(PYUIC) $< -o $@

src/ui_claudia_studioname.py: src/ui/claudia_studioname.ui
$(PYUIC) -o src/ui_claudia_studioname.py $<
$(PYUIC) $< -o $@

src/ui_claudia_studiolist.py: src/ui/claudia_studiolist.ui
$(PYUIC) -o src/ui_claudia_studiolist.py $<
$(PYUIC) $< -o $@

src/ui_claudia_createroom.py: src/ui/claudia_createroom.ui
$(PYUIC) -o src/ui_claudia_createroom.py $<
$(PYUIC) $< -o $@

src/ui_claudia_projectname.py: src/ui/claudia_projectname.ui
$(PYUIC) -o src/ui_claudia_projectname.py $<
$(PYUIC) $< -o $@

src/ui_claudia_projectproperties.py: src/ui/claudia_projectproperties.ui
$(PYUIC) -o src/ui_claudia_projectproperties.py $<
$(PYUIC) $< -o $@

src/ui_claudia_runcustom.py: src/ui/claudia_runcustom.ui
$(PYUIC) -o src/ui_claudia_runcustom.py $<
$(PYUIC) $< -o $@

src/ui_claudia_launcher.py: src/ui/claudia_launcher.ui
$(PYUIC) -o src/ui_claudia_launcher.py $<
$(PYUIC) $< -o $@

src/ui_claudia_launcher_app.py: src/ui/claudia_launcher_app.ui
$(PYUIC) -o src/ui_claudia_launcher_app.py $<
$(PYUIC) $< -o $@

src/ui_carla.py: src/ui/carla.ui
$(PYUIC) -o src/ui_carla.py $<
$(PYUIC) $< -o $@

src/ui_carla_control.py: src/ui/carla_control.ui
$(PYUIC) -o src/ui_carla_control.py $<
$(PYUIC) $< -o $@

src/ui_carla_about.py: src/ui/carla_about.ui
$(PYUIC) -o src/ui_carla_about.py $<
$(PYUIC) $< -o $@

src/ui_carla_database.py: src/ui/carla_database.ui
$(PYUIC) -o src/ui_carla_database.py $<
$(PYUIC) $< -o $@

src/ui_carla_edit.py: src/ui/carla_edit.ui
$(PYUIC) -o src/ui_carla_edit.py $<
$(PYUIC) $< -o $@

src/ui_carla_parameter.py: src/ui/carla_parameter.ui
$(PYUIC) -o src/ui_carla_parameter.py $<
$(PYUIC) $< -o $@

src/ui_carla_plugin.py: src/ui/carla_plugin.ui
$(PYUIC) -o src/ui_carla_plugin.py $<
$(PYUIC) $< -o $@

src/ui_carla_refresh.py: src/ui/carla_refresh.ui
$(PYUIC) -o src/ui_carla_refresh.py $<
$(PYUIC) $< -o $@

src/ui_logs.py: src/ui/logs.ui
$(PYUIC) -o src/ui_logs.py $<
$(PYUIC) $< -o $@

src/ui_render.py: src/ui/render.ui
$(PYUIC) -o src/ui_render.py $<
$(PYUIC) $< -o $@

src/ui_xycontroller.py: src/ui/xycontroller.ui
$(PYUIC) -o src/ui_xycontroller.py $<
$(PYUIC) $< -o $@

src/ui_settings_app.py: src/ui/settings_app.ui
$(PYUIC) -o src/ui_settings_app.py $<
$(PYUIC) $< -o $@

src/ui_settings_jack.py: src/ui/settings_jack.ui
$(PYUIC) -o src/ui_settings_jack.py $<
$(PYUIC) $< -o $@

src/ui_inputdialog_value.py: src/ui/inputdialog_value.ui
$(PYUIC) -o src/ui_inputdialog_value.py $<
$(PYUIC) $< -o $@


RES: src/icons_rc.py

src/icons_rc.py: src/icons/icons.qrc
$(PYRCC) -o src/icons_rc.py $<
$(PYRCC) $< -o $@


CPP: carla_backend carla_bridge carla_discovery
@@ -168,29 +168,24 @@ carla_bridge: carla_lilv
$(MAKE) -C src/carla-bridge

carla_discovery:
$(MAKE) -C src/carla-lilv $(_arch_n)bit
$(MAKE) -C src/carla-discovery unix$(_arch_n) NATIVE=1

carla_lilv:
$(MAKE) -C src/carla-lilv

unix32:
$(MAKE) -C src/carla-lilv 32bit
# $(MAKE) -C src/carla-bridge unix32
$(MAKE) -C src/carla-discovery unix32

unix64:
$(MAKE) -C src/carla-lilv 64bit
# $(MAKE) -C src/carla-bridge unix64
$(MAKE) -C src/carla-discovery unix64

wine32:
$(MAKE) -C src/carla-lilv 32bit
# $(MAKE) -C src/carla-bridge wine32
$(MAKE) -C src/carla-discovery wine32

wine64:
$(MAKE) -C src/carla-lilv 64bit
# $(MAKE) -C src/carla-bridge wine64
$(MAKE) -C src/carla-discovery wine64

@@ -221,6 +216,7 @@ install:

# Install script files and binaries
install -m 755 \
data/cadence \
data/cadence_* \
data/cadence-aloop-daemon \
data/catarina \
@@ -239,39 +235,44 @@ install:
install -m 644 data/*.desktop $(DESTDIR)$(PREFIX)/share/applications/

# Install icons, 16x16
install -m 644 src/icons/16x16/carla.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
install -m 644 src/icons/16x16/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
install -m 644 src/icons/16x16/catarina.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
install -m 644 src/icons/16x16/catia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
install -m 644 src/icons/16x16/claudia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
install -m 644 src/icons/16x16/claudia-launcher.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
install -m 644 src/icons/16x16/carla.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/

# Install icons, 48x48
install -m 644 src/icons/48x48/carla.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
install -m 644 src/icons/48x48/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
install -m 644 src/icons/48x48/catarina.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
install -m 644 src/icons/48x48/catia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
install -m 644 src/icons/48x48/claudia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
install -m 644 src/icons/48x48/claudia-launcher.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
install -m 644 src/icons/48x48/carla.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/

# Install icons, 128x128
install -m 644 src/icons/128x128/carla.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
install -m 644 src/icons/128x128/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
install -m 644 src/icons/128x128/catarina.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
install -m 644 src/icons/128x128/catia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
install -m 644 src/icons/128x128/claudia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
install -m 644 src/icons/128x128/claudia-launcher.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
install -m 644 src/icons/128x128/carla.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/

# Install icons, 256x256
install -m 644 src/icons/256x256/carla.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
install -m 644 src/icons/256x256/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
install -m 644 src/icons/256x256/catarina.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
install -m 644 src/icons/256x256/catia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
install -m 644 src/icons/256x256/claudia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
install -m 644 src/icons/256x256/claudia-launcher.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
install -m 644 src/icons/256x256/carla.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/

# Install icons, scalable
install -m 644 src/icons/scalable/carla.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
install -m 644 src/icons/scalable/cadence.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
install -m 644 src/icons/scalable/catarina.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
install -m 644 src/icons/scalable/catia.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
install -m 644 src/icons/scalable/claudia.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
install -m 644 src/icons/scalable/claudia-launcher.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
install -m 644 src/icons/scalable/carla.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/

# Install main code
install -m 755 src/*.py $(DESTDIR)$(PREFIX)/share/cadence/src/
@@ -284,6 +285,7 @@ install:

# Adjust PREFIX value in script files
sed -i "s/X-PREFIX-X/$(SED_PREFIX)/" \
$(DESTDIR)$(PREFIX)/bin/cadence \
$(DESTDIR)$(PREFIX)/bin/catarina \
$(DESTDIR)$(PREFIX)/bin/catia \
$(DESTDIR)$(PREFIX)/bin/claudia \
@@ -292,6 +294,7 @@ install:
$(DESTDIR)$(PREFIX)/bin/cadence_*

uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/cadence
rm -f $(DESTDIR)$(PREFIX)/bin/cadence_*
rm -f $(DESTDIR)$(PREFIX)/bin/cadence-aloop-daemon
rm -f $(DESTDIR)$(PREFIX)/bin/catarina
@@ -301,35 +304,41 @@ uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/carla
rm -f $(DESTDIR)$(PREFIX)/bin/carla-bridge-*
rm -f $(DESTDIR)$(PREFIX)/bin/carla-discovery-*
rm -f $(DESTDIR)$(PREFIX)/share/applications/carla.desktop
rm -f $(DESTDIR)$(PREFIX)/share/applications/cadence.desktop
rm -f $(DESTDIR)$(PREFIX)/share/applications/catarina.desktop
rm -f $(DESTDIR)$(PREFIX)/share/applications/catia.desktop
rm -f $(DESTDIR)$(PREFIX)/share/applications/claudia.desktop
rm -f $(DESTDIR)$(PREFIX)/share/applications/claudia-launcher.desktop
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/carla.png
rm -f $(DESTDIR)$(PREFIX)/share/applications/carla.desktop
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/cadence.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/catarina.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/catia.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/claudia.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/claudia-launcher.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/carla.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/carla.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/cadence.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/catarina.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/catia.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/claudia.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/claudia-launcher.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/carla.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/carla.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/cadence.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/catarina.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/catia.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/claudia.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/claudia-launcher.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/carla.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/carla.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/cadence.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/catarina.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/catia.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/claudia.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/claudia-launcher.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/carla.svg
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/carla.png
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/cadence.svg
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/catarina.svg
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/catia.svg
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia.svg
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia-launcher.svg
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/carla.svg
rm -rf $(DESTDIR)$(PREFIX)/lib/carla/
rm -rf $(DESTDIR)$(PREFIX)/share/cadence/

+ 40
- 0
data/cadence View File

@@ -0,0 +1,40 @@
#!/bin/bash

# Check if already running

PROCS=`ps -ea -f | grep /share/cadence/src/cadence.py | grep python3`

if [ x"$PROCS" != x"" ]; then

# One instance only
PROC=`echo "$PROCS" | head -n 1`

# Get PID
PID=`echo "$PROC" | awk '{printf$2}'`

# Last check, just to make sure
if [ x"$PID" != x"" ]; then

# Tell user about this
echo "Cadence already started, showing GUI now..."

# Send SIGUSR2, shows the GUI
kill -USR2 "$PID"

# Quit now
exit

fi

fi


if [ -f /usr/bin/python3 ]; then
PYTHON=/usr/bin/python3
else
PYTHON=python
fi

# We only got here if not running yet
INSTALL_PREFIX="X-PREFIX-X"
exec $PYTHON $INSTALL_PREFIX/share/cadence/src/cadence.py "$@"

+ 50
- 0
data/cadence.desktop View File

@@ -0,0 +1,50 @@
[Desktop Entry]
Name=Cadence
GenericName=Cadence
Comment=JACK Toolbox
Exec=cadence
Icon=cadence
Terminal=false
Type=Application
Categories=AudioVideo;AudioEditing;Qt;
X-Ayatana-Desktop-Shortcuts=Catia;Claudia;Carla;JackMeter;JackSettings;Logs;Render;XYController;

[Catia Shortcut Group]
Name=Catia
Exec=catia
TargetEnvironment=Unity

[Claudia Shortcut Group]
Name=Claudia
Exec=claudia
TargetEnvironment=Unity

[Carla Shortcut Group]
Name=Carla
Exec=carla
TargetEnvironment=Unity

[JackMeter Shortcut Group]
Name=JACK Meter
Exec=cadence_jackmeter
TargetEnvironment=Unity

[JackSettings Shortcut Group]
Name=JACK Settings
Exec=cadence_jacksettings
TargetEnvironment=Unity

[Logs Shortcut Group]
Name=Logs
Exec=cadence_logs
TargetEnvironment=Unity

[Render Shortcut Group]
Name=Render
Exec=cadence_render
TargetEnvironment=Unity

[XYController Shortcut Group]
Name=XY-Controller
Exec=cadence_xycontroller
TargetEnvironment=Unity

+ 6
- 0
src/carla-discovery/Makefile View File

@@ -82,6 +82,12 @@ carla-discovery-win32.exe.so: $(32BIT_OBJS)
carla-discovery-win64.exe.so: $(64BIT_OBJS)
$(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o carla-discovery-win64.exe

../carla-lilv/carla_lilv_32bit.a:
$(MAKE) -C ../carla-lilv 32bit

../carla-lilv/carla_lilv_64bit.a:
$(MAKE) -C ../carla-lilv 64bit

# --------------------------------------------------------------

clean:


+ 0
- 3
src/carla-discovery/carla-discovery.cpp View File

@@ -39,9 +39,6 @@
# else
# warning fluidsynth not available (no SF2 support)
# endif
#endif

#ifdef BUILD_NATIVE
# ifdef WANT_LINUXSAMPLER
# include "linuxsampler/EngineFactory.h"
# else


Loading…
Cancel
Save