✨ Support packaging of multiple systems including Linux/Windows

bin/builders/MacBuilder.ts

@@ -4,37 +4,56 @@ import { PakeAppOptions } from '@/types';
 import BaseBuilder from './BaseBuilder';
 
 export default class MacBuilder extends BaseBuilder {
+  private buildFormat: string;
+  private buildArch: string;
+
   constructor(options: PakeAppOptions) {
     super(options);
+
+    // Store the original targets value for architecture selection
+    this.buildArch = options.targets || 'auto';
+
     // Use DMG by default for distribution
     // Only create app bundles for testing to avoid user interaction
     if (process.env.PAKE_CREATE_APP === '1') {
-      this.options.targets = 'app';
+      this.buildFormat = 'app';
     } else {
-      this.options.targets = 'dmg';
+      this.buildFormat = 'dmg';
     }
+
+    // Set targets to format for Tauri
+    this.options.targets = this.buildFormat;
   }
 
   getFileName(): string {
     const { name } = this.options;
 
     // For app bundles, use simple name without version/arch
-    if (this.options.targets === 'app') {
+    if (this.buildFormat === 'app') {
       return name;
     }
 
     // For DMG files, use versioned filename
     let arch: string;
-    if (this.options.multiArch) {
+    if (this.buildArch === 'universal' || this.options.multiArch) {
       arch = 'universal';
+    } else if (this.buildArch === 'apple') {
+      arch = 'aarch64';
+    } else if (this.buildArch === 'intel') {
+      arch = 'x64';
     } else {
+      // Auto-detect based on current architecture
       arch = process.arch === 'arm64' ? 'aarch64' : process.arch;
     }
     return `${name}_${tauriConfig.version}_${arch}`;
   }
 
   protected getBuildCommand(): string {
-    if (this.options.multiArch) {
+    // Determine if we need universal build
+    const needsUniversal =
+      this.buildArch === 'universal' || this.options.multiArch;
+
+    if (needsUniversal) {
       const baseCommand = this.options.debug
         ? 'npm run tauri build -- --debug'
         : 'npm run tauri build --';
@@ -56,14 +75,63 @@ export default class MacBuilder extends BaseBuilder {
         fullCommand += ` --features ${features.join(',')}`;
       }
 
+      return fullCommand;
+    } else if (this.buildArch === 'apple') {
+      // Build for Apple Silicon only
+      const baseCommand = this.options.debug
+        ? 'npm run tauri build -- --debug'
+        : 'npm run tauri build --';
+      const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
+      let fullCommand = `${baseCommand} --target aarch64-apple-darwin -c "${configPath}"`;
+
+      // Add features
+      const features = ['cli-build'];
+      const macOSVersion = this.getMacOSMajorVersion();
+      if (macOSVersion >= 23) {
+        features.push('macos-proxy');
+      }
+      if (features.length > 0) {
+        fullCommand += ` --features ${features.join(',')}`;
+      }
+
+      return fullCommand;
+    } else if (this.buildArch === 'intel') {
+      // Build for Intel only
+      const baseCommand = this.options.debug
+        ? 'npm run tauri build -- --debug'
+        : 'npm run tauri build --';
+      const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
+      let fullCommand = `${baseCommand} --target x86_64-apple-darwin -c "${configPath}"`;
+
+      // Add features
+      const features = ['cli-build'];
+      const macOSVersion = this.getMacOSMajorVersion();
+      if (macOSVersion >= 23) {
+        features.push('macos-proxy');
+      }
+      if (features.length > 0) {
+        fullCommand += ` --features ${features.join(',')}`;
+      }
+
       return fullCommand;
     }
+
     return super.getBuildCommand();
   }
 
   protected getBasePath(): string {
-    return this.options.multiArch
-      ? 'src-tauri/target/universal-apple-darwin/release/bundle'
-      : super.getBasePath();
+    const needsUniversal =
+      this.buildArch === 'universal' || this.options.multiArch;
+    const basePath = this.options.debug ? 'debug' : 'release';
+
+    if (needsUniversal) {
+      return `src-tauri/target/universal-apple-darwin/${basePath}/bundle`;
+    } else if (this.buildArch === 'apple') {
+      return `src-tauri/target/aarch64-apple-darwin/${basePath}/bundle`;
+    } else if (this.buildArch === 'intel') {
+      return `src-tauri/target/x86_64-apple-darwin/${basePath}/bundle`;
+    }
+
+    return super.getBasePath();
   }
 }