Change build script to make a universal binary

Author: steipete

ax/Makefile

@@ -1,5 +1,31 @@
-build:
-	swift build -c release
+# Makefile for ax Swift utility
 
-run:
-	swift run -c release
+# Variables
+SWIFT_BUILD_DIR := .build/apple/Products/Release
+UNIVERSAL_BINARY_NAME := ax
+UNIVERSAL_BINARY_PATH := $(SWIFT_BUILD_DIR)/$(UNIVERSAL_BINARY_NAME)
+FINAL_BINARY_PATH := $(CURDIR)/$(UNIVERSAL_BINARY_NAME)
+
+# Default target
+all: $(FINAL_BINARY_PATH)
+
+# Build the universal binary, strip it, and place it in the ax/ directory
+$(FINAL_BINARY_PATH): $(UNIVERSAL_BINARY_PATH)
+	@echo "Copying stripped universal binary to $(FINAL_BINARY_PATH)"
+	@cp $(UNIVERSAL_BINARY_PATH) $(FINAL_BINARY_PATH)
+	@echo "Final binary ready at $(FINAL_BINARY_PATH)"
+
+$(UNIVERSAL_BINARY_PATH):
+	@echo "Building universal binary for $(UNIVERSAL_BINARY_NAME) (arm64 + x86_64) with size optimization (Osize, ThinLTO, dead_strip)..."
+	@swift build -c release --arch arm64 --arch x86_64 -Xswiftc -Osize -Xswiftc -lto=llvm-thin -Xcc -Wl,-dead_strip
+	@echo "Stripping symbols from $(UNIVERSAL_BINARY_PATH)..."
+	@strip $(UNIVERSAL_BINARY_PATH)
+	@echo "Universal binary built and stripped at $(UNIVERSAL_BINARY_PATH)"
+
+# Clean build artifacts
+clean:
+	@echo "Cleaning build artifacts..."
+	@rm -rf .build $(FINAL_BINARY_PATH)
+	@echo "Clean complete."
+
+.PHONY: all clean

ax/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
         .executableTarget(
-            name: "x",
+            name: "ax",
             swiftSettings: [
                 .unsafeFlags(["-framework", "ApplicationServices", "-framework", "AppKit"])
             ]

ax/ax_runner.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 # Simple wrapper script to catch signals and diagnose issues
 
-exec ./.build/release/x "$@"
+exec ./ax "$@"