Changeset 825 in code for trunk

Timestamp:

Apr 17, 2025, 6:34:17 PM (7 weeks ago)

Author:

root

Message:

破壊する

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• cmd/jounce (deleted)
• cmd/jouncectl (deleted)
• cmd/soju (deleted)
• cmd/soju-znc-import (deleted)
• cmd/sojuctl (deleted)
• vendor (deleted)
• version.go (modified) (3 diffs)

trunk/Makefile

@@ -1 +1 @@
 GO ?= go
 RM ?= rm
-GOFLAGS ?= -v -ldflags "-w -X `go list`.Version=$(VERSION) -X `go list`.Commit=$(COMMIT) -X `go list`.Build=$(BUILD)" -mod=vendor
+GOFLAGS ?= -v -ldflags "-w -X `${GO} list`.Version=$(VERSION) -X `${GO} list`.Build=$(BUILD)"
 PREFIX ?= /usr/local
 BINDIR ?= bin
@@ -9 +9 @@
 SYSCONFDIR ?= /etc
 
-VERSION = `git describe --abbrev=0 --tags 2>/dev/null || echo "$VERSION"`
-COMMIT = `git rev-parse --short HEAD || echo "$COMMIT"`
-BRANCH = `git rev-parse --abbrev-ref HEAD`
-BUILD = `git show -s --pretty=format:%cI`
+VERSION = 0.5.0
+BUILD = `date +%Y.%m.%d-%H:%M:%S`
 
 GOARCH ?= amd64

trunk/version.go

@@ -9 +9 @@
 const (
         defaultVersion = "0.0.0"
-        defaultCommit  = "HEAD"
         defaultBuild   = "0000-01-01:00:00+00:00"
 )
@@ -17 +16 @@
         // following semantic versioning and is overwritten by the build system.
         Version = defaultVersion
-
-        // Commit is the commit sha of the build (normally from Git) and is overwritten
-        // by the build system.
-        Commit = defaultCommit
 
         // Build is the date and time of the build as an RFC3339 formatted string
@@ -31 +26 @@
         var sb strings.Builder
 
-        isDefault := Version == defaultVersion && Commit == defaultCommit && Build == defaultBuild
+        isDefault := Version == defaultVersion && Build == defaultBuild
 
         if !isDefault {
-                sb.WriteString(fmt.Sprintf("%s@%s %s", Version, Commit, Build))
+                sb.WriteString(fmt.Sprintf("%s@%s %s", Version, Build))
         }