Ship less bloat, fix naming problem

Author: timothyschoen

CMakeLists.txt

@@ -22,6 +22,7 @@ option(MACOS_LEGACY "Enable support for old macOS versions (lowers OSX_DEPLOYMEN
 option(CUSTOM_PLUGIN_NAME "Export a custom plugdata based plugin" "plugdata")
 option(CUSTOM_PLUGIN_COMPANY "Export a custom plugdata based plugin" "plugdata")
 option(CUSTOM_PLUGIN_PATH "Export a custom plugdata based plugin" "")
+option(CUSTOM_PLUGIN_IS_FX "Custom plugin export is an effect" ON)
 
 option(VERBOSE "" OFF)
 
@@ -332,8 +333,14 @@ list(APPEND PLUGDATA_COMPILE_DEFINITIONS JUCE_MODAL_LOOPS_PERMITTED=1)
 if(CUSTOM_PLUGIN_NAME)
     list(APPEND PLUGDATA_COMPILE_DEFINITIONS PROJECT_NAME=${CUSTOM_PLUGIN_NAME} COMPANY_NAME=${CUSTOM_PLUGIN_COMPANY} CUSTOM_PLUGIN=1)
     set(STANDALONE_NAME ${CUSTOM_PLUGIN_NAME})
-    set(INSTRUMENT_NAME ${CUSTOM_PLUGIN_NAME})
-    set(FX_NAME ${CUSTOM_PLUGIN_NAME})
+    if(CUSTOM_PLUGIN_IS_FX)
+        set(INSTRUMENT_NAME "${CUSTOM_PLUGIN_NAME}-instrument")
+        set(FX_NAME ${CUSTOM_PLUGIN_NAME})
+    else()
+        set(INSTRUMENT_NAME ${CUSTOM_PLUGIN_NAME})
+        set(FX_NAME "${CUSTOM_PLUGIN_NAME}-fx")
+    endif()
+
 else()
     set(STANDALONE_NAME "plugdata")
     if("${CMAKE_SYSTEM_NAME}" MATCHES "iOS")
@@ -465,8 +472,6 @@ juce_add_plugin(plugdata_standalone
     target_sources(plugdata_standalone_Standalone PUBLIC ${IOS_LAUNCHSCREEN})
 endif()
 
-
-
 juce_add_plugin(plugdata
     VERSION                     ${PLUGDATA_VERSION}
     PLUGIN_DESCRIPTION          "Visual audio programming environment"
@@ -528,8 +533,6 @@ juce_add_plugin(plugdata_fx
     VST3_CATEGORIES             Fx
     VST2_CATEGORY               kPlugCategEffect)
 
-
-
 if(APPLE)
 juce_add_plugin(plugdata_midi
     VERSION                     ${PLUGDATA_VERSION}

Resources/Scripts/package_custom_resources.py

@@ -256,14 +256,14 @@ def generate_binary_data(output_dir, file_list):
 
 makeDir("Extra")
 copyDir(project_root + "/Libraries/pd-else/Documentation/Extra-files", "Extra/else")
-#globCopy("Extra/else/audio/*", "Extra/else")
 removeDir("Extra/else/audio")
 
 copyDir(project_root + "/Libraries/pd-else/Source/Audio/sfz~/sfz", "Extra/else/sfz")
-copyDir(project_root + "/Resources/Patches/Presets", "./Extra/Presets")
 convert_merda.process(project_root + "/Libraries/pd-else/Abstractions/Merda/Modules/")
 globCopy(project_root + "/Libraries/pd-else/Abstractions/Merda/Modules/*.pd", "./Extra/else")
 copyDir(project_root + "/Libraries/pd-else/Abstractions/Merda/Modules/brane-presets", "./Extra/else/brane-presets")
+removeDir("./Extra/else/sf") # soundfont is too large to ship
+globMove("./Extra/else/*-help.pd", project_root + "/Libraries/pd-else/Documentation") # move these out of tree
 
 # pd-lua
 makeDir("Extra/pdlua")