containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add FFJSON generation to makefile 

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #1240
Approved by: rhatdan
This commit is contained in:
Matthew Heon 2018-08-09 10:36:51 -04:00 committed by Atomic Bot
parent 3a6bd89f64
commit 7df49bc677
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -181,7 +181,7 @@ clientintegration:
vagrant-check: vagrant-check:
BOX=$(BOX) sh ./vagrant.sh BOX=$(BOX) sh ./vagrant.sh
binaries: varlink_generate podman python binaries: varlink_generate ffjson_generate podman python
test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/checkseccomp test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/checkseccomp
@ -260,7 +260,7 @@ uninstall:
.PHONY: install.tools .PHONY: install.tools
install.tools: .install.gitvalidation .install.gometalinter .install.md2man install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ffjson
.install.gitvalidation: .gopathok .install.gitvalidation: .gopathok
if [ ! -x "$(GOBIN)/git-validation" ]; then \ if [ ! -x "$(GOBIN)/git-validation" ]; then \
@ -281,6 +281,11 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
$(GO) get -u github.com/cpuguy83/go-md2man; \ $(GO) get -u github.com/cpuguy83/go-md2man; \
fi fi
.install.ffjson: .gopathok
if [ ! -x "$(GOBIN)/ffjson" ]; then\
$(GO) get -u github.com/pquerna/ffjson; \
fi
.install.ostree: .gopathok .install.ostree: .gopathok
if ! pkg-config ostree-1 2> /dev/null ; then \ if ! pkg-config ostree-1 2> /dev/null ; then \
git clone https://github.com/ostreedev/ostree $(FIRST_GOPATH)/src/github.com/ostreedev/ostree ; \ git clone https://github.com/ostreedev/ostree $(FIRST_GOPATH)/src/github.com/ostreedev/ostree ; \
@ -292,6 +297,16 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
varlink_generate: .gopathok cmd/podman/varlink/iopodman.go varlink_generate: .gopathok cmd/podman/varlink/iopodman.go
varlink_api_generate: .gopathok API.md varlink_api_generate: .gopathok API.md
ffjson_generate: libpod/container_ffjson.go libpod/pod_ffjson.go
libpod/container_ffjson.go: .gopathok libpod/container.go
rm -f libpod/container_ffjson.go
ffjson $(GOPKGDIR)/libpod/container.go
libpod/pod_ffjson.go: .gopathok libpod/pod.go
rm -f libpod/pod_ffjson.go
ffjson $(GOPKGDIR)/libpod/pod.go
.PHONY: install.libseccomp.sudo .PHONY: install.libseccomp.sudo
install.libseccomp.sudo: install.libseccomp.sudo:
rm -rf ../../seccomp/libseccomp rm -rf ../../seccomp/libseccomp

2
libpod/container_ffjson.go
View File

@ -1,5 +1,5 @@
// Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT. // Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT.
// source: libpod/container.go // source: /home/mcs/code/gopath//src/github.com/projectatomic/libpod/libpod/container.go
package libpod package libpod

2
libpod/pod_ffjson.go
View File

@ -1,5 +1,5 @@
// Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT. // Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT.
// source: libpod/pod.go // source: /home/mcs/code/gopath//src/github.com/projectatomic/libpod/libpod/pod.go
package libpod package libpod