forked from containers/podman
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request containers#24459 from arixmkii/contrib-le
Fix inconsistent line ending in win-installer project
- Loading branch information
Showing
2 changed files
with
72 additions
and
72 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,37 @@ | ||
| <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" bal:Overridable="yes" /> | ||
|
|
||
| <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> | ||
| <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" bal:Overridable="yes" /> | ||
|
|
||
| <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 |
|---|---|---|
| @@ -1,35 +1,35 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <Fragment> | ||
| <UI> | ||
| <Dialog Id="WelcomeInstallDlg" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)"> | ||
| <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" /> | ||
| <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" /> | ||
| <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> | ||
| <Control Id="Description" Type="Text" X="135" Y="50" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" /> | ||
| <Control Id="ProviderChoice" Type="Text" X="135" Y="115" Width="220" Height="18" Transparent="yes" NoPrefix="yes" Text="Select the Virtualization Provider for the Podman machine:" HideCondition="HIDE_PROVIDER_CHOICE" /> | ||
| <Control Type="RadioButtonGroup" Property="MACHINE_PROVIDER" Id="MachineProviderRadioButtonGroup" Width="226" Height="30" X="135" Y="135" HideCondition="HIDE_PROVIDER_CHOICE"> | ||
| <RadioButtonGroup Property="MACHINE_PROVIDER"> | ||
| <RadioButton Text="Windows Linux Subsystem (WSLv2)" Height="15" Value="wsl" Width="226" X="10" Y="0" /> | ||
| <RadioButton Text="Windows Hyper-V" Height="15" Value="hyperv" Width="226" X="10" Y="15" /> | ||
| </RadioButtonGroup> | ||
|
|
||
| </Control> | ||
| <Control Id="WSLInstallCheckbox" Type="CheckBox" X="135" Y="190" Width="226" Height="18" CheckBoxValue="1" Property="WSL_INSTALL" Default="no" Text="Install WSL if needed (requires reboot)" ShowCondition="MACHINE_PROVIDER = "wsl"" HideCondition="(MACHINE_PROVIDER = "hyperv" OR HIDE_PROVIDER_CHOICE) OR (HAS_WSLFEATURE = 1)" /> | ||
| <Control Id="HyperVInstallCheckbox" Type="CheckBox" X="135" Y="190" Width="226" Height="18" CheckBoxValue="1" Property="HYPERV_INSTALL" Default="no" Text="Install Hyper-V if needed (requires reboot)" ShowCondition="MACHINE_PROVIDER = "hyperv"" HideCondition="(MACHINE_PROVIDER = "wsl" OR HIDE_PROVIDER_CHOICE) OR (HAS_HYPERVFEATURE = 1)" /> | ||
| <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> | ||
| <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)"> | ||
| <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" /> | ||
| <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace <> 1" /> | ||
| <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)" /> | ||
| <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"" /> | ||
| <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"" /> | ||
| <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")" /> | ||
| </Control> | ||
| <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> | ||
| <Publish Event="SpawnDialog" Value="CancelDlg" /> | ||
| </Control> | ||
|
|
||
| </Dialog> | ||
| </UI> | ||
| </Fragment> | ||
| </Wix> | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <Fragment> | ||
| <UI> | ||
| <Dialog Id="WelcomeInstallDlg" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)"> | ||
| <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" /> | ||
| <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" /> | ||
| <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> | ||
| <Control Id="Description" Type="Text" X="135" Y="50" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" /> | ||
| <Control Id="ProviderChoice" Type="Text" X="135" Y="115" Width="220" Height="18" Transparent="yes" NoPrefix="yes" Text="Select the Virtualization Provider for the Podman machine:" HideCondition="HIDE_PROVIDER_CHOICE" /> | ||
| <Control Type="RadioButtonGroup" Property="MACHINE_PROVIDER" Id="MachineProviderRadioButtonGroup" Width="226" Height="30" X="135" Y="135" HideCondition="HIDE_PROVIDER_CHOICE"> | ||
| <RadioButtonGroup Property="MACHINE_PROVIDER"> | ||
| <RadioButton Text="Windows Linux Subsystem (WSLv2)" Height="15" Value="wsl" Width="226" X="10" Y="0" /> | ||
| <RadioButton Text="Windows Hyper-V" Height="15" Value="hyperv" Width="226" X="10" Y="15" /> | ||
| </RadioButtonGroup> | ||
|
|
||
| </Control> | ||
| <Control Id="WSLInstallCheckbox" Type="CheckBox" X="135" Y="190" Width="226" Height="18" CheckBoxValue="1" Property="WSL_INSTALL" Default="no" Text="Install WSL if needed (requires reboot)" ShowCondition="MACHINE_PROVIDER = "wsl"" HideCondition="(MACHINE_PROVIDER = "hyperv" OR HIDE_PROVIDER_CHOICE) OR (HAS_WSLFEATURE = 1)" /> | ||
| <Control Id="HyperVInstallCheckbox" Type="CheckBox" X="135" Y="190" Width="226" Height="18" CheckBoxValue="1" Property="HYPERV_INSTALL" Default="no" Text="Install Hyper-V if needed (requires reboot)" ShowCondition="MACHINE_PROVIDER = "hyperv"" HideCondition="(MACHINE_PROVIDER = "wsl" OR HIDE_PROVIDER_CHOICE) OR (HAS_HYPERVFEATURE = 1)" /> | ||
| <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> | ||
| <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)"> | ||
| <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" /> | ||
| <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace <> 1" /> | ||
| <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)" /> | ||
| <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"" /> | ||
| <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"" /> | ||
| <Publish Event="SpawnDialog" Value="OutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")" /> | ||
| </Control> | ||
| <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> | ||
| <Publish Event="SpawnDialog" Value="CancelDlg" /> | ||
| </Control> | ||
|
|
||
| </Dialog> | ||
| </UI> | ||
| </Fragment> | ||
| </Wix> |