Permalink
Browse files

Updates for 9.0.9.441 release

- removed EPG Key fields from installer as now available in the STV UI
  • Loading branch information...
1 parent 2191ab6 commit e56471b33f0d4acf16bf2d651c313f1b6a29cf35 @jusjoken jusjoken committed Oct 11, 2016
@@ -12,53 +12,16 @@
<bal:WixStandardBootstrapperApplication
LicenseUrl="License.htm"/>
</BootstrapperApplicationRef>
- <!-- The following removed from <bal:WixStandardBootstrapperApplication for the launcher button functions
- As the buttons do not work if the user uses an install folder other than ProgramFilesFolder then this is removed for now
- LaunchTargetElevatedId="LaunchElevatedApplicationTarget"
- LaunchTarget="$(var.LaunchTargetEXE)"
- -->
<WixVariable Id="WixStdbaLogo" Value="Resource\Logo.png" />
<WixVariable Id="WixStdbaLogoSide" Value="Resource\LogoSide.png" />
-
- <!-- Use a different theme xml/wxl file as the client does not need the EPG license key textbox -->
- <?if $(var.Configuration) = SetupServer ?>
- <WixVariable Id="WixStdbaThemeXml" Value="Resource\SageTVTheme.xml" />
- <WixVariable Id="WixStdbaThemeWxl" Value="Resource\SageTVTheme.wxl" />
- <?elseif $(var.Configuration) = SetupClient?>
- <WixVariable Id="WixStdbaThemeXml" Value="Resource\SageTVClientTheme.xml" />
- <WixVariable Id="WixStdbaThemeWxl" Value="Resource\SageTVClientTheme.wxl" />
- <?elseif $(var.Configuration) = SetupPlaceshifter?>
- <WixVariable Id="WixStdbaThemeXml" Value="Resource\SageTVPlaceshifterTheme.xml" />
- <WixVariable Id="WixStdbaThemeWxl" Value="Resource\SageTVPlaceshifterTheme.wxl" />
- <?endif?>
+ <WixVariable Id="WixStdbaThemeXml" Value="Resource\SageTVTheme.xml" />
+ <WixVariable Id="WixStdbaThemeWxl" Value="Resource\SageTVTheme.wxl" />
<!-- Set the value of variable to be used on the UI forms -->
<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]$(var.DefaultInstallFolder)" />
<Variable Name="SageInstallerVersion" Type="string" Value="$(var.SageInstallerVersion)" />
- <!-- Get the existing value for the EPGLicenseKey from the environment through the registry -->
- <Variable Name="EPGLicenseKey" Hidden="yes" />
- <util:RegistrySearchRef Id='SearchForSageTVLicenseKey' />
- <!-- The following removed related to the launcher buttons
- <?if $(var.Configuration) = SetupServer ?>
- <ApprovedExeForElevation
- Id="LaunchElevatedApplicationTarget"
- Key="SOFTWARE\Frey Technologies\SageTV"
- Value="SageTVServerServiceControlPath" />
- <?elseif $(var.Configuration) = SetupClient?>
- <ApprovedExeForElevation
- Id="LaunchElevatedApplicationTarget"
- Key="SOFTWARE\Frey Technologies\SageTV"
- Value="SageTVClientPath" />
- <?elseif $(var.Configuration) = SetupPlaceshifter?>
- <ApprovedExeForElevation
- Id="LaunchElevatedApplicationTarget"
- Key="SOFTWARE\Frey Technologies\SageTV"
- Value="SageTVPlaceshifterPath" />
- <?endif?>
- -->
-
<Chain>
<!-- TODO: Define the list of chained packages. -->
<!-- <MsiPackage SourceFile="path\to\your.msi" /> -->
@@ -74,7 +37,6 @@
Compressed="yes">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
- <MsiProperty Name="EPGLICENSEKEY" Value="[EPGLicenseKey]" />
</MsiPackage>
<?elseif $(var.Configuration) = SetupClient?>
<MsiPackage Id="SageTVSetupMSI"
@@ -102,16 +64,4 @@
</Bundle>
- <Fragment>
- <util:RegistrySearch
- Id='SearchForSageTVLicenseKey'
- Variable="EPGLicenseKey"
- Result="value"
- Root="HKLM"
- Format="raw"
- Value="SAGETVUSERKEY"
- Key="SYSTEM\CurrentControlSet\Control\Session Manager\Environment"/>
-
- </Fragment>
-
</Wix>
@@ -10,7 +10,6 @@
<MediaTemplate EmbedCab="yes" />
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
- <Property Id="EPGLICENSEKEY" Hidden="yes" />
<Property Id="MPEGDecoderMoved" Value="0" />
<Binary Id="KeepMPEGDecoder.vbs" SourceFile="redist\KeepMPEGDecoder.vbs" />
@@ -44,7 +43,6 @@
<ComponentGroupRef Id="ProductSageTVServerComponents" />
<ComponentGroupRef Id="SageTVServerShortcuts" />
<ComponentGroupRef Id="SageTVServerDesktopShortcuts" />
- <ComponentRef Id="EPGEnvironmentVariableComponent" />
<?elseif $(var.Configuration) = SetupClient?>
<ComponentGroupRef Id="ProductSageTVClientComponents" />
<ComponentGroupRef Id="SageTVClientShortcuts" />
@@ -136,24 +134,6 @@
</DirectoryRef>
</Fragment>
-
- <!-- Fragment for EPGEnvironmentVariable-->
- <?if $(var.Configuration) = SetupServer ?>
- <Fragment>
- <DirectoryRef Id="TARGETDIR">
- <Component Id="EPGEnvironmentVariableComponent" Guid="{3A6AF4B9-371A-4CE3-B7BF-9559F9AB3B2E}">
- <Environment Id="TestMinVar"
- Action="set"
- Part="all"
- Name="SAGETVUSERKEY"
- Permanent="yes"
- System="yes"
- Value="[EPGLICENSEKEY]" />
- </Component>
- </DirectoryRef>
- </Fragment>
- <?endif?>
-
<!-- Fragment for ProductSageTVJAR-->
<Fragment>
<ComponentGroup Id="ProductSageTVJARComponents" Directory="APPFOLDER">
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
- <String Id="Caption">[WixBundleName] Setup</String>
- <String Id="Title">[WixBundleName]</String>
- <String Id="InstallHeader">Welcome</String>
- <String Id="InstallMessage">Setup will install [WixBundleName] on your computer. Click Install to continue, Options to set the install directory or Close to exit.</String>
- <String Id="InstallVersion">Version [WixBundleVersion]</String>
- <String Id="InstallerVersion">Installer ([SageInstallerVersion])</String>
- <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
- <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
- <String Id="HelpHeader">Setup Help</String>
- <String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or creates a complete local copy of the bundle in directory. Install is the default.
-
-/passive | /quiet - displays minimal UI with no prompts or displays no UI and no prompts. By default UI and all prompts are displayed.
-
-/norestart - suppress any attempts to restart. By default UI will prompt before restart.
-
-/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
- <String Id="HelpCloseButton">&amp;Close</String>
- <String Id="InstallLicenseLinkText">[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
- <String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
- <String Id="InstallOptionsButton">&amp;Options</String>
- <String Id="InstallInstallButton">&amp;Install</String>
- <String Id="InstallCloseButton">&amp;Close</String>
- <String Id="InstallUpgradeLinkText">Version [WixBundleVersion] &lt;a href="#"&gt;upgrade available&lt;/a&gt;</String>
- <String Id="OptionsHeader">Setup Options</String>
- <String Id="OptionsLocationLabel">Install location:</String>
- <String Id="OptionsBrowseButton">&amp;Browse...</String>
- <String Id="OptionsLocationLabel2">Database location:</String>
- <String Id="OptionsBrowseButton2">B&amp;rowse...</String>
- <String Id="OptionsOkButton">&amp;OK</String>
- <String Id="OptionsCancelButton">&amp;Cancel</String>
- <String Id="ProgressHeader">Setup Progress</String>
- <String Id="ProgressLabel">Processing:</String>
- <String Id="OverallProgressPackageText">Initializing...</String>
- <String Id="ProgressCancelButton">&amp;Cancel</String>
- <String Id="ModifyHeader">Modify Setup</String>
- <String Id="ModifyRepairButton">&amp;Repair</String>
- <String Id="ModifyUninstallButton">&amp;Uninstall</String>
- <String Id="ModifyCloseButton">&amp;Close</String>
- <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
- <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
- <String Id="SuccessInstallHeader">Installation Successfully Completed</String>
- <String Id="SuccessHeader">Setup Successful</String>
- <String Id="SuccessLaunchButton">&amp;Launch Client</String>
- <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
- <String Id="SuccessRestartButton">&amp;Restart</String>
- <String Id="SuccessCloseButton">&amp;Close</String>
- <String Id="FailureHeader">Setup Failed</String>
- <String Id="FailureInstallHeader">Setup Failed</String>
- <String Id="FailureUninstallHeader">Uninstall Failed</String>
- <String Id="FailureRepairHeader">Repair Failed</String>
- <String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log file&lt;/a&gt;.</String>
- <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
- <String Id="FailureRestartButton">&amp;Restart</String>
- <String Id="FailureCloseButton">&amp;Close</String>
- <String Id="FilesInUseHeader">Files In Use</String>
- <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String>
- <String Id="FilesInUseCloseRadioButton">Close the &amp;applications and attempt to restart them.</String>
- <String Id="FilesInUseDontCloseRadioButton">&amp;Do not close applications. A reboot will be required.</String>
- <String Id="FilesInUseOkButton">&amp;OK</String>
- <String Id="FilesInUseCancelButton">&amp;Cancel</String>
-</WixLocalization>
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
- <Window Width="600" Height="450" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
- <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
- <Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
- <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
- <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
- <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
-
- <Page Name="Help">
- <Text X="80" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
- <Image X="11" Y="11" Width="64" Height="64" ImageFile="Logo.png"/>
- <Text X="11" Y="80" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
- <Text X="11" Y="121" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
- <Text X="11" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallerVersion)</Text>
- <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
- </Page>
- <Page Name="Install">
- <Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
- <Image X="11" Y="11" Width="165" Height="400" ImageFile="LogoSide.png"/>
- <Text X="185" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Text>
- <Text X="185" Y="91" Width="-11" Height="64" FontId="3" DisablePrefix="yes">#(loc.InstallMessage)</Text><!-- HexStyle="0x800000" -->
-
- <Hypertext Name="EulaHyperlink" X="185" Y="-111" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
- <Text X="185" Y="-81" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallVersion)</Text>
- <Checkbox Name="EulaAcceptCheckbox" X="185" Y="-51" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
- <Text X="185" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallerVersion)</Text>
- <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
- <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
- <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
- </Page>
- <Page Name="Options">
- <Text X="80" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
- <Image X="11" Y="11" Width="64" Height="64" ImageFile="Logo.png"/>
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsHeader)</Text>
- <Text X="11" Y="121" Width="-11" Height="17" FontId="3">#(loc.OptionsLocationLabel)</Text>
- <Editbox Name="FolderEditbox" X="11" Y="143" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
- <Button Name="BrowseButton" X="-11" Y="142" Width="75" Height="23" TabStop="yes" FontId="3">#(loc.OptionsBrowseButton)</Button>
- <Text X="11" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallerVersion)</Text>
-
- <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
- <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
- </Page>
- <Page Name="FilesInUse">
- <Text X="80" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
- <Image X="11" Y="11" Width="64" Height="64" ImageFile="Logo.png"/>
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
- <Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
- <Text Name="FilesInUseText" X="11" Y="150" Width="-11" Height="-86" FontId="3" DisablePrefix="yes" HexStyle="0x0000C000"></Text>
- <Button Name="FilesInUseCloseRadioButton" X="11" Y="-60" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
- <Button Name="FilesInUseDontCloseRadioButton" X="11" Y="-40" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
- <Text X="11" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallerVersion)</Text>
- <Button Name="FilesInUseOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
- <Button Name="FilesInUseCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FilesInUseCancelButton)</Button>
- </Page>
- <Page Name="Progress">
- <Text X="80" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
- <Image X="11" Y="11" Width="64" Height="64" ImageFile="Logo.png"/>
- <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
- <Text X="11" Y="141" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
- <Text Name="OverallProgressPackageText" X="85" Y="141" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
- <Progressbar Name="OverallCalculatedProgressbar" X="11" Y="163" Width="-11" Height="15" />
- <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
- </Page>
- <Page Name="Modify">
- <Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
- <Image X="11" Y="11" Width="165" Height="400" ImageFile="LogoSide.png"/>
- <Text X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
- <Text X="185" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallerVersion)</Text>
- <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
- <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
- <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
- </Page>
- <Page Name="Success">
- <Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
- <Image X="11" Y="11" Width="165" Height="400" ImageFile="LogoSide.png"/>
- <Text Name="SuccessHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
- <Text Name="SuccessInstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
- <Text Name="SuccessRepairHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
- <Text Name="SuccessUninstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
- <Text X="185" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallerVersion)</Text>
- <Button Name="LaunchButton" X="-91" Y="-11" Width="110" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
- <Text Name="SuccessRestartText" X="185" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
- <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
- <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
- </Page>
- <Page Name="Failure">
- <Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
- <Image X="11" Y="11" Width="165" Height="400" ImageFile="LogoSide.png"/>
- <Text Name="FailureHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
- <Text Name="FailureInstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
- <Text Name="FailureUninstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
- <Text Name="FailureRepairHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
- <Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
- <Hypertext Name="FailureMessageText" X="185" Y="-115" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
- <Text Name="FailureRestartText" X="185" Y="-57" Width="-11" Height="51" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
- <Text X="185" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallerVersion)</Text>
- <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
- <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
- </Page>
-</Theme>
Oops, something went wrong.

0 comments on commit e56471b

Please sign in to comment.