feat: make chiutil go-importable

moul · Feb 5, 2020 · 58f9d29 · 58f9d29
1 parent 7328188
commit 58f9d29
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -4,10 +4,6 @@ GOBINS =	./cmd/depviz
 #GOBINS += ./tools/sed-i-github-issues
 DOCKER_IMAGE ?=	moul/depviz
 
-
-all: test install
-
-
 PRE_INSTALL_STEPS += generate
 PRE_TEST_STEPS += generate
 PRE_BUILD_STEPS += generate
@@ -51,6 +47,7 @@ gen.sum: $(GEN_DEPS)
 	    -xec 'make generate_local'; \
 	    make tidy \
 	)
+	@rm -f gen.sum.tmp
 
 
 PROTOC_OPTS = -I ./vendor/github.com/grpc-ecosystem/grpc-gateway:./api:./vendor:/protobuf
@@ -62,7 +59,7 @@ generate_local:
 	    --gogofaster_out="plugins=grpc:$(GOPATH)/src" \
 	    "$$proto" \
 	); done
-	goimportbs -w ./pkg ./cmd ./internal
+	goimports -w ./pkg ./cmd ./internal
 	shasum $(GEN_DEPS) | sort > gen.sum.tmp
 	mv gen.sum.tmp gen.sum
 

diff --git a/gen.sum b/gen.sum
diff --git a/internal/chiutil/doc.go b/internal/chiutil/doc.go
diff --git a/internal/dvserver/server.go b/internal/dvserver/server.go
@@ -25,8 +25,8 @@ import (
 	chilogger "github.com/treastech/logger"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
-	"moul.io/depviz/internal/chiutil"
 	"moul.io/depviz/internal/dvcore"
+	"moul.io/depviz/pkg/chiutil"
 	"moul.io/multipmuri"
 )
 

diff --git a/internal/chiutil/chi.go → pkg/chiutil/chi.go b/internal/chiutil/chi.go → pkg/chiutil/chi.go
diff --git a/pkg/chiutil/doc.go b/pkg/chiutil/doc.go
@@ -0,0 +1 @@
+package chiutil // import "moul.io/depviz/pkg/chiutil"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		package chiutil // import "moul.io/depviz/pkg/chiutil"