diff --git a/Makefile b/Makefile index 58cb1cb..afa1ce3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ BUILDTIME = $(shell date +%Y.%m.%d) all: build ./basicwindow -build: +build: goimports vet GO111MODULE=off go build -v -x \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" @@ -17,25 +17,20 @@ install: -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" clean: - -rm -f gadgetwindow + -rm -f basicwindow go.* # embed the toolkit plugins in the binary embed: -rm resources/*.so touch resources/blank.so - cp -a ~/go/src/go.wit.com/toolkits/*.so resources/ + cp -a ~/go/src/go.wit.com/toolkits/*/*.so resources/ gocui: ./basicwindow --gui gocui goimports: goimports -w *.go - # // to globally reset paths: - # // gofmt -w -r "go.wit.com/gui -> go.wit.com/gui/gui" . - -redomod: - rm -f go.* - goimports -w *.go - GO111MODULE= go mod init - GO111MODULE= go mod tidy +vet: + @GO111MODULE=off go vet + @echo this go binary package builds okay