diff options
| author | Jeff Carr <[email protected]> | 2025-10-13 04:26:20 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-10-13 04:26:20 -0500 |
| commit | bcb1d9da4f695e9d026da78c5b71fbf267dbe988 (patch) | |
| tree | cf0e8efe4453d96d811d3e4118599dabc5460ec3 | |
| parent | b31ca9e2bbd1a0110a44ff6412036b78429cc321 (diff) | |
cleanups
| -rw-r--r-- | Makefile | 45 |
1 files changed, 9 insertions, 36 deletions
@@ -1,11 +1,9 @@ .PHONY: build VERSION = $(shell git describe --tags) -GUIVERSION = $(shell git describe --tags) -# BUILDTIME = $(shell date +%Y.%m.%d) BUILDTIME = $(shell date +%s) -default: install +justinstall: install # This will re-generate ALL of the needed autogenerated .pb.go files generate: clean @@ -16,29 +14,17 @@ generate: clean build-all-oses: go-build build-darwin build-windows -go-build: goimports +build: goimports GO111MODULE=off go build \ - -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" + -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME}" -verbose: +build-verbose: GO111MODULE=off go build -v -x \ - -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" + -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME}" install: goimports GO111MODULE=off go install \ - -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 wit-darwin.x86 \ - -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" - -build-darwin-arm64: - GOOS=darwin GOARCH=arm64 GO111MODULE=off go build -v -o wit-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 wit.exe \ - -ldflags "-X main.VERSION=v0.7.46 -X main.BUILDTIME=2025.02.22_0643 -X gui.GUIVERSION=v0.7.46" + -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME}" vet: GO111MODULE=off go vet @@ -62,12 +48,6 @@ gpl: check-git-clean: @git diff-index --quiet HEAD -- || (echo "Git repository is dirty, please commit your changes first"; exit 1) -old-debian-release: install - wit-test debian --dry-run --verbose --release - -debian-release-build-only: install - wit-test debian --verbose --release - apt-update: apt-get update \ -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/wit.list \ @@ -84,17 +64,10 @@ publish: GUIRELEASE_REASON="automated" wit publish forge show -deb: - wit build deb --verbose - forge normal - -deb-forcedirty: - wit build deb --verbose --force - forge normal - -deb-all: - wit build deb --verbose --all +deb-with-commits: + forge commit --all forge normal + wit build deb --all --force all: forge commit --all |