diff --git a/Makefile b/Makefile index bb87de37a3..0fe00de28b 100644 --- a/Makefile +++ b/Makefile @@ -202,7 +202,7 @@ endif endif # win-sshproxy is checked out manually to keep from pulling in gvisor and it's transitive -# dependencies. This is only used for the Windows installer task (podman.msi), which must +# dependencies. This is only used for the Windows client archives, which must # include this lightweight helper binary. # GV_GITURL=https://github.com/containers/gvisor-tap-vsock.git @@ -769,22 +769,6 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$ if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi -rm -rf "$(TMPDIR)" -podman.msi: test/version/version ## Build podman-remote, package for installation on Windows - $(MAKE) podman-v$(call err_if_empty,RELEASE_NUMBER).msi - cp podman-v$(call err_if_empty,RELEASE_NUMBER).msi podman.msi - -podman-v%.msi: test/version/version -# Passing explicitly OS and ARCH, because ARM is not supported by wixl https://gitlab.gnome.org/GNOME/msitools/-/blob/master/tools/wixl/builder.vala#L3 - $(MAKE) GOOS=windows GOARCH=amd64 podman-remote-windows-docs - $(MAKE) GOOS=windows GOARCH=amd64 clean-binaries podman-remote podman-winpath win-gvproxy - $(eval DOCFILE := docs/build/remote/windows) - find $(DOCFILE) -print | \ - wixl-heat --var var.ManSourceDir --component-group ManFiles \ - --directory-ref INSTALLDIR --prefix $(DOCFILE)/ > \ - $(DOCFILE)/pages.wsx - wixl -D VERSION=$(call err_if_empty,RELEASE_VERSION) -D ManSourceDir=$(DOCFILE) \ - -o $@ contrib/msi/podman.wxs $(DOCFILE)/pages.wsx --arch x64 - # Checks out and builds win-sshproxy helper. See comment on GV_GITURL declaration .PHONY: win-gvproxy win-gvproxy: test/version/version @@ -993,9 +977,7 @@ release-artifacts: clean-binaries $(MAKE) podman-remote-static-linux_arm64 tar -cvzf podman-remote-static-linux_arm64.tar.gz bin/podman-remote-static-linux_arm64 mv podman-remote-static-linux*.tar.gz release/ - $(MAKE) podman.msi - mv podman-v*.msi release/ - cd release/; sha256sum *.zip *.tar.gz *.msi > shasums + cd release/; sha256sum *.zip *.tar.gz > shasums .PHONY: uninstall uninstall: diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 5fc98a5b2a..e25779325a 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -274,7 +274,6 @@ function _run_altbuild() { ;; *Windows*) make podman-remote-release-windows_amd64.zip - make podman.msi ;; *RPM*) make package diff --git a/contrib/msi/podman-logo.ico b/contrib/msi/podman-logo.ico deleted file mode 100644 index cb1dab6a75..0000000000 Binary files a/contrib/msi/podman-logo.ico and /dev/null differ diff --git a/contrib/msi/podman.bat b/contrib/msi/podman.bat deleted file mode 100644 index e0c7e1137e..0000000000 --- a/contrib/msi/podman.bat +++ /dev/null @@ -1,68 +0,0 @@ -@echo off -setlocal enableextensions - -title Podman - -if "%1" EQU "" ( - goto run_help -) - -if "%1" EQU "/?" ( - goto run_help -) - -:: If remote-host is given on command line -- use it -setlocal enabledelayedexpansion -for %%a in (%*) do ( - echo "%%a" |find "--remote-host" >NUL - if !errorlevel! == 0 ( - goto run_podman - ) -) - -:: If PODMAN_VARLINK_BRIDGE is set -- use it -if defined PODMAN_VARLINK_BRIDGE ( - goto run_podman -) - -:: If the configuration file exists -- use it -set config_home=%USERPROFILE%\AppData\podman -set config_file=%config_home%\podman-remote.conf -if exist "%config_file%" ( - goto run_podman -) - -:: Get connection information from user and build configuration file -md "%config_home%" -set /p host="Please enter the remote hosts name or IP address: " -set /p user="Please enter the remote user name: " -( - echo [connections] - echo [connections."%host%"] - echo destination = "%host%" - echo username = "%user%" - echo default = true -) >"%config_file%" - -:run_podman -endlocal -podman-remote-windows.exe %* -goto end - -:run_help -set run=start "Podman Help" /D "%~dp0" /B - -if not "%3" == "" ( - %run% "podman-%2-%3.html - goto end -) - -if not "%2" == "" ( - %run% "podman-%2.html - goto end -) - -%run% "%podman-remote.html" -goto end - -:End diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs deleted file mode 100644 index 7d5df81159..0000000000 --- a/contrib/msi/podman.wxs +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT Installed - (REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE) - (NOT Installed) AND (NOT UILevel=2) - - - -