summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2019-09-16 09:23:57 -0700
committerJhon Honce <jhonce@redhat.com>2019-09-19 14:14:38 -0700
commit96bcf8cecc92c70cdb86ee288eb57795ef6395e7 (patch)
tree5dc7417b2e7c583ed7f9ddac3311d8d17c7b9558 /Makefile
parent408f2780a1dd94f99fe36be4573a9887e6c74cf7 (diff)
downloadpodman-96bcf8cecc92c70cdb86ee288eb57795ef6395e7.tar.gz
podman-96bcf8cecc92c70cdb86ee288eb57795ef6395e7.tar.bz2
podman-96bcf8cecc92c70cdb86ee288eb57795ef6395e7.zip
Support podman-remote help on windows
* Update scipts to produce darwin and windows output * Update batch file to re-direct help requests to browser * Add pandoc filter for markdown to html links Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0dc72ce4d..6734ef1b0 100644
--- a/Makefile
+++ b/Makefile
@@ -165,8 +165,13 @@ podman-remote: .gopathok $(PODMAN_VARLINK_DEPENDENCIES) ## Build with podman on
$(GO_BUILD) $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS) remoteclient" -o bin/$@ $(PROJECT)/cmd/podman
.PHONY: podman.msi
-podman.msi: podman-remote-windows ## Will always rebuild exe as there is no podman-remote-windows.exe target to verify timestamp
- wixl -D VERSION=$(RELEASE_NUMBER) -o bin/podman-v$(RELEASE_NUMBER).msi contrib/msi/podman.wxs
+podman.msi: podman-remote podman-remote-windows docs ## Will always rebuild exe as there is no podman-remote-windows.exe target to verify timestamp
+ rm -rf bin/windows
+ mkdir -p bin/windows
+ docs/podman-remote.sh windows bin/windows docs
+ find bin/windows -print \
+ |wixl-heat --var var.ManSourceDir --component-group ManFiles --directory-ref INSTALLDIR --prefix bin/windows/ >bin/windows/pages.wsx
+ wixl -D VERSION=$(RELEASE_NUMBER) -D ManSourceDir=bin/windows -o podman-v$(RELEASE_NUMBER).msi contrib/msi/podman.wxs bin/windows/pages.wsx
podman-remote-%: .gopathok $(PODMAN_VARLINK_DEPENDENCIES) ## Build podman for a specific GOOS
$(eval BINSFX := $(shell test "$*" != "windows" || echo ".exe"))
@@ -316,8 +321,9 @@ $(MANPAGES): %: %.md .gopathok
docs: $(MANPAGES) ## Generate documentation
-install-podman-remote-docs: docs
- @(cd docs; ./podman-remote.sh ./remote)
+install-podman-remote-docs: podman-remote docs
+ rm -rf docs/remote
+ docs/podman-remote.sh darwin docs/remote docs
man-page-check:
./hack/man-page-checker