summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-12-23 10:50:08 +0100
committerGitHub <noreply@github.com>2021-12-23 10:50:08 +0100
commitc8d42d93933188b256f57f44660e6041b0d872cd (patch)
tree5b88151aaa3ff939cd8ac7091b26051318fc4fe5 /Makefile
parent1415b0732d07f62a6146c16167d38411242436b3 (diff)
parent3ac5999f8590991bd24810d8cbe829de92442638 (diff)
downloadpodman-c8d42d93933188b256f57f44660e6041b0d872cd.tar.gz
podman-c8d42d93933188b256f57f44660e6041b0d872cd.tar.bz2
podman-c8d42d93933188b256f57f44660e6041b0d872cd.zip
Merge pull request #12597 from n1hility/msi-winpath
[Fixes #11089] Switch to a new installer approach using a path manipulation helper
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3009f618d..37ad99412 100644
--- a/Makefile
+++ b/Makefile
@@ -358,6 +358,16 @@ podman-remote-windows: ## Build podman-remote for Windows
GOOS=windows \
bin/windows/podman.exe
+.PHONY: podman-winpath
+podman-winpath: .gopathok $(SOURCES) go.mod go.sum
+ CGO_ENABLED=0 \
+ GOOS=windows \
+ $(GO) build \
+ $(BUILDFLAGS) \
+ -ldflags -H=windowsgui \
+ -o bin/windows/winpath.exe \
+ ./cmd/winpath
+
.PHONY: podman-remote-darwin
podman-remote-darwin: ## Build podman-remote for macOS
$(MAKE) \
@@ -685,7 +695,7 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$
.PHONY: podman.msi
podman.msi: test/version/version ## Build podman-remote, package for installation on Windows
$(MAKE) podman-v$(RELEASE_NUMBER).msi
-podman-v$(RELEASE_NUMBER).msi: podman-remote-windows podman-remote-windows-docs
+podman-v$(RELEASE_NUMBER).msi: podman-remote-windows podman-remote-windows-docs podman-winpath
$(eval DOCFILE := docs/build/remote/windows)
find $(DOCFILE) -print | \
wixl-heat --var var.ManSourceDir --component-group ManFiles \