Skip to content

Commit 67dc142

Browse files
mboersmamboersma
committed
Merge pull request #4050 from mboersma/update-gotools
Install go tools in root Makefile from golang.org
2 parents 78c1663 + c70475c commit 67dc142

16 files changed

Lines changed: 152 additions & 59 deletions

File tree

‎Godeps/Godeps.json‎

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/code.google.com/p/go.net/websocket/client.go renamed to Godeps/_workspace/src/golang.org/x/net/websocket/client.go

Lines changed: 17 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go renamed to Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go renamed to Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi.go renamed to Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go

File renamed without changes.

Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi_test.go renamed to Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go

File renamed without changes.

Godeps/_workspace/src/code.google.com/p/go.net/websocket/server.go renamed to Godeps/_workspace/src/golang.org/x/net/websocket/server.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket.go renamed to Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket_test.go renamed to Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go

Lines changed: 111 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@ release: check-registry
7373

7474
deploy: build dev-release restart
7575

76+
setup-gotools:
77+
go get -u -v github.com/tools/godep
78+
go get -u -v github.com/golang/lint/golint
79+
go get -u -v golang.org/x/tools/cmd/cover
80+
go get -u -v golang.org/x/tools/cmd/vet
81+
82+
setup-root-gotools:
83+
# "go vet" and "go cover" must be installed as root on some systems
84+
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/cover
85+
sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/vet
86+
sudo rm -rf /tmp/tmpGOPATH
87+
7688
test: test-style test-unit test-functional push test-integration
7789

7890
test-functional:

0 commit comments

Comments
 (0)