Skip to content

Commit 1063a71

Browse files
committed
fix(version): add warning when built with 'go install'
and add a check & install for govvv to the makefile, delay call to govvv until after the check. Drop now-defunct cross-platform compilation
1 parent ad4dcc7 commit 1063a71

File tree

2 files changed

+20
-35
lines changed

2 files changed

+20
-35
lines changed

Makefile

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ QRI_VERSION?="0.9.14-dev"
66
BUILD_FLAGS?=CGO_ENABLED=0
77
PKG=$(shell go list ./version)
88
GOLANG_VERSION=$(shell go version | awk '{print $$3}')
9-
GOVVV_FLAGS=$(shell govvv -flags -pkg $(PKG) -version $(QRI_VERSION))
109

1110
require-goversion:
1211
$(eval minver := go1.13)
@@ -24,11 +23,17 @@ require-goversion:
2423
fi; \
2524
fi;
2625

27-
build: require-goversion
28-
$(BUILD_FLAGS) go build -ldflags="-X ${PKG}.GolangVersion=${GOLANG_VERSION} ${GOVVV_FLAGS}" .
26+
require-govvv:
27+
$(eval govvv_loc := $(shell which govvv))
28+
@if [ "$(govvv_loc)" == "" ]; then go install github.com/ahmetb/govvv; fi;
2929

30-
install: require-goversion
31-
$(BUILD_FLAGS) go install -ldflags="-X ${PKG}.GolangVersion=${GOLANG_VERSION} ${GOVVV_FLAGS}" .
30+
govvv_version_flags:= $(shell govvv -flags -pkg $(PKG) -version $(QRI_VERSION))
31+
32+
build: require-goversion require-govvv
33+
$(BUILD_FLAGS) go build -ldflags="-X ${PKG}.GolangVersion=${GOLANG_VERSION} $(govvv_version_flags)" .
34+
35+
install: require-goversion require-govvv
36+
$(BUILD_FLAGS) go install -ldflags="-X ${PKG}.GolangVersion=${GOLANG_VERSION} $(govvv_version_flags)" .
3237
.PHONY: install
3338

3439
dscache_fbs:
@@ -51,33 +56,3 @@ cli-docs:
5156

5257
update-changelog:
5358
conventional-changelog -p angular -i CHANGELOG.md -s
54-
55-
build-cross-platform:
56-
@echo "building qri_windows_amd64"
57-
mkdir qri_windows_amd64
58-
env GOOS=windows GOARCH=amd64 go build -o qri_windows_amd64/qri .
59-
zip -r qri_windows_amd64.zip qri_windows_amd64 && rm -r qri_windows_amd64
60-
@echo "building qri_windows_386"
61-
mkdir qri_windows_386
62-
env GOOS=windows GOARCH=386 go build -o qri_windows_386/qri .
63-
zip -r qri_windows_386.zip qri_windows_386 && rm -r qri_windows_386
64-
@echo "building qri_linux_arm"
65-
mkdir qri_linux_arm
66-
env GOOS=linux GOARCH=arm go build -o qri_linux_arm/qri .
67-
zip -r qri_linux_arm.zip qri_linux_arm && rm -r qri_linux_arm
68-
@echo "building qri_linux_amd64"
69-
mkdir qri_linux_amd64
70-
env GOOS=linux GOARCH=amd64 go build -o qri_linux_amd64/qri .
71-
zip -r qri_linux_amd64.zip qri_linux_amd64 && rm -r qri_linux_amd64
72-
@echo "building qri_linux_386"
73-
mkdir qri_linux_386
74-
env GOOS=linux GOARCH=386 go build -o qri_linux_386/qri .
75-
zip -r qri_linux_386.zip qri_linux_386 && rm -r qri_linux_386
76-
@echo "building qri_darwin_386"
77-
mkdir qri_darwin_386
78-
env GOOS=darwin GOARCH=386 go build -o qri_darwin_386/qri .
79-
zip -r qri_darwin_386.zip qri_darwin_386 && rm -r qri_darwin_386
80-
@echo "building qri_darwin_amd64"
81-
mkdir qri_darwin_amd64
82-
env GOOS=darwin GOARCH=amd64 go build -o qri_darwin_amd64/qri .
83-
zip -r qri_darwin_amd64.zip qri_darwin_amd64 && rm -r qri_darwin_amd64

version/version.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ var (
2121

2222
// Map returns a summary of build info as a string map
2323
func Map() map[string]string {
24+
if Version == "n/a" {
25+
return map[string]string{
26+
"error": `This qri binary was not built with version information. Please build using 'make install' instead of 'go install'`,
27+
}
28+
}
29+
2430
return map[string]string{
2531
"version": Version,
2632
"gitCommit": GitCommit,
@@ -34,6 +40,10 @@ func Map() map[string]string {
3440

3541
// Summary prints a summary of all build info.
3642
func Summary() string {
43+
if Version == "n/a" {
44+
return `Warning! This qri binary was not built with version information. Please build using 'make install' instead of 'go install'`
45+
}
46+
3747
return fmt.Sprintf(
3848
"version:\t%s\nbuild date:\t%s\ngit summary:\t%s\ngit branch:\t%s\ngit commit:\t%s\ngit state:\t%s\ngolang version:\t%s",
3949
Version,

0 commit comments

Comments
 (0)