diff options
| author | Jhon Honce <jhonce@redhat.com> | 2019-09-12 09:35:54 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2019-09-12 09:35:54 -0700 |
| commit | 046c081ed0a321ac34fe0fc713ad33a926efb48e (patch) | |
| tree | 342897dea692ccc7387b17ad7d815c29672775cb | |
| parent | ecb958e59851186630e946d7973d91f8d524ea17 (diff) | |
| download | podman-046c081ed0a321ac34fe0fc713ad33a926efb48e.tar.gz podman-046c081ed0a321ac34fe0fc713ad33a926efb48e.tar.bz2 podman-046c081ed0a321ac34fe0fc713ad33a926efb48e.zip | |
Add podman icon to installer
Update Makefile per review comments
Signed-off-by: Jhon Honce <jhonce@redhat.com>
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | contrib/msi/podman-logo.ico | bin | 0 -> 15086 bytes | |||
| -rw-r--r-- | contrib/msi/podman.wxs | 3 |
3 files changed, 10 insertions, 8 deletions
@@ -83,8 +83,7 @@ LIBSECCOMP_COMMIT := release-2.3 GINKGOTIMEOUT ?= -timeout=90m RELEASE_VERSION ?= $(shell hack/get_release_info.sh VERSION) -RELEASE_NUMBER ?= $(shell hack/get_release_info.sh NUMBER) -RELEASE_NUMERIC = $(shell echo $(RELEASE_NUMBER) |sed -e 's/^v\(.*\)/\1/') +RELEASE_NUMBER ?= $(shell hack/get_release_info.sh NUMBER|sed -e 's/^v\(.*\)/\1/') RELEASE_DIST ?= $(shell hack/get_release_info.sh DIST) RELEASE_DIST_VER ?= $(shell hack/get_release_info.sh DIST_VER) RELEASE_ARCH ?= $(shell hack/get_release_info.sh ARCH) @@ -167,7 +166,7 @@ podman-remote: .gopathok $(PODMAN_VARLINK_DEPENDENCIES) ## Build with podman on .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_NUMERIC) -o bin/podman-$(RELEASE_NUMBER).msi contrib/msi/podman.wxs + wixl -D VERSION=$(RELEASE_NUMBER) -o bin/podman-v$(RELEASE_NUMBER).msi contrib/msi/podman.wxs podman-remote-%: .gopathok $(PODMAN_VARLINK_DEPENDENCIES) ## Build podman for a specific GOOS $(eval BINSFX := $(shell test "$*" != "windows" || echo ".exe")) @@ -333,9 +332,9 @@ release.txt: echo -n " $$field"; done >> "$@" echo "" >> "$@" -podman-$(RELEASE_NUMBER).tar.gz: binaries docs release.txt +podman-v$(RELEASE_NUMBER).tar.gz: binaries docs release.txt $(eval TMPDIR := $(shell mktemp -d -p '' podman_XXXX)) - $(eval SUBDIR := podman-$(RELEASE_NUMBER)) + $(eval SUBDIR := podman-v$(RELEASE_NUMBER)) mkdir -p "$(TMPDIR)/$(SUBDIR)" $(MAKE) install.bin install.man install.cni install.systemd "DESTDIR=$(TMPDIR)/$(SUBDIR)" "PREFIX=/usr" # release.txt location and content depended upon by automated tooling @@ -344,7 +343,7 @@ podman-$(RELEASE_NUMBER).tar.gz: binaries docs release.txt -rm -rf "$(TMPDIR)" # Must call make in-line: Dependency-spec. w/ wild-card also consumes variable value. -podman-remote-$(RELEASE_NUMBER)-%.zip: +podman-remote-v$(RELEASE_NUMBER)-%.zip: $(MAKE) podman-remote-$* install-podman-remote-docs release.txt \ RELEASE_BASENAME=$(shell hack/get_release_info.sh REMOTENAME) \ RELEASE_DIST=$* RELEASE_DIST_VER="-" @@ -369,12 +368,12 @@ podman-remote-$(RELEASE_NUMBER)-%.zip: .PHONY: podman-release podman-release: rm -f release.txt - $(MAKE) podman-$(RELEASE_NUMBER).tar.gz + $(MAKE) podman-v$(RELEASE_NUMBER).tar.gz .PHONY: podman-remote-%-release podman-remote-%-release: rm -f release.txt - $(MAKE) podman-remote-$(RELEASE_NUMBER)-$*.zip + $(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip docker-docs: docs (cd docs; ./dckrman.sh *.1) diff --git a/contrib/msi/podman-logo.ico b/contrib/msi/podman-logo.ico Binary files differnew file mode 100644 index 000000000..cb1dab6a7 --- /dev/null +++ b/contrib/msi/podman-logo.ico diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs index 165bb42b6..77c6e2815 100644 --- a/contrib/msi/podman.wxs +++ b/contrib/msi/podman.wxs @@ -36,6 +36,9 @@ <ComponentRef Id="MainExecutable"/> </Feature> + <Icon Id="podman.ico" SourceFile="contrib/msi/podman-logo.ico"/> + <Property Id="ARPPRODUCTICON" Value="podman.ico"/> + <InstallExecuteSequence> <RemoveExistingProducts Before="InstallInitialize"/> <Custom Action="ChangePath" After="InstallServices">NOT Installed</Custom> |