refactor: move macOS build to Makefile

D3SOX · ansgarbecker · commit f41a6ffdee84 · 2026-01-04T13:22:09.000+01:00
diff --git a/.github/workflows/lazarus.yaml b/.github/workflows/lazarus.yaml
@@ -93,11 +93,7 @@ jobs:
 
         - name: Build HeidiSQL (macOS)
           if: ${{ matrix.operating-system == 'macos-latest' }}
-          run: |
-            echo Building for macOS
-            lazbuild -B --bm=Release heidisql.lpi
-            mkdir -p ./out/macos
-            mv -v ./out/heidisql ./out/macos/heidisql
+          run: make build-macos
 
         - name: Upload binaries macOS
           if: ${{ matrix.operating-system == 'macos-latest' && matrix.lazarus-versions == 'stable' }}
diff --git a/Makefile b/Makefile
@@ -8,6 +8,7 @@ BIN := ./out/heidisql
 BINGTK := ./out/gtk2/heidisql
 BINQT5 := ./out/qt5/heidisql
 BINQT6 := ./out/qt6/heidisql
+BINMACOS := ./out/macos/heidisql
 
 # Make shell magic to get version from somewhere
 #VERSION := shell magic
@@ -23,14 +24,14 @@ endif
 
 VERSION := $(shell echo $(tag) | sed "s/v//")
 
-.PHONY: all clean tx-pull copy-locale build-mo build-gtk2 run-gtk2 build-qt5 run-qt5 build-qt6 run-qt6 deb-package tar-gtk2 tar-qt5 tar-qt6
+.PHONY: all clean tx-pull copy-locale build-mo build-gtk2 run-gtk2 build-qt5 run-qt5 build-qt6 run-qt6 build-macos deb-package tar-gtk2 tar-qt5 tar-qt6
 
 all: clean build-gtk2 build-qt5 build-qt6 deb-package tar-gtk2 tar-qt5 tar-qt6
 
 clean:
 	@echo "=== Cleaning"
 	@rm -rf ./bin/lib/x86_64-linux/*
-	@rm -f ./out/gtk2/* ./out/qt5/* ./out/qt6/*
+	@rm -f ./out/gtk2/* ./out/qt5/* ./out/qt6/* ./out/macos/*
 	@rm -rf ./deb ./rpm ./tar ./dist
 
 copy-locale:
@@ -80,6 +81,12 @@ run-qt6: build-qt6
 	@cp -v $(BINQT6) ./run/heidisql
 	@./run/heidisql
 
+build-macos:
+	@echo "=== Building macOS"
+	$(LAZBUILD) $(OPTS) $(LPI)
+	@mkdir -p ./out/macos
+	@mv -v $(BIN) $(BINMACOS)
+
 deb-package:
 	@echo "=== Creating debian package"
 	rm -vrf deb
