Merge

[micro.git] / Makefile

diff --git a/Makefile b/Makefile
index 217963c23d715d596b8636fa78c593e9ac11c87c..91f84bae16bf3b23fa1d0f65f4dca1fdbc813353 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,27 +6,29 @@ HASH = $(shell git rev-parse --short HEAD)
 DATE = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
        go run tools/build-date.go)
 ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
-       GOARCH=$(shell go env GOHOSTARCH))
+       GOARCH=$(shell go env GOHOSTARCH) \
+       go run tools/info-plist.go "$(VERSION)")
 GOBIN ?= $(shell go env GOPATH)/bin
-GOVARS = -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF
+GOVARS = -X github.com/zyedidia/micro/v2/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/v2/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/v2/internal/util.CompileDate=$(DATE)'
+DEBUGVAR = -X github.com/zyedidia/micro/v2/internal/util.Debug=ON
 VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a45f4242ebddb7aa9a229f85555e8a3bd987e2/src/vs/editor/test/common/model/'
 
 # Builds micro after checking dependencies but without updating the runtime
 build:
-       go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+       go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 build-dbg:
-       go build -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+       go build -trimpath -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS) $(DEBUGVAR)" ./cmd/micro
 
 build-tags: fetch-tags
-       go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+       go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Builds micro after building the runtime and checking dependencies
 build-all: runtime build
 
 # Builds micro without checking for dependencies
 build-quick:
-       go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+       go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build' but installs to $GOBIN afterward
 install:
@@ -45,6 +47,7 @@ fetch-tags:
 # Builds the runtime
 runtime:
        git submodule update --init
+       rm -f runtime/syntax/*.hdr
        go run runtime/syntax/make_headers.go runtime/syntax
        go build -o tools/bindata ./tools/go-bindata
        tools/bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
@@ -62,9 +65,24 @@ testgen:
 
 test:
        go test ./internal/...
+       go test ./cmd/...
 
 bench:
-       go test -bench=. ./internal/...
+       for i in 1 2 3; do \
+               go test -bench=. ./internal/...; \
+       done > benchmark_results
+       benchstat benchmark_results
+
+bench-baseline:
+       for i in 1 2 3; do \
+               go test -bench=. ./internal/...; \
+       done > benchmark_results_baseline
+
+bench-compare:
+       for i in 1 2 3; do \
+               go test -bench=. ./internal/...; \
+       done > benchmark_results
+       benchstat -alpha 0.15 benchmark_results_baseline benchmark_results
 
 clean:
        rm -f micro