Improve build script for clean builds

Author: steipete

ax/Makefile

@@ -1,32 +1,39 @@
-# Makefile for ax Swift utility
+# Makefile for ax helper
 
-# 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)
+# Define the output binary name
+BINARY_NAME = ax
+UNIVERSAL_BINARY_PATH = ./$(BINARY_NAME)
+RELEASE_BUILD_DIR := ./.build/arm64-apple-macosx/release
+RELEASE_BUILD_DIR_X86 := ./.build/x86_64-apple-macosx/release
 
-# 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)"
+# Build for arm64 and x86_64, then lipo them together
+# -Xswiftc -Osize: Optimize for size
+# -Xlinker -Wl,-dead_strip: Remove dead code
+# strip -x: Strip symbol table and debug info
+# Ensure old binary is removed first
+all:
+	@echo "Cleaning old binary and build artifacts..."
+	rm -f $(UNIVERSAL_BINARY_PATH)
+	swift package clean
+	@echo "Building for arm64..."
+	swift build --arch arm64 -c release -Xswiftc -Osize -Xlinker -dead_strip
+	@echo "Building for x86_64..."
+	swift build --arch x86_64 -c release -Xswiftc -Osize -Xlinker -dead_strip
+	@echo "Creating universal binary..."
+	lipo -create -output $(UNIVERSAL_BINARY_PATH) $(RELEASE_BUILD_DIR)/$(BINARY_NAME) $(RELEASE_BUILD_DIR_X86)/$(BINARY_NAME)
+	@echo "Stripping symbols from universal binary..."
+	strip -x $(UNIVERSAL_BINARY_PATH)
+	@echo "Build complete: $(UNIVERSAL_BINARY_PATH)"
+	@ls -l $(UNIVERSAL_BINARY_PATH)
+	@codesign -s - $(UNIVERSAL_BINARY_PATH)
+	@echo "Codesigned $(UNIVERSAL_BINARY_PATH)"
 
-$(UNIVERSAL_BINARY_PATH):
-	@echo "Building universal binary for $(UNIVERSAL_BINARY_NAME) (arm64 + x86_64) with size optimization (Osize, dead_strip)..."
-	@swift build -c release --arch arm64 --arch x86_64 -Xswiftc -Osize -Xlinker -Wl,-dead_strip
-	@echo "Aggressively stripping symbols (strip -x) from $(UNIVERSAL_BINARY_PATH)..."
-	@strip -x $(UNIVERSAL_BINARY_PATH)
-	@echo "Universal binary built and stripped: $(UNIVERSAL_BINARY_PATH)"
 
 clean:
 	@echo "Cleaning build artifacts..."
-	@rm -rf $(SWIFT_BUILD_DIR)
-	@rm -f $(FINAL_BINARY_PATH)
-	@rm -f $(UNIVERSAL_BINARY_PATH) # Also remove the intermediate universal binary if it exists
+	swift package clean
+	rm -f $(UNIVERSAL_BINARY_PATH)
 	@echo "Clean complete."
 
-.PHONY: all clean
+# Default target
+.DEFAULT_GOAL := all