mirror of
https://github.com/containers/podman.git
synced 2025-05-17 15:18:43 +08:00
Remove legacy msitools based msi installer
This was replaced by the setup.exe burn installer several releases ago, and only kept around as a fallback. Remove it since it is no longer maintained and not recommended for use. Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
This commit is contained in:
Jason T. Greene
22
Makefile
22
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:
|
||||
|
||||
@ -274,7 +274,6 @@ function _run_altbuild() {
|
||||
;;
|
||||
*Windows*)
|
||||
make podman-remote-release-windows_amd64.zip
|
||||
make podman.msi
|
||||
;;
|
||||
*RPM*)
|
||||
make package
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
@ -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
|
||||
@ -1,68 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
|
||||
<?ifndef var.VERSION?>
|
||||
<?error VERSION must be defined via command line argument?>
|
||||
<?endif?>
|
||||
|
||||
<?ifndef var.ManSourceDir?>
|
||||
<?define ManSourceDir = "bin/windows" ?>
|
||||
<?endif?>
|
||||
|
||||
<Product Name="Podman $(var.VERSION)" Id="*" UpgradeCode="696BAB5D-CA1F-4B05-B123-320F245B8D6D" Version="$(var.VERSION)" Language="1033" Manufacturer="Red Hat Inc.">
|
||||
|
||||
<Package Id="*" Keywords="Installer" Description="Red Hat's Podman $(var.VERSION) Installer" Comments="Apache 2.0 License" Manufacturer="Red Hat Inc." InstallScope="perMachine" InstallerVersion="200" Compressed="yes"/>
|
||||
<Media Id="1" Cabinet="Podman.cab" EmbedCab="yes"/>
|
||||
<!-- Switch to AllowDowngrades="yes" when msitools is released with commit dde7dd2f -->
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed. Uninstall first to downgrade."/>
|
||||
<Property Id="DiskPrompt" Value="Red Hat's Podman $(var.VERSION) Installation"/>
|
||||
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
|
||||
<Directory Id="ProgramFiles64Folder" Name="PFiles">
|
||||
<Directory Id="RedHatPFiles" Name="RedHat">
|
||||
<Directory Id="INSTALLDIR" Name="Podman">
|
||||
<Component Id="INSTALLDIR_Component" Guid="14B310C4-9B5D-4DA5-ADF9-B9D008E4CD82" Win64="Yes">
|
||||
<CreateFolder/>
|
||||
</Component>
|
||||
<Component Id="MainExecutable" Guid="73752F94-6589-4C7B-ABED-39D655A19714" Win64="Yes">
|
||||
<File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman.exe" Source="bin/windows/podman.exe" KeyPath="yes"/>
|
||||
</Component>
|
||||
<Component Id="WinPathExecutable" Guid="00F5B731-D4A6-4B69-87B0-EA4EBAB89F95" Win64="Yes">
|
||||
<File Id="8F507E28-A61D-4E64-A92B-B5A00F023AE8" Name="winpath.exe" Source="bin/windows/winpath.exe" KeyPath="yes"/>
|
||||
</Component>
|
||||
<Component Id="WinSshProxyExecutable" Guid="0DA730AB-2F97-40E8-A8FC-356E88EAA4D2" Win64="Yes">
|
||||
<File Id="4A2AD125-34E7-4BD8-BE28-B2A9A5EDBEB5" Name="win-sshproxy.exe" Source="bin/windows/win-sshproxy.exe" KeyPath="yes"/>
|
||||
</Component>
|
||||
<Component Id="GvProxyExecutable" Guid="1A4A2975-AD2D-44AA-974B-9B343C098333" Win64="Yes">
|
||||
<File Id="0C9BDFB8-1DBD-4E51-BE7B-3F55478DACB7" Name="gvproxy.exe" Source="bin/windows/gvproxy.exe" KeyPath="yes"/>
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
<CustomAction Id="AddPath" ExeCommand="add" FileKey="8F507E28-A61D-4E64-A92B-B5A00F023AE8" Execute="deferred" Impersonate="yes" Return="check"/>
|
||||
<CustomAction Id="RemovePath" ExeCommand="remove" FileKey="8F507E28-A61D-4E64-A92B-B5A00F023AE8" Execute="deferred" Impersonate="yes" Return="check"/>
|
||||
<CustomAction Id='LaunchFile' ExeCommand="open "[INSTALLDIR]podman-for-windows.html"" FileKey="8F507E28-A61D-4E64-A92B-B5A00F023AE8" Execute="immediate" Impersonate="yes" Return="check"/>
|
||||
<Feature Id="Complete" Level="1">
|
||||
<ComponentRef Id="INSTALLDIR_Component"/>
|
||||
<ComponentRef Id="MainExecutable"/>
|
||||
<ComponentRef Id="WinPathExecutable"/>
|
||||
<ComponentRef Id="WinSshProxyExecutable"/>
|
||||
<ComponentRef Id="GvProxyExecutable"/>
|
||||
<ComponentGroupRef Id="ManFiles"/>
|
||||
</Feature>
|
||||
|
||||
<Icon Id="podman.ico" SourceFile="contrib/msi/podman-logo.ico"/>
|
||||
<Property Id="ARPPRODUCTICON" Value="podman.ico"/>
|
||||
|
||||
<InstallExecuteSequence>
|
||||
<RemoveExistingProducts Before="InstallInitialize"/>
|
||||
<Custom Action="AddPath" Before="InstallFinalize" After="InstallFiles">NOT Installed</Custom>
|
||||
<Custom Action="RemovePath" Before="RemoveFiles" After="InstallInitialize">(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</Custom>
|
||||
<Custom Action='LaunchFile' After='InstallFinalize'>(NOT Installed) AND (NOT UILevel=2)</Custom>
|
||||
</InstallExecuteSequence>
|
||||
|
||||
</Product>
|
||||
</Wix>
|
||||
Reference in New Issue
Block a user