summaryrefslogtreecommitdiff
path: root/contrib/msi
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2021-04-08 14:30:40 -0400
committerChris Evich <cevich@redhat.com>2021-04-12 10:21:28 -0400
commitb6b0b6e8bd0f8c75fe9411f722a43f9305c6137a (patch)
treefea2024764c18861d58f9d6f6707ec8b2a8d8368 /contrib/msi
parenta4686883b7c2b8388c8eb4efdf320f12064b4bc7 (diff)
downloadpodman-b6b0b6e8bd0f8c75fe9411f722a43f9305c6137a.tar.gz
podman-b6b0b6e8bd0f8c75fe9411f722a43f9305c6137a.tar.bz2
podman-b6b0b6e8bd0f8c75fe9411f722a43f9305c6137a.zip
Overhaul Makefile binary and release worflows
* Incorporate changes from abandoned #9918: Use dedicated `bin` sub-directories for `windows` and `darwin` when building `podman-remote`. The linux flavor remains under `bin` as before. * Fix MacOS Documentation-generation for release-packaging. The `install-podman-remote-%-docs` target requires local execution of `podman-remote`, but it was assuming GOOS=linux. Fix this by dynamically discovering the local OS/architecture type while still permitting cross-building of MacOS binaries under Linux. * Unify temporary directory/file behavior to use a common template. In case of left-over temporary items left in the repository, update the `clean` target accordingly to remove them. * Fix broken podman-remote-static and MacOS release archive targets mismatching the `podman-remote-%` target. Disambiguate this target for all platforms by spelling each out in full, instead of using a wild-card recipe. * Fix Windows-installer target to properly recognize existing output files and not constantly rebuild every time. * Include the podman version number in the Windows-installer target in case a user downloads multiple releases. * Include a subdirectory containing the podman version number for both `tar.gz` and `zip` targets. This prevents users clobbering existing directories when un-archiving from releases. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/msi')
-rw-r--r--contrib/msi/podman.wxs2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs
index ff8160a53..451dd565d 100644
--- a/contrib/msi/podman.wxs
+++ b/contrib/msi/podman.wxs
@@ -24,7 +24,7 @@
<CreateFolder/>
</Component>
<Component Id="MainExecutable" Guid="73752F94-6589-4C7B-ABED-39D655A19714">
- <File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman.exe" Source="bin/podman-remote-windows.exe" KeyPath="yes"/>
+ <File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman.exe" Source="bin/windows/podman.exe" KeyPath="yes"/>
</Component>
</Directory>
</Directory>