diff --git a/Makefile b/Makefile index c52c2c8d5..68d517338 100644 --- a/Makefile +++ b/Makefile @@ -19,18 +19,12 @@ PYRCC ?= pyrcc5 # -------------------------------------------------------------- -all: WARN -# CXX RES UI WIDGETS - -WARN: - @echo "This is the development branch of carla, DO NOT USE IT." - @echo "Please switch to the stable branch by using:" - @echo "git checkout 1.0.x" +all: CXX RES UI WIDGETS # -------------------------------------------------------------- # C++ code (native) -CXX: backend bridges discovery theme +CXX: backend bridges discovery plugin theme backend: $(MAKE) -C source/backend @@ -155,6 +149,7 @@ install: install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/ install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/ install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/ + install -d $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/ install -d $(DESTDIR)$(PREFIX)/share/applications/ install -d $(DESTDIR)$(PREFIX)/share/carla/ install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/ @@ -168,6 +163,10 @@ install: install -m 755 \ data/carla \ data/carla-control \ + data/carla-database \ + data/carla-patchbay \ + data/carla-rack \ + data/carla-settings \ data/carla-single \ $(DESTDIR)$(PREFIX)/bin/ @@ -197,27 +196,53 @@ install: # Install mime package install -m 644 data/carla.xml $(DESTDIR)$(PREFIX)/share/mime/packages/ + # Install backend + install -m 644 \ + source/backend/*.so \ + $(DESTDIR)$(PREFIX)/lib/carla/ + # Install binaries install -m 755 \ - source/backend/*.so \ source/bridges/carla-bridge-* \ source/discovery/carla-discovery-* \ $(DESTDIR)$(PREFIX)/lib/carla/ + # Install plugin + install -m 644 \ + source/plugin/carla-native.lv2/*.so \ + source/plugin/carla-native.lv2/*.ttl \ + $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/ + # Install python code - install -m 755 source/*.py $(DESTDIR)$(PREFIX)/share/carla/ + install -m 644 source/*.py $(DESTDIR)$(PREFIX)/share/carla/ + + # Install python "binaries" + install -m 755 \ + source/carla \ + source/carla-patchbay \ + source/carla-rack \ + $(DESTDIR)$(PREFIX)/share/carla/ # Install resources - install -m 644 source/backend/resources/nekofilter-ui $(DESTDIR)$(PREFIX)/lib/carla/resources/ - install -m 644 source/backend/resources/nekofilter/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/ - install -m 644 source/backend/resources/zynaddsubfx/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/ + install -m 644 source/modules/carla_native/resources/*-ui $(DESTDIR)$(PREFIX)/lib/carla/resources/ + install -m 644 source/modules/carla_native/resources/*.py $(DESTDIR)$(PREFIX)/lib/carla/resources/ + install -m 644 source/modules/carla_native/resources/nekofilter/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/ + install -m 644 source/modules/carla_native/resources/zynaddsubfx/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/ # Adjust PREFIX value in script files sed -i "s/X-PREFIX-X/$(SED_PREFIX)/" \ $(DESTDIR)$(PREFIX)/bin/carla \ $(DESTDIR)$(PREFIX)/bin/carla-control \ + $(DESTDIR)$(PREFIX)/bin/carla-database \ + $(DESTDIR)$(PREFIX)/bin/carla-patchbay \ + $(DESTDIR)$(PREFIX)/bin/carla-rack \ + $(DESTDIR)$(PREFIX)/bin/carla-settings \ $(DESTDIR)$(PREFIX)/bin/carla-single + # Set plugin resources + cd $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/ && \ + $(LINK) $(PREFIX)/lib/carla/resources/ + # -------------------------------------------------------------- uninstall: diff --git a/data/carla b/data/carla index 08df9a7e5..e97c12c0a 100755 --- a/data/carla +++ b/data/carla @@ -8,4 +8,4 @@ fi INSTALL_PREFIX="X-PREFIX-X" export PATH="$INSTALL_PREFIX"/lib/carla:$PATH -exec $PYTHON $INSTALL_PREFIX/share/carla/carla.py --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@" +exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@" diff --git a/data/carla-control b/data/carla-control index 369ddf06a..a1aec5ff8 100755 --- a/data/carla-control +++ b/data/carla-control @@ -8,4 +8,4 @@ fi INSTALL_PREFIX="X-PREFIX-X" export PATH="$INSTALL_PREFIX"/lib/carla:$PATH -exec $PYTHON $INSTALL_PREFIX/share/carla/carla_control.py --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@" +exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_control.py --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@" diff --git a/data/carla-database b/data/carla-database new file mode 100755 index 000000000..e5c062855 --- /dev/null +++ b/data/carla-database @@ -0,0 +1,11 @@ +#!/bin/bash + +if [ -f /usr/bin/python3 ]; then + PYTHON=/usr/bin/python3 +else + PYTHON=python +fi + +INSTALL_PREFIX="X-PREFIX-X" +export PATH="$INSTALL_PREFIX"/lib/carla:$PATH +exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_database.py diff --git a/data/carla-patchbay b/data/carla-patchbay new file mode 100755 index 000000000..9d0f10b28 --- /dev/null +++ b/data/carla-patchbay @@ -0,0 +1,11 @@ +#!/bin/bash + +if [ -f /usr/bin/python3 ]; then + PYTHON=/usr/bin/python3 +else + PYTHON=python +fi + +INSTALL_PREFIX="X-PREFIX-X" +export PATH="$INSTALL_PREFIX"/lib/carla:$PATH +exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla-patchbay --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@" diff --git a/data/carla-rack b/data/carla-rack new file mode 100755 index 000000000..668a0b1a4 --- /dev/null +++ b/data/carla-rack @@ -0,0 +1,11 @@ +#!/bin/bash + +if [ -f /usr/bin/python3 ]; then + PYTHON=/usr/bin/python3 +else + PYTHON=python +fi + +INSTALL_PREFIX="X-PREFIX-X" +export PATH="$INSTALL_PREFIX"/lib/carla:$PATH +exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla-rack --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@" diff --git a/data/carla-settings b/data/carla-settings new file mode 100755 index 000000000..42ee8c548 --- /dev/null +++ b/data/carla-settings @@ -0,0 +1,11 @@ +#!/bin/bash + +if [ -f /usr/bin/python3 ]; then + PYTHON=/usr/bin/python3 +else + PYTHON=python +fi + +INSTALL_PREFIX="X-PREFIX-X" +export PATH="$INSTALL_PREFIX"/lib/carla:$PATH +exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_settings.py