From 919196611f9135a64981599ed96f5389913a44b2 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 12 Feb 2022 14:26:53 +0000 Subject: [PATCH] Tweaks for packaging Signed-off-by: falkTX --- Makefile | 72 ++++++++++++++++++++++++++++++++++++++---- plugins/Makefile | 1 + src/CardinalPlugin.cpp | 6 ++-- 3 files changed, 69 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f8e6797..5fb833f 100644 --- a/Makefile +++ b/Makefile @@ -244,8 +244,8 @@ install: install -d $(DESTDIR)$(PREFIX)/lib/lv2 install -d $(DESTDIR)$(PREFIX)/lib/vst install -d $(DESTDIR)$(PREFIX)/lib/vst3 - install -d $(DESTDIR)$(PREFIX)/share/Cardinal - install -d $(DESTDIR)$(PREFIX)/share/doc/Cardinal/docs + install -d $(DESTDIR)$(PREFIX)/share/cardinal + install -d $(DESTDIR)$(PREFIX)/share/doc/cardinal/docs cp -rL bin/Cardinal.lv2 $(DESTDIR)$(PREFIX)/lib/lv2/ cp -rL bin/Cardinal.vst3 $(DESTDIR)$(PREFIX)/lib/vst3/ @@ -259,21 +259,29 @@ install: cp -rL bin/CardinalSynth.vst3 $(DESTDIR)$(PREFIX)/lib/vst3/ install -m 755 bin/Cardinal$(APP_EXT) $(DESTDIR)$(PREFIX)/bin/ - cp -rL bin/Cardinal.lv2/resources/* $(DESTDIR)$(PREFIX)/share/Cardinal/ + cp -rL bin/Cardinal.lv2/resources/* $(DESTDIR)$(PREFIX)/share/cardinal/ - install -m 644 README.md $(DESTDIR)$(PREFIX)/share/doc/Cardinal/ - install -m 644 docs/*.md docs/*.png $(DESTDIR)$(PREFIX)/share/doc/Cardinal/docs/ + install -m 644 README.md $(DESTDIR)$(PREFIX)/share/doc/cardinal/ + install -m 644 docs/*.md docs/*.png $(DESTDIR)$(PREFIX)/share/doc/cardinal/docs/ # -------------------------------------------------------------- # Tarball step, for releases tarball: - rm -f ../Cardinal-$(VERSION).tar + rm -f ../cardinal-$(VERSION).tar tar -c --lzma \ + --exclude=".appveyor*" \ + --exclude=".ci*" \ + --exclude=".clang*" \ + --exclude=".drone*" \ + --exclude=".editor*" \ --exclude=".git*" \ --exclude=".travis*" \ + --exclude=".vscode*" \ --exclude="*.kdev4" \ --exclude="carla/source/modules/juce_*" \ + --exclude="carla/source/native-plugins/external/zynaddsubfx*" \ + --exclude="src/Rack/dep/osdialog/osdialog_*" \ --exclude="src/Rack/icon.*" \ --exclude=bin \ --exclude=build \ @@ -284,6 +292,8 @@ tarball: --exclude=carla/source/jackbridge \ --exclude=carla/source/interposer \ --exclude=carla/source/libjack \ + --exclude=carla/source/native-plugins/resources \ + --exclude=carla/source/rest \ --exclude=carla/source/tests.old \ --exclude=carla/source/theme \ --exclude=carla/resources \ @@ -292,18 +302,66 @@ tarball: --exclude=deps/unzipfx \ --exclude=docs/.generate-plugin-licenses.sh \ --exclude=docs/MODDEVICES.md \ + --exclude=dpf/cmake \ --exclude=dpf/examples \ + --exclude=dpf/lac \ + --exclude=dpf/tests \ --exclude=jucewrapper \ --exclude=lv2export \ --exclude=patches \ --exclude=plugins/.kdev_include_paths \ --exclude=plugins/todo.txt \ + --exclude=plugins/AriaModules/res/Arcane \ + --exclude=plugins/AudibleInstruments/design \ + --exclude=plugins/BaconPlugs/res/midi/beeth \ + --exclude=plugins/BogaudioModules/res-pp \ + --exclude=plugins/BogaudioModules/res-src \ + --exclude=plugins/Cardinal/orig \ + --exclude=plugins/GrandeModular/res-src \ --exclude=src/MOD \ + --exclude=src/Rack/adapters \ + --exclude=src/Rack/dep/filesystem/cmake \ + --exclude=src/Rack/dep/filesystem/examples \ + --exclude=src/Rack/dep/filesystem/test \ + --exclude=src/Rack/dep/glfw/CMake \ + --exclude=src/Rack/dep/glfw/deps \ + --exclude=src/Rack/dep/glfw/docs \ + --exclude=src/Rack/dep/glfw/examples \ + --exclude=src/Rack/dep/glfw/src \ + --exclude=src/Rack/dep/glfw/tests \ + --exclude=src/Rack/dep/nanosvg/example \ + --exclude=src/Rack/dep/nanovg \ + --exclude=src/Rack/dep/rtaudio \ + --exclude=src/Rack/include/audio.hpp \ + --exclude=src/Rack/include/midi.hpp \ + --exclude=src/Rack/include/engine/Port.hpp \ --exclude=src/Rack/src/core \ + --exclude=src/Rack/src/asset.cpp \ + --exclude=src/Rack/src/audio.cpp \ + --exclude=src/Rack/src/common.cpp \ + --exclude=src/Rack/src/context.cpp \ + --exclude=src/Rack/src/dep.cpp \ + --exclude=src/Rack/src/discord.cpp \ + --exclude=src/Rack/src/gamepad.cpp \ + --exclude=src/Rack/src/keyboard.cpp \ + --exclude=src/Rack/src/library.cpp \ + --exclude=src/Rack/src/midi.cpp \ + --exclude=src/Rack/src/network.cpp \ + --exclude=src/Rack/src/plugin.cpp \ + --exclude=src/Rack/src/rtaudio.cpp \ + --exclude=src/Rack/src/rtmidi.cpp \ + --exclude=src/Rack/src/app/AudioDisplay.cpp \ + --exclude=src/Rack/src/app/MenuBar.cpp \ + --exclude=src/Rack/src/app/MidiDisplay.cpp \ + --exclude=src/Rack/src/app/Scene.cpp \ + --exclude=src/Rack/src/app/TipWindow.cpp \ + --exclude=src/Rack/src/engine/Engine.cpp \ + --exclude=src/Rack/src/plugin/Model.cpp \ + --exclude=src/Rack/src/window/Window.cpp \ --exclude=src/Rack/res/Core \ --exclude=src/Rack/res/icon.png \ --transform='s,^\.,Cardinal-$(VERSION),' \ - -f ../Cardinal-$(VERSION).tar.xz . + -f ../cardinal-$(VERSION).tar.xz . # -------------------------------------------------------------- diff --git a/plugins/Makefile b/plugins/Makefile index 6087204..bbf3ba4 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -845,6 +845,7 @@ RESOURCE_FILES += BaconPlugs/res/midi/chopin RESOURCE_FILES += BaconPlugs/res/midi/debussy RESOURCE_FILES += BaconPlugs/res/midi/goldberg RESOURCE_FILES += Cardinal/res/Miku/Miku.png +RESOURCE_FILES += cf/playeroscs RESOURCE_FILES += DrumKit/res/samples RESOURCE_FILES += MindMeldModular/res/ShapeMaster/CommunityPresets RESOURCE_FILES += MindMeldModular/res/ShapeMaster/CommunityShapes diff --git a/src/CardinalPlugin.cpp b/src/CardinalPlugin.cpp index 2686246..1f90343 100644 --- a/src/CardinalPlugin.cpp +++ b/src/CardinalPlugin.cpp @@ -151,10 +151,10 @@ struct Initializer // If source code dir does not exist use install target prefix as system dir else #endif - if (system::exists(CARDINAL_PLUGIN_PREFIX "/share/Cardinal")) + if (system::exists(CARDINAL_PLUGIN_PREFIX "/share/cardinal")) { - asset::bundlePath = CARDINAL_PLUGIN_PREFIX "/share/Cardinal/PluginManifests"; - asset::systemDir = CARDINAL_PLUGIN_PREFIX "/share/Cardinal"; + asset::bundlePath = CARDINAL_PLUGIN_PREFIX "/share/cardinal/PluginManifests"; + asset::systemDir = CARDINAL_PLUGIN_PREFIX "/share/cardinal"; templatePath = system::join(asset::systemDir, "template.vcv"); } }