Browse Source

Allow install once again, add some tweaked carla start scripts

tags/1.9.4
falkTX 11 years ago
parent
commit
31cc439f19
7 changed files with 84 additions and 15 deletions
  1. +38
    -13
      Makefile
  2. +1
    -1
      data/carla
  3. +1
    -1
      data/carla-control
  4. +11
    -0
      data/carla-database
  5. +11
    -0
      data/carla-patchbay
  6. +11
    -0
      data/carla-rack
  7. +11
    -0
      data/carla-settings

+ 38
- 13
Makefile View File

@@ -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) # C++ code (native)


CXX: backend bridges discovery theme
CXX: backend bridges discovery plugin theme


backend: backend:
$(MAKE) -C source/backend $(MAKE) -C source/backend
@@ -155,6 +149,7 @@ install:
install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/ install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/
install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/ install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/
install -d $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/ 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/applications/
install -d $(DESTDIR)$(PREFIX)/share/carla/ install -d $(DESTDIR)$(PREFIX)/share/carla/
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/ install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
@@ -168,6 +163,10 @@ install:
install -m 755 \ install -m 755 \
data/carla \ data/carla \
data/carla-control \ data/carla-control \
data/carla-database \
data/carla-patchbay \
data/carla-rack \
data/carla-settings \
data/carla-single \ data/carla-single \
$(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(PREFIX)/bin/


@@ -197,27 +196,53 @@ install:
# Install mime package # Install mime package
install -m 644 data/carla.xml $(DESTDIR)$(PREFIX)/share/mime/packages/ 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 binaries
install -m 755 \ install -m 755 \
source/backend/*.so \
source/bridges/carla-bridge-* \ source/bridges/carla-bridge-* \
source/discovery/carla-discovery-* \ source/discovery/carla-discovery-* \
$(DESTDIR)$(PREFIX)/lib/carla/ $(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 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 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 # Adjust PREFIX value in script files
sed -i "s/X-PREFIX-X/$(SED_PREFIX)/" \ sed -i "s/X-PREFIX-X/$(SED_PREFIX)/" \
$(DESTDIR)$(PREFIX)/bin/carla \ $(DESTDIR)$(PREFIX)/bin/carla \
$(DESTDIR)$(PREFIX)/bin/carla-control \ $(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 $(DESTDIR)$(PREFIX)/bin/carla-single


# Set plugin resources
cd $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/ && \
$(LINK) $(PREFIX)/lib/carla/resources/

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


uninstall: uninstall:


+ 1
- 1
data/carla View File

@@ -8,4 +8,4 @@ fi


INSTALL_PREFIX="X-PREFIX-X" INSTALL_PREFIX="X-PREFIX-X"
export PATH="$INSTALL_PREFIX"/lib/carla:$PATH 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" "$@"

+ 1
- 1
data/carla-control View File

@@ -8,4 +8,4 @@ fi


INSTALL_PREFIX="X-PREFIX-X" INSTALL_PREFIX="X-PREFIX-X"
export PATH="$INSTALL_PREFIX"/lib/carla:$PATH 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" "$@"

+ 11
- 0
data/carla-database View File

@@ -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

+ 11
- 0
data/carla-patchbay View File

@@ -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" "$@"

+ 11
- 0
data/carla-rack View File

@@ -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" "$@"

+ 11
- 0
data/carla-settings View File

@@ -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

Loading…
Cancel
Save