diff --git a/Makefile b/Makefile
index ccc1be7..649c8de 100644
--- a/Makefile
+++ b/Makefile
@@ -283,7 +283,7 @@ TARGETS += src/DPF/utils/lv2_ttl_generator$(APP_EXT)
# ---------------------------------------------------------------------------------------------------------------------
all: $(TARGETS)
- ./utils/run.sh $(PAWPAW_TARGET) $(MAKE) -C src/plugin
+ ./utils/run.sh $(PAWPAW_TARGET) $(MAKE) NOOPT=true -C src/plugin
./utils/run.sh $(PAWPAW_TARGET) $(CURDIR)/src/DPF/utils/generate-ttl.sh build-plugin
clean:
@@ -300,7 +300,7 @@ clean:
rm -rf build-ui
src/DPF/utils/lv2_ttl_generator$(APP_EXT):
- ./utils/run.sh $(PAWPAW_TARGET) $(MAKE) -C src/DPF/utils/lv2-ttl-generator
+ ./utils/run.sh $(PAWPAW_TARGET) $(MAKE) NOOPT=true -C src/DPF/utils/lv2-ttl-generator
plugins: $(foreach PLUGIN,$(PLUGINS),$(call PLUGIN_STAMP,$(PLUGIN)))
diff --git a/VERSION b/VERSION
index 8cbf02c..43b2961 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.12
+0.0.13
diff --git a/src/plugin/Makefile b/src/plugin/Makefile
index 5b448a1..3d9f5ea 100644
--- a/src/plugin/Makefile
+++ b/src/plugin/Makefile
@@ -48,7 +48,7 @@ BUILD_CXX_FLAGS += $(shell $(PKG_CONFIG) --cflags Qt5Core)
LINK_FLAGS += -ldl -lrt
endif
-TARGETS = clap lv2_sep vst2 vst3
+TARGETS = au clap lv2_sep vst2 vst3
# ---------------------------------------------------------------------------------------------------------------------
diff --git a/utils/macos/macos-pkg.sh b/utils/macos/macos-pkg.sh
index a587783..865085f 100755
--- a/utils/macos/macos-pkg.sh
+++ b/utils/macos/macos-pkg.sh
@@ -20,11 +20,19 @@ rm -rf mod-ui/modtools/__pycache__
./utils/pack-html.sh
# create pkg dir for placing patched app bundle inside
-mkdir build/pkg
-gcp -rL "build/mod-desktop.app" "build/pkg/MOD Desktop.app"
+mkdir build/pkg build/pkg/app
+gcp -rL "build/mod-desktop.app" "build/pkg/app/MOD Desktop.app"
+
+# create pkg dir for plugins
+mkdir build/pkg/au build/pkg/clap build/pkg/lv2 build/pkg/vst2 build/pkg/vst3
+gcp -rL build-plugin/*.component build/pkg/au/
+gcp -rL build-plugin/*.clap build/pkg/clap/
+gcp -rL build-plugin/*.lv2 build/pkg/lv2/
+gcp -rL build-plugin/*.vst build/pkg/vst2/
+gcp -rL build-plugin/*.vst3 build/pkg/vst3/
# patch rpath for Qt libs and jack tools
-pushd "build/pkg/MOD Desktop.app/Contents"
+pushd "build/pkg/app/MOD Desktop.app/Contents"
rm -rf Frameworks/*/*.prl
rm -rf Frameworks/*/Headers
@@ -68,7 +76,7 @@ if [ -n "${CODESIGN_APP_IDENTITY}" ]; then
security set-key-partition-list -S apple-tool:,apple: -k dummypassword build.keychain
security list-keychains -d user -s build.keychain login.keychain
- pushd "build/pkg/MOD Desktop.app/Contents/LV2"
+ pushd "build/pkg/app/MOD Desktop.app/Contents/LV2"
for f in $(find . -name "*.dylib"); do
codesign -s "${CODESIGN_APP_IDENTITY}" \
@@ -76,7 +84,7 @@ if [ -n "${CODESIGN_APP_IDENTITY}" ]; then
--verbose \
--timestamp \
--option runtime \
- --entitlements "../../../../../utils/macos/entitlements.plist" \
+ --entitlements "../../../../../../utils/macos/entitlements.plist" \
"${f}"
done
@@ -89,7 +97,42 @@ if [ -n "${CODESIGN_APP_IDENTITY}" ]; then
--timestamp \
--option runtime \
--entitlements "utils/macos/entitlements.plist" \
- "build/pkg/MOD Desktop.app"
+ "build/pkg/app/MOD Desktop.app"
+
+ codesign -s "${CODESIGN_APP_IDENTITY}" \
+ --deep \
+ --force \
+ --verbose \
+ --timestamp \
+ --option runtime \
+ --entitlements "utils/macos/entitlements.plist" \
+ build/pkg/clap/*.clap
+
+ codesign -s "${CODESIGN_APP_IDENTITY}" \
+ --force \
+ --verbose \
+ --timestamp \
+ --option runtime \
+ --entitlements "utils/macos/entitlements.plist" \
+ build/pkg/lv2/*.lv2/*.dylib
+
+ codesign -s "${CODESIGN_APP_IDENTITY}" \
+ --deep \
+ --force \
+ --verbose \
+ --timestamp \
+ --option runtime \
+ --entitlements "utils/macos/entitlements.plist" \
+ build/pkg/vst2/*.vst
+
+ codesign -s "${CODESIGN_APP_IDENTITY}" \
+ --deep \
+ --force \
+ --verbose \
+ --timestamp \
+ --option runtime \
+ --entitlements "utils/macos/entitlements.plist" \
+ build/pkg/vst3/*.vst3
PKG_SIGN_ARGS=(--sign "${CODESIGN_PKG_IDENTITY}")
fi
@@ -99,10 +142,46 @@ pkgbuild \
--identifier "audio.mod.desktop-app" \
--component-plist "utils/macos/build.plist" \
--install-location "/Applications/" \
- --root "${PWD}/build/pkg/" \
+ --root "${PWD}/build/pkg/app/" \
"${PKG_SIGN_ARGS[@]}" \
build/mod-desktop.pkg
+# create plugins pkgs
+pkgbuild \
+ --identifier "audio.mod.desktop-components" \
+ --install-location "/Library/Audio/Plug-Ins/Components/" \
+ --root "${PWD}/build/pkg/au/" \
+ "${PKG_SIGN_ARGS[@]}" \
+ build/mod-desktop-components.pkg
+
+pkgbuild \
+ --identifier "audio.mod.desktop-clapbundles" \
+ --install-location "/Library/Audio/Plug-Ins/CLAP/" \
+ --root "${PWD}/build/pkg/clap/" \
+ "${PKG_SIGN_ARGS[@]}" \
+ build/mod-desktop-clapbundles.pkg
+
+pkgbuild \
+ --identifier "audio.mod.desktop-lv2bundles" \
+ --install-location "/Library/Audio/Plug-Ins/LV2/" \
+ --root "${PWD}/build/pkg/lv2/" \
+ "${PKG_SIGN_ARGS[@]}" \
+ build/mod-desktop-lv2bundles.pkg
+
+pkgbuild \
+ --identifier "audio.mod.desktop-vst2bundles" \
+ --install-location "/Library/Audio/Plug-Ins/VST/" \
+ --root "${PWD}/build/pkg/vst2/" \
+ "${PKG_SIGN_ARGS[@]}" \
+ build/mod-desktop-vst2bundles.pkg
+
+pkgbuild \
+ --identifier "audio.mod.desktop-vst3bundles" \
+ --install-location "/Library/Audio/Plug-Ins/VST3/" \
+ --root "${PWD}/build/pkg/vst3/" \
+ "${PKG_SIGN_ARGS[@]}" \
+ build/mod-desktop-vst3bundles.pkg
+
# create final pkg
sed -e "s|@builddir@|${PWD}/build|" \
utils/macos/package.xml.in > build/package.xml
diff --git a/utils/macos/package.xml.in b/utils/macos/package.xml.in
index 286e3b3..8dcf9cf 100644
--- a/utils/macos/package.xml.in
+++ b/utils/macos/package.xml.in
@@ -6,10 +6,30 @@
-
+
mod-desktop.pkg
+
+ mod-desktop-components.pkg
+
+
+ mod-desktop-clapbundles.pkg
+
+
+ mod-desktop-lv2bundles.pkg
+
+
+ mod-desktop-vst2bundles.pkg
+
+
+ mod-desktop-vst3bundles.pkg
+
+
+
+
+
+