Skip to content

Commit afaf166

Browse files
committed
Setup: Bring back Update component
This reverts commit ed3675c. This reverts commit ee59bb7.
1 parent 4883d13 commit afaf166

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

Src/Setup/BuildBinaries.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.dll Output > nul
3737
copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output > nul
3838
copy /B ..\StartMenu\Setup\StartMenu.exe Output > nul
3939
copy /B ..\StartMenu\Setup\StartMenuDLL.dll Output > nul
40+
copy /B ..\Update\Release\Update.exe Output > nul
4041
copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.dll Output > nul
4142
copy /B ..\Setup\SetupHelper\Release\SetupHelper.exe Output > nul
4243

@@ -96,6 +97,8 @@ copy /B ..\StartMenu\Setup\StartMenuDLL.pdb Output\PDB32 > nul
9697
copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
9798
copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
9899
copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
100+
copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul
101+
copy /B Output\Update.exe Output\PDB32 > nul
99102

100103
REM Menu 64
101104
copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul

Src/Setup/Setup.wxs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@
103103
<ComponentRef Id="IESettingsLink" />
104104
<Condition Level="1">IE_BUILD&gt;=90000</Condition>
105105
</Feature>
106+
<Feature Id="Update" Level="1" Title="!(loc.UpdateTitle)" ConfigurableDirectory="APPLICATIONFOLDER" AllowAdvertise="no" Description="!(loc.UpdateDesc)">
107+
<ComponentRef Id="Update.exe" />
108+
<ComponentRef Id="UpdateSettingsLink" />
109+
</Feature>
106110
</Feature>
107111
<UI>
108112
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
@@ -469,6 +473,9 @@
469473
<Component Id="StartMenuHelperL10N.ini" Guid="144CE4DC-0C77-4793-B79A-A32E48A90E64" Win64="$(var.CS_WIN64)">
470474
<File Id="StartMenuHelperL10N.ini" KeyPath="yes" Source="..\StartMenu\StartMenuHelper\StartMenuHelperL10N.ini" Vital="yes" />
471475
</Component>
476+
<Component Id="Update.exe" Guid="FB6C213F-B670-4888-8B2C-12E807E335A7" Win64="$(var.CS_WIN64)">
477+
<File Id="Update" KeyPath="yes" Source="Output\Update.exe" Checksum="yes" Vital="yes" />
478+
</Component>
472479
<Component Id="PolicyDefinitions.zip" Guid="580A15D0-4023-471d-9D82-9D63FBA42B5D" Win64="$(var.CS_WIN64)">
473480
<File Id="PolicyDefinitions.zip" KeyPath="yes" Source="Output\PolicyDefinitions.zip" Vital="yes" />
474481
</Component>
@@ -556,6 +563,11 @@
556563
<CreateFolder />
557564
<Condition>START_MENU_FOLDER=1</Condition>
558565
</Component>
566+
<Component Id="UpdateSettingsLink" Guid="10B5A082-6C92-4EA7-AFF8-21AE3D2D7FE0">
567+
<Shortcut Id="UpdateSettingsLink" Name="!(loc.UpdateItem)" Advertise="no" Description="!(loc.UpdateSettingsDesc)" Target="[APPLICATIONFOLDER]Update.exe" WorkingDirectory="APPLICATIONFOLDER" />
568+
<CreateFolder />
569+
<Condition>START_MENU_FOLDER=1</Condition>
570+
</Component>
559571
<Component Id="ExplorerSettingsLink" Guid="6EC027F2-115D-4110-8189-DDAFC78169EC">
560572
<Shortcut Id="ExplorerSettingsLink" Name="!(loc.ExplorerItem)" Advertise="no" Description="!(loc.ExplorerSettingsDesc)" Target="[APPLICATIONFOLDER]ClassicExplorerSettings.exe" WorkingDirectory="APPLICATIONFOLDER">
561573
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.ClassicExplorer.Settings" />

0 commit comments

Comments
 (0)