Updates for 9.0.9.441 release

- removed EPG Key fields from installer as now available in the STV UI

installer/wix/SageTVSetup/Bundle.wxs

@@ -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>

installer/wix/SageTVSetup/Product.wxs

@@ -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">