From 879c832f60f8e10ff9ade98a1ef5118abb71adf9 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Mon, 8 Dec 2025 16:52:40 +0200 Subject: [PATCH] Set BPM version using git --- Makefile | 3 ++- src/bpm/config/config.go | 3 +++ src/bpm/main.go | 5 ++--- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 src/bpm/config/config.go diff --git a/Makefile b/Makefile index 7b9f170..809ca10 100644 --- a/Makefile +++ b/Makefile @@ -7,12 +7,13 @@ SYSCONFDIR := $(PREFIX)/etc GO ?= go # Build-time variables +VERSION ?= $(shell git describe --tags --dirty) ROOT_COMPILATION_UID ?= 65534 ROOT_COMPILATION_GID ?= 65534 build: mkdir -p build - cd src/bpm; $(GO) build $(GOFLAGS) -ldflags "-w -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationUID=$(ROOT_COMPILATION_UID)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationGID=$(ROOT_COMPILATION_GID)'" -o ../../build/bpm git.enumerated.dev/bubble-package-manager/bpm/src/bpm + cd src/bpm; $(GO) build $(GOFLAGS) -ldflags "-w -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpm/config.BpmVersion=$(VERSION)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationUID=$(ROOT_COMPILATION_UID)' -X 'git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib.rootCompilationGID=$(ROOT_COMPILATION_GID)'" -o ../../build/bpm git.enumerated.dev/bubble-package-manager/bpm/src/bpm install: build/bpm config/ # Create directory diff --git a/src/bpm/config/config.go b/src/bpm/config/config.go new file mode 100644 index 0000000..790f517 --- /dev/null +++ b/src/bpm/config/config.go @@ -0,0 +1,3 @@ +package config + +var BpmVersion = "dev" diff --git a/src/bpm/main.go b/src/bpm/main.go index ee7dba3..9b891f5 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -14,6 +14,7 @@ import ( "sort" "strings" + "git.enumerated.dev/bubble-package-manager/bpm/src/bpm/config" "git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib" "github.com/lithammer/fuzzysearch/fuzzy" @@ -25,8 +26,6 @@ import ( /* A simple-to-use package manager */ /* ------------------------------------------------------- */ -var bpmVer = "0.6.1" - var currentFlagSet *flag.FlagSet var exitCode = 0 @@ -46,7 +45,7 @@ func main() { switch subcommand { case "v", "version": fmt.Println("Bubble Package Manager (BPM)") - fmt.Println("Version: " + bpmVer) + fmt.Println("Version: " + config.BpmVersion) case "q", "query": // Setup flags and help currentFlagSet = flag.NewFlagSet("query", flag.ExitOnError)