From 69870fd4c0ea01ec2b0569b84c9a2ef0d38092bf Mon Sep 17 00:00:00 2001 From: dreamer Date: Sun, 1 Dec 2024 19:44:44 +0100 Subject: [PATCH 1/4] target app bundle when using gui on mac --- Source/Heavy/DPFExporter.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Heavy/DPFExporter.h b/Source/Heavy/DPFExporter.h index 499daa857..f95b7aba4 100644 --- a/Source/Heavy/DPFExporter.h +++ b/Source/Heavy/DPFExporter.h @@ -291,7 +291,14 @@ class DPFExporter : public ExporterBase { if (clap) outputFile.getChildFile("bin").getChildFile(name + ".clap").moveFileTo(outputFile.getChildFile(name + ".clap")); if (jack) +#if JUCE_MAC + if (exportType == 2) + outputFile.getChildFile("bin").getChildFile(name + ".app").moveFileTo(outputFile.getChildFile(name + ".app")); + else + outputFile.getChildFile("bin").getChildFile(name).moveFileTo(outputFile.getChildFile(name)); +#else outputFile.getChildFile("bin").getChildFile(name).moveFileTo(outputFile.getChildFile(name)); +#endif bool compilationExitCode = getExitCode(); From a2ae80b1cd4e2cd1df4c417910cc974f915e6804 Mon Sep 17 00:00:00 2001 From: dreamer Date: Sun, 1 Dec 2024 21:32:02 +0100 Subject: [PATCH 2/4] remove some duplicate code --- Source/Heavy/DPFExporter.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Heavy/DPFExporter.h b/Source/Heavy/DPFExporter.h index f95b7aba4..47405c785 100644 --- a/Source/Heavy/DPFExporter.h +++ b/Source/Heavy/DPFExporter.h @@ -278,14 +278,12 @@ class DPFExporter : public ExporterBase { outputFile.getChildFile("bin").getChildFile(name + ".lv2").copyDirectoryTo(outputFile.getChildFile(name + ".lv2")); if (vst3) outputFile.getChildFile("bin").getChildFile(name + ".vst3").copyDirectoryTo(outputFile.getChildFile(name + ".vst3")); -#if JUCE_WINDOWS if (vst2) +#if JUCE_WINDOWS outputFile.getChildFile("bin").getChildFile(name + "-vst.dll").moveFileTo(outputFile.getChildFile(name + "-vst.dll")); #elif JUCE_LINUX - if (vst2) outputFile.getChildFile("bin").getChildFile(name + "-vst.so").moveFileTo(outputFile.getChildFile(name + "-vst.so")); #elif JUCE_MAC - if (vst2) outputFile.getChildFile("bin").getChildFile(name + ".vst").copyDirectoryTo(outputFile.getChildFile(name + ".vst")); #endif if (clap) From 4d4e7f3cea0100b0d65345c757c345a6d4ed5342 Mon Sep 17 00:00:00 2001 From: dreamer Date: Mon, 2 Dec 2024 07:31:03 +0100 Subject: [PATCH 3/4] fix package name with no notarize --- .github/scripts/package-macOS.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/package-macOS.sh b/.github/scripts/package-macOS.sh index dfb1d9b1a..18f988915 100755 --- a/.github/scripts/package-macOS.sh +++ b/.github/scripts/package-macOS.sh @@ -155,7 +155,7 @@ rm -r $PKG_DIR if [ -z "$AC_USERNAME" ]; then echo "No user name, skipping sign/notarize" # pretend that we signed the package and bail out - mv ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-$1.pkg + mv ${PRODUCT_NAME}.pkg $1 exit 0 fi From 1facede9c7faa3e10863cde05f86f1a584761c29 Mon Sep 17 00:00:00 2001 From: dreamer Date: Mon, 2 Dec 2024 08:24:29 +0100 Subject: [PATCH 4/4] add .exe for jack builds on windows --- Source/Heavy/DPFExporter.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Heavy/DPFExporter.h b/Source/Heavy/DPFExporter.h index 47405c785..bef84c238 100644 --- a/Source/Heavy/DPFExporter.h +++ b/Source/Heavy/DPFExporter.h @@ -294,6 +294,8 @@ class DPFExporter : public ExporterBase { outputFile.getChildFile("bin").getChildFile(name + ".app").moveFileTo(outputFile.getChildFile(name + ".app")); else outputFile.getChildFile("bin").getChildFile(name).moveFileTo(outputFile.getChildFile(name)); +#elif JUCE_WINDOWS + outputFile.getChildFile("bin").getChildFile(name + ".exe").moveFileTo(outputFile.getChildFile(name + ".exe")); #else outputFile.getChildFile("bin").getChildFile(name).moveFileTo(outputFile.getChildFile(name)); #endif