From c521620b04473a5a5b3cea826b21d73fed2d2d20 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 22 Feb 2025 06:52:50 -0600 Subject: fix build and cleanup old code --- Makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b3122f9..6809995 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ VERSION = $(shell git describe --tags) BUILDTIME = $(shell date +%Y.%m.%d_%H%M) -run: build - ./go-clone --version +run: install build-darwin build-darwin-arm64 build-windows + go-clone --version vet: @GO111MODULE=off go vet @echo this go binary package builds okay -no-gui: build +no-gui: install build-darwin build-windows ./go-clone --no-gui build: goimports @@ -16,12 +16,17 @@ build: goimports -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" build-darwin: - GOOS=darwin GOARCH=amd64 GO111MODULE=off go build -v -o go-clone-darwin \ + GOOS=darwin GOARCH=amd64 GO111MODULE=off go build -v -o go-clone-darwin.x86 \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" -build-windows: - GOOS=windows GOARCH=amd64 GO111MODULE=off go build -v go-clone.exe \ + +build-darwin-arm64: + GOOS=darwin GOARCH=arm64 GO111MODULE=off go build -v -o go-clone-darwin.arm \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" +build-windows: + GOOS=windows GOARCH=amd64 GO111MODULE=off go build -v -o go-clone.exe \ + -ldflags "-X main.VERSION=v0.7.46 -X main.BUILDTIME=2025.02.22_0643 -X gui.GUIVERSION=v0.7.46" + install: goimports GO111MODULE=off go install \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" @@ -45,6 +50,7 @@ nocui: build ./go-clone --gui nocui clean: + rm -f go.* -rm go-clone # this will test the golang.org/x -> googlesource override -- cgit v1.2.3