|
3 | 3 |
|
4 | 4 | # find all verifiable packages.
|
5 | 5 | # XXX: explore a better way that doesn't need multiple 'find'
|
6 |
| -PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|bin'` |
7 |
| -PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts|bin'` |
| 6 | +PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|bin|contrib'` |
| 7 | +PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts|bin|contrib'` |
8 | 8 | TO_BUILD := ./netplugin/ ./netmaster/ ./netctl/netctl/ ./mgmtfn/k8splugin/contivk8s/
|
9 | 9 | HOST_GOBIN := `if [ -n "$$(go env GOBIN)" ]; then go env GOBIN; else dirname $$(which go); fi`
|
10 | 10 | HOST_GOROOT := `go env GOROOT`
|
@@ -39,7 +39,8 @@ checks:
|
39 | 39 | run-build: deps checks clean
|
40 | 40 | cd ${GOPATH}/src/github.com/contiv/netplugin && version/generate_version ${USE_RELEASE} && \
|
41 | 41 | cd /opt/gopath/src/github.com/contiv/netplugin && \
|
42 |
| - godep go install -v $(TO_BUILD) |
| 42 | + godep go install -v $(TO_BUILD) && \ |
| 43 | + sudo cp contrib/completion/bash/netctl /etc/bash_completion.d/netctl |
43 | 44 |
|
44 | 45 | build:
|
45 | 46 | make start
|
@@ -132,7 +133,7 @@ only-tar:
|
132 | 133 |
|
133 | 134 | tar: clean-tar build
|
134 | 135 | @cat ${GOPATH}/src/github.com/contiv/netplugin/version/version_gen.go | grep versionStr | cut -f 4 -d " " | tr -d \" > $(VERSION_FILE)
|
135 |
| - @tar -jcf $(TAR_FILE) -C $(GOPATH)/src/github.com/contiv/netplugin/bin netplugin netmaster netctl contivk8s |
| 136 | + @tar -jcf $(TAR_FILE) -C $(GOPATH)/src/github.com/contiv/netplugin/bin netplugin netmaster netctl contivk8s -C $(GOPATH)/src/github.com/contiv/netplugin contrib/completion/bash/netctl |
136 | 137 |
|
137 | 138 | clean-tar:
|
138 | 139 | @rm -f $(TAR_LOC)/*.$(TAR_EXT)
|
|
0 commit comments