From ed2b9374599cc00467b1c27121318748cc0d3f49 Mon Sep 17 00:00:00 2001 From: Stefan Majewsky Date: Sat, 28 Mar 2020 13:53:10 +0100 Subject: rename pkg/ to internal/ --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 733d6ee..1836b3c 100644 --- a/Makefile +++ b/Makefile @@ -24,11 +24,11 @@ install: FORCE all for APPLET in $(APPLETS); do ln -s gofu "$(DESTDIR)$(PREFIX)/bin/$${APPLET}"; done # which packages to test with static checkers? -GO_ALLPKGS := $(PKG) $(shell $(GO) list $(PKG)/pkg/...) +GO_ALLPKGS := $(PKG) $(shell $(GO) list $(PKG)/internal/...) # which packages to test with `go test`? -GO_TESTPKGS := $(shell $(GO) list -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' $(PKG)/pkg/...) +GO_TESTPKGS := $(shell $(GO) list -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' $(PKG)/internal/...) # which packages to measure coverage for? -GO_COVERPKGS := $(shell $(GO) list $(PKG)/pkg/...) +GO_COVERPKGS := $(shell $(GO) list $(PKG)/internal/...) # output files from `go test` GO_COVERFILES := $(patsubst %,build/%.cover.out,$(subst /,_,$(GO_TESTPKGS))) @@ -40,8 +40,8 @@ comma := , check: all static-check build/cover.html FORCE @echo -e "\e[1;32m>> All tests successful.\e[0m" static-check: FORCE - @if s="$$(gofmt -s -l *.go pkg 2>/dev/null)" && test -n "$$s"; then printf ' => %s\n%s\n' gofmt "$$s"; false; fi - @if s="$$(golint . && find pkg -type d -exec golint {} \; 2>/dev/null)" && test -n "$$s"; then printf ' => %s\n%s\n' golint "$$s"; false; fi + @if s="$$(gofmt -s -l *.go internal 2>/dev/null)" && test -n "$$s"; then printf ' => %s\n%s\n' gofmt "$$s"; false; fi + @if s="$$(golint . && find internal -type d -exec golint {} \; 2>/dev/null)" && test -n "$$s"; then printf ' => %s\n%s\n' golint "$$s"; false; fi $(GO) vet $(GO_ALLPKGS) build/%.cover.out: FORCE $(GO) test $(GO_BUILDFLAGS) -ldflags '$(GO_LDFLAGS)' -coverprofile=$@ -covermode=count -coverpkg=$(subst $(space),$(comma),$(GO_COVERPKGS)) $(subst _,/,$*) -- cgit v1.3.1