Merge pull request #2508 from sensei-hacker/fix-macos-dmg-windows-binaries

Fix postPackage hook to remove non-native SITL binaries from macOS builds

Author: sensei-hacker

forge.config.js

@@ -49,16 +49,38 @@ export default {
     // Remove SITL binaries for other platforms/architectures to reduce package size
     postPackage: async (forgeConfig, options) => {
       for (const outputPath of options.outputPaths) {
-        const sitlPath = path.join(outputPath, 'resources', 'sitl');
-        if (!fs.existsSync(sitlPath)) continue;
+        let sitlPath;
+
+        if (options.platform === 'darwin') {
+          // macOS app bundle structure: <outputDir>/<AppName>.app/Contents/Resources/sitl
+          // Find the .app directory
+          const appBundles = fs.readdirSync(outputPath).filter(f => f.endsWith('.app'));
+          if (appBundles.length === 0) {
+            console.log(`postPackage: No .app bundle found in ${outputPath}`);
+            continue;
+          }
+          sitlPath = path.join(outputPath, appBundles[0], 'Contents', 'Resources', 'sitl');
+        } else {
+          // Windows/Linux: <outputPath>/resources/sitl
+          sitlPath = path.join(outputPath, 'resources', 'sitl');
+        }
+
+        console.log(`postPackage: Checking SITL path for ${options.platform}: ${sitlPath}`);
+        if (!fs.existsSync(sitlPath)) {
+          console.log(`postPackage: SITL path not found, skipping: ${sitlPath}`);
+          continue;
+        }
 
         if (options.platform === 'win32') {
+          console.log('postPackage: Removing non-Windows SITL binaries (linux, macos)');
           fs.rmSync(path.join(sitlPath, 'linux'), { recursive: true, force: true });
           fs.rmSync(path.join(sitlPath, 'macos'), { recursive: true, force: true });
         } else if (options.platform === 'darwin') {
+          console.log('postPackage: Removing non-macOS SITL binaries (linux, windows)');
           fs.rmSync(path.join(sitlPath, 'linux'), { recursive: true, force: true });
           fs.rmSync(path.join(sitlPath, 'windows'), { recursive: true, force: true });
         } else if (options.platform === 'linux') {
+          console.log('postPackage: Removing non-Linux SITL binaries (macos, windows)');
           fs.rmSync(path.join(sitlPath, 'macos'), { recursive: true, force: true });
           fs.rmSync(path.join(sitlPath, 'windows'), { recursive: true, force: true });
           // Remove wrong architecture