wip

Author: olilarkin

.github/workflows/build-mac.yml

@@ -204,33 +204,30 @@ jobs:
           set -eo pipefail
           ./validate_audiounit.sh config.h
 
-      - name: Test AUv3 with auval
-        shell: bash
-        run: |
-          set -eo pipefail
-          APPEX_PATH="./${{matrix.project}}.app/Contents/PlugIns/${{matrix.project}}.appex"
-          if [ -d "$APPEX_PATH" ]; then
-            echo "Found AUv3 appex at $APPEX_PATH"
-
-            # Remove AUv2 component so auval finds the AUv3 (they share the same IDs)
-            echo "Removing AUv2 component to avoid ID conflict..."
-            rm -rf ~/Library/Audio/Plug-Ins/Components/${{matrix.project}}.component
-
-            # Install app to ~/Applications for AUv3 to be discoverable
-            echo "Installing app to ~/Applications..."
-            mkdir -p ~/Applications
-            cp -R ./${{matrix.project}}.app ~/Applications/
-
-            echo "Registering AUv3 with pluginkit..."
-            pluginkit -a ~/Applications/${{matrix.project}}.app/Contents/PlugIns/${{matrix.project}}.appex
-            sleep 2
-            pgrep -x AudioComponentRegistrar >/dev/null && killall -9 AudioComponentRegistrar; echo "killed AudioComponentRegistrar" || echo "AudioComponentRegistrar not running"
-            sleep 3
-            echo "Running auval for AUv3..."
-            ./validate_audiounit.sh config.h
-          else
-            echo "No AUv3 appex found at $APPEX_PATH - skipping AUv3 validation"
-          fi
+      # - name: Test AUv3 with auval
+      #   shell: bash
+      #   run: |
+      #     set -eo pipefail
+      #     APPEX_PATH="./${{matrix.project}}.app/Contents/PlugIns/${{matrix.project}}.appex"
+      #     if [ -d "$APPEX_PATH" ]; then
+      #       echo "Found AUv3 appex at $APPEX_PATH"
+      #       # Remove AUv2 component so auval finds the AUv3 (they share the same IDs)
+      #       echo "Removing AUv2 component to avoid ID conflict..."
+      #       rm -rf ~/Library/Audio/Plug-Ins/Components/${{matrix.project}}.component
+      #       # Install app to ~/Applications for AUv3 to be discoverable
+      #       echo "Installing app to ~/Applications..."
+      #       mkdir -p ~/Applications
+      #       cp -R ./${{matrix.project}}.app ~/Applications/
+      #       echo "Registering AUv3 with pluginkit..."
+      #       pluginkit -a ~/Applications/${{matrix.project}}.app/Contents/PlugIns/${{matrix.project}}.appex
+      #       sleep 2
+      #       pgrep -x AudioComponentRegistrar >/dev/null && killall -9 AudioComponentRegistrar; echo "killed AudioComponentRegistrar" || echo "AudioComponentRegistrar not running"
+      #       sleep 3
+      #       echo "Running auval for AUv3..."
+      #       ./validate_audiounit.sh config.h
+      #     else
+      #       echo "No AUv3 appex found at $APPEX_PATH - skipping AUv3 validation"
+      #     fi
 
       # - name: Test AUv2 with auval (RTSafe)
       #   shell: bash

TemplateProject/scripts/makezip-win.py

@@ -62,14 +62,30 @@ def main():
     files = [
       projectpath + "\\build-win\\TemplateProject_x64.exe",
       projectpath + "\\build-win\\TemplateProject_ARM64EC.exe",
-      projectpath + "\\build-win\\TemplateProject.clap",
     ]
 
     for f in files:
       if os.path.exists(f):
         print("adding " + f)
         zf.write(f, os.path.basename(f), zipfile.ZIP_DEFLATED)
 
+    # Add CLAP files - check postbuild location first, then build output
+    clap_files = [
+      # Postbuild locations
+      (projectpath + "\\build-win\\TemplateProject_x64.clap", "TemplateProject_x64.clap"),
+      (projectpath + "\\build-win\\TemplateProject_ARM64EC.clap", "TemplateProject_ARM64EC.clap"),
+      # Build output locations (fallback)
+      (projectpath + "\\build-win\\clap\\x64\\Release\\TemplateProject.clap", "TemplateProject_x64.clap"),
+      (projectpath + "\\build-win\\clap\\ARM64EC\\Release\\TemplateProject.clap", "TemplateProject_ARM64EC.clap"),
+    ]
+
+    added_claps = set()
+    for clap_path, archive_name in clap_files:
+      if os.path.exists(clap_path) and archive_name not in added_claps:
+        print("adding " + clap_path + " as " + archive_name)
+        zf.write(clap_path, archive_name, zipfile.ZIP_DEFLATED)
+        added_claps.add(archive_name)
+
   zf.close()
   print("wrote " + zipname)
 

TemplateProject/scripts/postbuild-win.bat

@@ -199,8 +199,8 @@ if %PLATFORM% == "x64" (
   )
 
   if %FORMAT% == ".clap" (
-    echo copying x64 binary to build dir: %BUILD_DIR%\%NAME%.clap
-    copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%.clap
+    echo copying x64 binary to build dir: %BUILD_DIR%\%NAME%_x64.clap
+    copy /y %BUILT_BINARY% %BUILD_DIR%\%NAME%_x64.clap
     if exist "%ICUDAT_PATH%" (
       copy /y %ICUDAT_PATH% %BUILD_DIR%
     )