vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #79 from runcom/docs-tweaks

Browse source 
Docs tweaks
This commit is contained in:
Mrunal Patel 2016-09-28 15:05:07 -07:00 committed by GitHub
commit 47c993f2e1
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,4 +2,5 @@
/ocic /ocic
conmon/conmon conmon/conmon
conmon/conmon.o conmon/conmon.o
/docs/ocid.8
vendor/src/github.com/kubernetes-incubator/cri-o vendor/src/github.com/kubernetes-incubator/cri-o

1
.travis.yml
View file

@ -19,3 +19,4 @@ script:
- make .gitvalidation - make .gitvalidation
- make lint - make lint
- make integration - make integration
- make docs

9
Makefile
View file

@ -9,7 +9,7 @@ OCID_INSTANCE := ocid_dev
SYSTEM_GOPATH := ${GOPATH} SYSTEM_GOPATH := ${GOPATH}
PREFIX ?= ${DESTDIR}/usr PREFIX ?= ${DESTDIR}/usr
INSTALLDIR=${PREFIX}/bin INSTALLDIR=${PREFIX}/bin
GO_MD2MAN ?= /usr/bin/go-md2man GO_MD2MAN ?= $(shell command -v go-md2man)
export GOPATH := ${CURDIR}/vendor export GOPATH := ${CURDIR}/vendor
default: help default: help
@ -69,9 +69,11 @@ binaries: ${OCID_LINK} ocid ocic conmon
MANPAGES_MD = $(wildcard docs/*.md) MANPAGES_MD = $(wildcard docs/*.md)
docs/%.1: docs/%.1.md docs/%.1: docs/%.1.md
@which go-md2man > /dev/null 2>/dev/null || (echo "ERROR: go-md2man not found. Consider 'make install.tools' target" && false)
$(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ $(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
docs/%.8: docs/%.8.md docs/%.8: docs/%.8.md
@which go-md2man > /dev/null 2>/dev/null || (echo "ERROR: go-md2man not found. Consider 'make install.tools' target" && false)
$(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ $(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
docs: $(MANPAGES_MD:%.md=%) docs: $(MANPAGES_MD:%.md=%)
@ -101,7 +103,7 @@ endif
.PHONY: install.tools .PHONY: install.tools
install.tools: .install.gitvalidation .install.gometalinter install.tools: .install.gitvalidation .install.gometalinter .install.md2man
.install.gitvalidation: .install.gitvalidation:
GOPATH=${SYSTEM_GOPATH} go get github.com/vbatts/git-validation GOPATH=${SYSTEM_GOPATH} go get github.com/vbatts/git-validation
@ -110,6 +112,9 @@ install.tools: .install.gitvalidation .install.gometalinter
GOPATH=${SYSTEM_GOPATH} go get github.com/alecthomas/gometalinter GOPATH=${SYSTEM_GOPATH} go get github.com/alecthomas/gometalinter
GOPATH=${SYSTEM_GOPATH} gometalinter --install GOPATH=${SYSTEM_GOPATH} gometalinter --install
.install.md2man:
GOPATH=${SYSTEM_GOPATH} go get github.com/cpuguy83/go-md2man
.PHONY: \ .PHONY: \
binaries \ binaries \
conmon \ conmon \