dev: update Makefile

dmke · dmke · commit 2ba0d7c03ec2 · 2021-09-24T15:28:27.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/Makefile b/Makefile
@@ -1,14 +1,21 @@
 VERSION=0.1.9
 
-all: deps release
-
-deps:
-	go get github.com/spf13/pflag
+.PHONY: all
+all: release
 
+.PHONY: release
 release: release-deps
-	gox -output="build/{{.Dir}}_{{.OS}}_{{.Arch}}" .
+	gox \
+		-osarch="!darwin/386" \
+		-ldflags="-s -w -X main.version=$(VERSION)" \
+		-asmflags="-trimpath" \
+		-output="build/{{.Dir}}_{{.OS}}_{{.Arch}}" \
+		.
 
+.PHONY: release-deps
 release-deps:
-	go get github.com/mitchellh/gox
+	go install github.com/mitchellh/gox@latest
 
-.PNONY: all release release-deps
+.PHONY: clean
+clean:
+	rm -rf build
diff --git a/main.go b/main.go
@@ -34,6 +34,9 @@ var (
 	smtpAddr = envOrStr("MH_SENDMAIL_SMTP_ADDR", "localhost:1025")
 )
 
+// set via -ldflags.
+var version = "development"
+
 func main() {
 	var verbose bool
 
@@ -51,7 +54,7 @@ func main() {
 	recip := flag.Args()
 
 	if verbose {
-		fmt.Fprintln(os.Stderr, smtpAddr, fromAddr)
+		fmt.Fprintln(os.Stderr, "mhsendmail", version, smtpAddr, fromAddr)
 	}
 
 	body, err := ioutil.ReadAll(os.Stdin)

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ var (`
`34`	`34`	`smtpAddr = envOrStr("MH_SENDMAIL_SMTP_ADDR", "localhost:1025")`
`35`	`35`	`)`
`36`	`36`
	`37`	`+// set via -ldflags.`
	`38`	`+var version = "development"`
	`39`	`+`
`37`	`40`	`func main() {`
`38`	`41`	`var verbose bool`
`39`	`42`
`@@ -51,7 +54,7 @@ func main() {`
`51`	`54`	`recip := flag.Args()`
`52`	`55`
`53`	`56`	`if verbose {`
`54`		`- fmt.Fprintln(os.Stderr, smtpAddr, fromAddr)`
	`57`	`+ fmt.Fprintln(os.Stderr, "mhsendmail", version, smtpAddr, fromAddr)`
`55`	`58`	`}`
`56`	`59`
`57`	`60`	`body, err := ioutil.ReadAll(os.Stdin)`