forked from containers/podman
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The chocolatey tool that was fetching us wix v3 can no longer be used to fetch wix v4+ so we had to switch to dotnet to fetch the latest wix. This commit builds the installer with wix v5. wix v5 is installed via the `dotnet` tool in the windows image itself at containers/automation_images#354. Going forward, the `dotnet` tool will also be used to build the installer. In the process, the wix v3 files were converted to wix v4+ using `wix convert` followed by manual modifications along with switch to wixproj builds with dotnet. Contributions from Mario Loriedo: - bundle setup update to wix5 - updates to build and release process scripts Ref: #3 - small fixes to windows installer theme Ref: #4 Resolves: RUN-2055 Co-authored-by: Mario Loriedo <mario.loriedo@gmail.com> Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
- Loading branch information
Showing
19 changed files
with
490 additions
and
496 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,50 +1,37 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> | ||
<?ifndef var.VERSION?> | ||
<?error VERSION must be defined via command line argument?> | ||
<?endif?> | ||
<Bundle Name="Podman" Version="$(var.VERSION)" Manufacturer="Red Hat" | ||
UpgradeCode="f3e1f40a-a791-49b7-9bc6-050975293353" IconSourceFile="resources\podman-logo.ico" | ||
Compressed="yes"> | ||
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense"> | ||
<bal:WixStandardBootstrapperApplication LicenseUrl="" | ||
ThemeFile="podman-theme.xml" | ||
LocalizationFile="podman-theme.wxl" | ||
LogoFile="resources\podman-banner2.png" | ||
LogoSideFile="resources\podman-sidebar.png" | ||
SuppressOptionsUI="yes" | ||
ShowVersion="yes"/> | ||
</BootstrapperApplicationRef> | ||
<Variable Name='InstallFolder' Type='string' Value='[ProgramFiles64Folder]RedHat\Podman' bal:Overridable="yes"/> | ||
<Variable Name="VERSION" Value="$(var.VERSION)"/> | ||
<Variable Name="MachineProvider" Type="string" Value="wsl" bal:Overridable="yes"/> | ||
<Variable Name="WSLCheckbox" Type="numeric" Value="1" bal:Overridable="yes"/> | ||
<Variable Name="HyperVCheckbox" Type="numeric" Value="0" bal:Overridable="yes"/> | ||
<Variable Name="AllowOldWin" Type="numeric" Value="0" bal:Overridable="yes"/> | ||
<Variable Name="LaunchTarget" Value="explorer.exe"/> | ||
<Variable Name="LaunchArguments" Value=""[InstallFolder]\podman-for-windows.html""/> | ||
<Variable Name="SkipConfigFileCreation" Value="0"/> | ||
|
||
<util:RegistrySearch Id="PreviousVersionSearch" Variable="PreviousVersion" Result="value" Root="HKLM" Key="SOFTWARE\[WixBundleManufacturer]\Updates\[WixBundleName]" Value="PackageVersion"/> | ||
<util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="SOFTWARE\[WixBundleManufacturer]\[WixBundleName]" Value="InstallDir" Variable="PreviousInstallFolder" Win64="yes"/> | ||
<util:DirectorySearch Path="[PreviousInstallFolder]" Variable="InstallFolder" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" /> | ||
<util:RegistrySearch Id="CurrentBuild" Variable="CBNumber" Result="value" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber"/> | ||
<bal:Condition Message="Windows 10 (19041) or later is required to run this application."> | ||
<![CDATA[VersionNT >= v10.0 AND (CBNumber >= 19041 OR AllowOldWin = 1)]]> | ||
</bal:Condition> | ||
<bal:Condition Message="You have an installed development, pre-release version, or alternative build identifying as the same version of this installer. You must uninstall the existing version of Podman first, before proceeding."> | ||
<![CDATA[WixBundleAction <> 5 OR WixBundleInstalled OR WixBundleForcedRestartPackage OR PreviousVersion <> VERSION]]> | ||
</bal:Condition> | ||
<Chain> | ||
<MsiPackage Id="Setup" SourceFile="podman.msi" Vital="yes"> | ||
<MsiProperty Name="INSTALLDIR" Value="[InstallFolder]" /> | ||
<MsiProperty Name="MACHINE_PROVIDER" Value="[MachineProvider]"/> | ||
<MsiProperty Name="WITH_WSL" Value="[WSLCheckbox]"/> | ||
<MsiProperty Name="WITH_HYPERV" Value="[HyperVCheckbox]"/> | ||
<MsiProperty Name="SKIP_CONFIG_FILE_CREATION" Value="[SkipConfigFileCreation]"/> | ||
</MsiPackage> | ||
<ExePackage DisplayName="WSL Kernel Install" InstallCondition='(MachineProvider = "wsl") AND (WSLCheckbox = 1)' SourceFile="artifacts\podman-wslkerninst.exe"/> | ||
</Chain> | ||
<OptionalUpdateRegistration/> | ||
</Bundle> | ||
</Wix> | ||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
<?ifndef var.VERSION?> | ||
<?error VERSION must be defined via command line argument?> | ||
<?endif?> | ||
<Bundle Name="Podman" Version="$(var.VERSION)" Manufacturer="Red Hat" UpgradeCode="f3e1f40a-a791-49b7-9bc6-050975293353" IconSourceFile="resources\podman-logo.ico" Compressed="yes"> | ||
<BootstrapperApplication> | ||
<bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkSidebarLicense" ThemeFile="podman-theme.xml" LocalizationFile="podman-theme.wxl" LogoFile="resources\podman-banner2.png" LogoSideFile="resources\podman-sidebar.png" SuppressOptionsUI="yes" ShowVersion="yes" /> | ||
</BootstrapperApplication> | ||
<Variable Name="InstallFolder" Type="formatted" Value="[ProgramFiles64Folder]RedHat\Podman" bal:Overridable="yes" /> | ||
<Variable Name="VERSION" Value="$(var.VERSION)" /> | ||
<Variable Name="MachineProvider" Type="string" Value="wsl" bal:Overridable="yes" /> | ||
<Variable Name="WSLCheckbox" Type="numeric" Value="1" bal:Overridable="yes" /> | ||
<Variable Name="HyperVCheckbox" Type="numeric" Value="0" bal:Overridable="yes" /> | ||
<Variable Name="AllowOldWin" Type="numeric" Value="0" bal:Overridable="yes" /> | ||
<Variable Name="LaunchTarget" Value="explorer.exe" /> | ||
<Variable Name="LaunchArguments" Value=""[InstallFolder]\podman-for-windows.html"" /> | ||
<Variable Name="SkipConfigFileCreation" Value="0" /> | ||
|
||
<util:RegistrySearch Id="PreviousVersionSearch" Variable="PreviousVersion" Result="value" Root="HKLM" Key="SOFTWARE\[WixBundleManufacturer]\Updates\[WixBundleName]" Value="PackageVersion" /> | ||
<util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="SOFTWARE\[WixBundleManufacturer]\[WixBundleName]" Value="InstallDir" Variable="PreviousInstallFolder" Bitness="always64" /> | ||
<util:DirectorySearch Path="[PreviousInstallFolder]" Variable="InstallFolder" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" /> | ||
<util:RegistrySearch Id="CurrentBuild" Variable="CBNumber" Result="value" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber" /> | ||
<bal:Condition Message="Windows 10 (19041) or later is required to run this application." Condition="VersionNT >= v10.0 AND (CBNumber >= 19041 OR AllowOldWin = 1)" /> | ||
<bal:Condition Message="You have an installed development, pre-release version, or alternative build identifying as the same version of this installer. You must uninstall the existing version of Podman first, before proceeding." Condition="WixBundleInstalled OR WixBundleForcedRestartPackage OR PreviousVersion <> VERSION" /> | ||
<Chain> | ||
<MsiPackage Id="Setup" SourceFile="en-US\podman.msi" Vital="yes"> | ||
<MsiProperty Name="INSTALLDIR" Value="[InstallFolder]" /> | ||
<MsiProperty Name="MACHINE_PROVIDER" Value="[MachineProvider]" /> | ||
<MsiProperty Name="WITH_WSL" Value="[WSLCheckbox]" /> | ||
<MsiProperty Name="WITH_HYPERV" Value="[HyperVCheckbox]" /> | ||
<MsiProperty Name="SKIP_CONFIG_FILE_CREATION" Value="[SkipConfigFileCreation]" /> | ||
</MsiPackage> | ||
<ExePackage DisplayName="WSL Kernel Install" InstallCondition="(MachineProvider = "wsl") AND (WSLCheckbox = 1)" SourceFile="artifacts\podman-wslkerninst.exe" DetectCondition="" Permanent="true" /> | ||
</Chain> | ||
<OptionalUpdateRegistration /> | ||
</Bundle> | ||
</Wix> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<Project Sdk="WixToolset.Sdk/5.0.0"> | ||
<PropertyGroup> | ||
<InstallerPlatform>x64</InstallerPlatform> | ||
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> | ||
<OutputType>Bundle</OutputType> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="5.0.0" /> | ||
<PackageReference Include="WixToolset.Util.wixext" Version="5.0.0" /> | ||
<Compile Include="burn.wxs" /> | ||
</ItemGroup> | ||
</Project> |
Oops, something went wrong.