mirror of
https://github.com/containers/podman.git
synced 2025-10-18 19:53:58 +08:00
Making gvproxy.exe optional for building Windows installer
Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
This commit is contained in:

committed by
openshift-cherrypick-robot

parent
63f964c08b
commit
45b00b648f
@ -132,10 +132,15 @@ FetchPanel
|
|||||||
|
|
||||||
.\build-hooks.bat; ExitOnError
|
.\build-hooks.bat; ExitOnError
|
||||||
SignItem @("artifacts/win-sshproxy.exe",
|
SignItem @("artifacts/win-sshproxy.exe",
|
||||||
"artifacts/gvproxy.exe",
|
|
||||||
"artifacts/podman.exe",
|
"artifacts/podman.exe",
|
||||||
"artifacts/podman-msihooks.dll",
|
"artifacts/podman-msihooks.dll",
|
||||||
"artifacts/podman-wslkerninst.exe")
|
"artifacts/podman-wslkerninst.exe")
|
||||||
|
$gvExists = Test-Path "artifacts/gvproxy.exe"
|
||||||
|
if ($gvExists) {
|
||||||
|
SignItem @("artifacts/gvproxy.exe")
|
||||||
|
} else {
|
||||||
|
$env:UseGVProxy = "Skip"
|
||||||
|
}
|
||||||
|
|
||||||
.\build-msi.bat $ENV:INSTVER; ExitOnError
|
.\build-msi.bat $ENV:INSTVER; ExitOnError
|
||||||
SignItem @("podman.msi")
|
SignItem @("podman.msi")
|
||||||
|
@ -6,6 +6,12 @@
|
|||||||
<?error VERSION must be defined via command line argument?>
|
<?error VERSION must be defined via command line argument?>
|
||||||
<?endif?>
|
<?endif?>
|
||||||
|
|
||||||
|
<?ifdef env.UseGVProxy?>
|
||||||
|
<?define UseGVProxy = "$(env.UseGVProxy)"?>
|
||||||
|
<?else?>
|
||||||
|
<?define UseGVProxy = ""?>
|
||||||
|
<?endif?>
|
||||||
|
|
||||||
<Product Name="Podman $(var.VERSION)" Id="*" UpgradeCode="696BAB5D-CA1F-4B05-B123-320F245B8D6D" Version="$(var.VERSION)" Language="1033" Manufacturer="Red Hat Inc.">
|
<Product Name="Podman $(var.VERSION)" Id="*" UpgradeCode="696BAB5D-CA1F-4B05-B123-320F245B8D6D" Version="$(var.VERSION)" Language="1033" Manufacturer="Red Hat Inc.">
|
||||||
|
|
||||||
<Package Id="*" Platform="x64" 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"/>
|
<Package Id="*" Platform="x64" 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"/>
|
||||||
@ -30,9 +36,11 @@
|
|||||||
<Component Id="WinSshProxyExecutable" Guid="0DA730AB-2F97-40E8-A8FC-356E88EAA4D2" Win64="yes">
|
<Component Id="WinSshProxyExecutable" Guid="0DA730AB-2F97-40E8-A8FC-356E88EAA4D2" Win64="yes">
|
||||||
<File Id="WinSshProxyExecutableFile" Name="win-sshproxy.exe" Source="artifacts/win-sshproxy.exe" KeyPath="yes"/>
|
<File Id="WinSshProxyExecutableFile" Name="win-sshproxy.exe" Source="artifacts/win-sshproxy.exe" KeyPath="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
|
<?if $(var.UseGVProxy) != Skip?>
|
||||||
<Component Id="GvProxyExecutable" Guid="1A4A2975-AD2D-44AA-974B-9B343C098333" Win64="yes">
|
<Component Id="GvProxyExecutable" Guid="1A4A2975-AD2D-44AA-974B-9B343C098333" Win64="yes">
|
||||||
<File Id="GvProxyExecutableFile" Name="gvproxy.exe" Source="artifacts/gvproxy.exe" KeyPath="yes"/>
|
<File Id="GvProxyExecutableFile" Name="gvproxy.exe" Source="artifacts/gvproxy.exe" KeyPath="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
|
<?endif?>
|
||||||
<Component Id="GuideHTMLComponent" Guid="8B23C76B-F7D4-4030-8C46-1B5729E616B5" Win64="yes">
|
<Component Id="GuideHTMLComponent" Guid="8B23C76B-F7D4-4030-8C46-1B5729E616B5" Win64="yes">
|
||||||
<File Id="GuideHTMLFile" Name="welcome-podman.html" Source="docs/podman-for-windows.html" KeyPath="yes"/>
|
<File Id="GuideHTMLFile" Name="welcome-podman.html" Source="docs/podman-for-windows.html" KeyPath="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
@ -63,7 +71,9 @@
|
|||||||
<ComponentRef Id="EnvEntriesComponent"/>
|
<ComponentRef Id="EnvEntriesComponent"/>
|
||||||
<ComponentRef Id="MainExecutable"/>
|
<ComponentRef Id="MainExecutable"/>
|
||||||
<ComponentRef Id="WinSshProxyExecutable"/>
|
<ComponentRef Id="WinSshProxyExecutable"/>
|
||||||
|
<?if $(var.UseGVProxy) != Skip?>
|
||||||
<ComponentRef Id="GvProxyExecutable"/>
|
<ComponentRef Id="GvProxyExecutable"/>
|
||||||
|
<?endif?>
|
||||||
<ComponentRef Id="GuideHTMLComponent"/>
|
<ComponentRef Id="GuideHTMLComponent"/>
|
||||||
<ComponentGroupRef Id="ManFiles"/>
|
<ComponentGroupRef Id="ManFiles"/>
|
||||||
<ComponentGroupRef Id="WSLFeature"/>
|
<ComponentGroupRef Id="WSLFeature"/>
|
||||||
|
@ -123,14 +123,16 @@ try {
|
|||||||
Remove-Item -Recurse -Force -Path expand
|
Remove-Item -Recurse -Force -Path expand
|
||||||
}
|
}
|
||||||
|
|
||||||
$loc = Get-ChildItem -Recurse -Path . -Name gvproxy.exe
|
Write-Host "Copying artifacts"
|
||||||
if (!$loc) {
|
Foreach ($fileName in "win-sshproxy.exe", "podman.exe") {
|
||||||
throw "Could not obtain gvproxy.exe"
|
Copy-Artifact($fileName)
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host "Copying artifacts"
|
$loc = Get-ChildItem -Recurse -Path . -Name gvproxy.exe
|
||||||
Foreach ($fileName in "gvproxy.exe", "win-sshproxy.exe", "podman.exe") {
|
if (!$loc) {
|
||||||
Copy-Artifact($fileName)
|
Write-Host "Skipping gvproxy.exe artifact"
|
||||||
|
} else {
|
||||||
|
Copy-Artifact("gvproxy.exe")
|
||||||
}
|
}
|
||||||
|
|
||||||
$docsloc = Get-ChildItem -Path . -Name docs -Recurse
|
$docsloc = Get-ChildItem -Path . -Name docs -Recurse
|
||||||
|
Reference in New Issue
Block a user