X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Makefile;h=76da995305ca10f0d3c0ef636e968eedb5d49af1;hb=90304fb472fab5a9809feb0d9b23b0930619cf0d;hp=08a70768025b8e43b4d04eddbe6ea21cac8077f3;hpb=dc68183fc114ab2911d6ba934cf5df019566d0cf;p=micro.git

diff --git a/Makefile b/Makefile
index 08a70768..76da9953 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,22 @@
 .PHONY: runtime
 
-VERSION := $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
+VERSION = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
 	go run tools/build-version.go)
-HASH := $(shell git rev-parse --short HEAD)
-DATE := $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
+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) \
-	go run tools/info-plist.go "$(VERSION)")
+ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
+	GOARCH=$(shell go env GOHOSTARCH))
 GOBIN ?= $(shell go env GOPATH)/bin
-GOVARS := -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)' -X main.Debug=OFF
+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
 
 # Builds micro after checking dependencies but without updating the runtime
-build: update
+build:
 	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
+build-dbg:
+	go build -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+
 # Builds micro after building the runtime and checking dependencies
 build-all: runtime build
 
@@ -23,7 +25,7 @@ build-quick:
 	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build' but installs to $GOBIN afterward
-install: update
+install:
 	go install -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build-all' but installs to $GOBIN afterward
@@ -33,19 +35,17 @@ install-all: runtime install
 install-quick:
 	go install -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)"  ./cmd/micro
 
-update:
-	git pull
-	git submodule update --init
-
 # Builds the runtime
 runtime:
-	go get -u github.com/jteeuwen/go-bindata/...
-	$(GOBIN)/go-bindata -nometadata -o runtime.go runtime/...
-	mv runtime.go cmd/micro
-	gofmt -w cmd/micro/runtime.go
+	git submodule update --init
+	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/...
+	mv runtime.go internal/config
+	gofmt -w internal/config/runtime.go
 
 test:
-	go test ./cmd/micro
+	go test ./internal/...
 
 clean:
 	rm -f micro