Add syntax highlighting for Solidity

[micro.git] / Makefile

diff --git a/Makefile b/Makefile
index 8df045c61f531e6c08205e88da76903082cc4790..67873d6919a7b54a246700e807f88a5049efd96e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,45 @@
 .PHONY: runtime
 
-VERSION = $(shell git describe --tags --abbrev=0)
+VERSION = $(shell go run tools/build-version.go)
 HASH = $(shell git rev-parse --short HEAD)
+DATE = $(shell go run tools/build-date.go)
+
+GOBIN ?= $(GOPATH)/bin
 
 # Builds micro after checking dependencies but without updating the runtime
-build: deps tcell
-       go build -ldflags "-X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(shell date -u '+%B %d, %Y')'" -o micro ./cmd/micro
+build: deps
+       go build -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./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 "-X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(shell date -u '+%B %d, %Y')'" -o micro ./cmd/micro
+       go build -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/micro
 
-# Same as 'build' but installs to $GOPATH/bin afterward
-install: build
-       mv micro $(GOPATH)/bin
+# Same as 'build' but installs to $GOBIN afterward
+install: deps
+       go install -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/micro
 
-# Same as 'build-all' but installs to $GOPATH/bin afterward
+# Same as 'build-all' but installs to $GOBIN afterward
 install-all: runtime install
 
-# Same as 'build-quick' but installs to $GOPATH/bin afterward
-install-quick: build-quick
-       mv micro $(GOPATH)/bin
-
-# Updates tcell
-tcell:
-       git -C $(GOPATH)/src/github.com/zyedidia/tcell pull
+# Same as 'build-quick' but installs to $GOBIN afterward
+install-quick:
+       go install -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/micro
 
 # Checks for dependencies
 deps:
        go get -d ./cmd/micro
 
+update:
+       git pull
+       go get -u -d ./cmd/micro
+
 # Builds the runtime
 runtime:
        go get -u github.com/jteeuwen/go-bindata/...
-       $(GOPATH)/bin/go-bindata -nometadata -o runtime.go runtime/...
+       $(GOBIN)/go-bindata -nometadata -o runtime.go runtime/...
        mv runtime.go cmd/micro
 
 test: