Skip to content
This repository was archived by the owner on Feb 20, 2021. It is now read-only.

WiX installer added #210

Closed
wants to merge 16 commits into from
Closed

WiX installer added #210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
95b220e
Initial commit of WiX installer for Redis
Jan 9, 2015
48d987d
Added WiX binaries to source control so that dev doesn't have to inst…
Jan 9, 2015
a486b17
Added a 64-bit Windows installer
Jan 9, 2015
521d95d
Added WiX binaries to source control for 64-bit Windows Installer so …
Jan 9, 2015
8a3cdb9
Added firewall exception for Redis service
Jan 12, 2015
83cebc8
Adding missing WiX compiler and linker .exe files that were ignored b…
Jan 12, 2015
dc0d894
Updated path to WixFirewallExentsion.dll
Jan 12, 2015
0ffbf00
Removed CONFIG WiX property from install command-line instructions. I…
Jan 12, 2015
422323b
Merge remote-tracking branch 'upstream/2.8' into 2.8
NickMRamirez Feb 27, 2015
7d47513
Removing x86 WiX installer
NickMRamirez Feb 27, 2015
9554722
Removed WiX compiler binaries. We'll be relying on the developer to h…
NickMRamirez Feb 27, 2015
01a6be2
Added a UI to the WiX installer. Also, added license text and branded…
NickMRamirez Feb 27, 2015
2e3782b
Added a dialog to the installer that lets the user customize the port…
NickMRamirez Feb 28, 2015
dbb2a41
Updated Word doc to include information about how the Windows service…
NickMRamirez Feb 28, 2015
2537612
Added redis.service.conf that turns on logging to the Windows event v…
NickMRamirez Mar 9, 2015
1ff886f
Merge remote-tracking branch 'upstream/2.8' into 2.8
NickMRamirez Mar 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added a UI to the WiX installer. Also, added license text and branded… 
… logo images for Redis.
  • Loading branch information
@NickMRamirez
NickMRamirez committed Feb 27, 2015
commit 01a6be237f948cb54825ef2a0d9f911ca5b1798d
65 changes: 65 additions & 0 deletions msvs/RedisWindowsX64/FileComponents.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension">
<Fragment>
<PropertyRef Id="WIX_ACCOUNT_NETWORKSERVICE" />

<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="cmp_redis_benchmarkEXE" Guid="*">
<File Source="$(var.RedisBenchmark.TargetDir)redis-benchmark.exe" />
</Component>

<Component Id="cmp_redis_check_aofEXE" Guid="*">
<File Source="$(var.RedisCheckAof.TargetDir)redis-check-aof.exe" />
</Component>

<Component Id="cmp_redis_check_dumpEXE" Guid="*">
<File Source="$(var.RedisCheckDump.TargetDir)redis-check-dump.exe" />
</Component>

<Component Id="cmp_redis_cliEXE" Guid="*">
<File Source="$(var.RedisCli.TargetDir)redis-cli.exe" />
</Component>

<!--
The following component installs Redis as a Windows service.
-->
<Component Id="cmp_redis_server" Guid="*">
<File Id="file_redis_server" Source="$(var.RedisServer.TargetDir)redis-server.exe" />
<ServiceInstall Id="redisService" Name="Redis" DisplayName="Redis" Description="This service runs the Redis server" Start="auto" ErrorControl="normal" Type="ownProcess" Arguments="--service-run &quot;[#file_redis.windowsCONF]&quot; --loglevel [LOGLEVEL]" Account="[WIX_ACCOUNT_NETWORKSERVICE]" />
<ServiceControl Id="redisServiceControl" Name="Redis" Start="install" Stop="both" Remove="uninstall" Wait="yes" />
<fw:FirewallException Id="fw_redis_server" Program="[#file_redis_server]" Description="Exception for Redis server" Name="Redis" Scope="any" />
</Component>

<!--
The following component gives the NetworkService user full access to the Redis install directory.
It needs this to start the service.
-->
<Component Id="cmp_give_network_service_folder_permissions" Guid="{55E5EFB3-61E6-4D51-934E-BFEEFB430701}">
<CreateFolder>
<util:PermissionEx User="[WIX_ACCOUNT_NETWORKSERVICE]" GenericAll="yes" />
</CreateFolder>
</Component>
</ComponentGroup>

<!--Documentation files-->
<ComponentGroup Id="DocumentationComponents" Directory="INSTALLFOLDER" Source="..\setups\documentation">
<Component Id="cmp_Redis_on_Windows_Release_NotesDOCX" Guid="*">
<File Name="Redis on Windows Release Notes.docx" />
</Component>

<Component Id="cmp_Redis_on_WindowsDOCX" Guid="*">
<File Name="Redis on Windows.docx" />
</Component>

<Component Id="cmp_redis.windowsCONF" Guid="*">
<File Id="file_redis.windowsCONF" Name="redis.windows.conf" />
</Component>

<Component Id="cmp_Windows_Service_DocumentationDOCX" Guid="*">
<File Name="Windows Service Documentation.docx" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
Binary file added msvs/RedisWindowsX64/License.rtf
View file
Open in desktop
Binary file not shown.
75 changes: 7 additions & 68 deletions msvs/RedisWindowsX64/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
<MediaTemplate EmbedCab="yes" />

<Property Id="ARPURLINFOABOUT" Value="https://github.com/MSOpenTech/redis" />
<Property Id="LOGLEVEL" Value="verbose" />

<UIRef Id="WixUI_InstallDir"/>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
<WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
<WixVariable Id="WixUIDialogBmp" Value="redis_background.jpg"/>
<WixVariable Id="WixUIBannerBmp" Value="top_banner.jpg"/>

<Feature Id="ProductFeature" Title="Redis" Level="1">
<ComponentGroupRef Id="ProductComponents" />
Expand All @@ -29,72 +36,4 @@
</Directory>
</Directory>
</Fragment>

<Fragment>
<PropertyRef Id="WIX_ACCOUNT_NETWORKSERVICE" />

<!--
The following properties can be customized.
-->
<Property Id="LOGLEVEL" Value="verbose" />
<Property Id="CONFIG" Value="redis.windows.conf" />

<!--Executable files-->
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="cmp_redis_benchmarkEXE" Guid="*">
<File Source="$(var.RedisBenchmark.TargetDir)redis-benchmark.exe" />
</Component>

<Component Id="cmp_redis_check_aofEXE" Guid="*">
<File Source="$(var.RedisCheckAof.TargetDir)redis-check-aof.exe" />
</Component>

<Component Id="cmp_redis_check_dumpEXE" Guid="*">
<File Source="$(var.RedisCheckDump.TargetDir)redis-check-dump.exe" />
</Component>

<Component Id="cmp_redis_cliEXE" Guid="*">
<File Source="$(var.RedisCli.TargetDir)redis-cli.exe" />
</Component>

<!--
The following component installs Redis as a Windows service.
-->
<Component Id="cmp_redis_server" Guid="*">
<File Id="file_redis_server" Source="$(var.RedisServer.TargetDir)redis-server.exe" />
<ServiceInstall Id="redisService" Name="Redis" DisplayName="Redis" Description="This service runs the Redis server" Start="auto" ErrorControl="normal" Type="ownProcess" Arguments="--service-run [CONFIG] --loglevel [LOGLEVEL]" Account="[WIX_ACCOUNT_NETWORKSERVICE]" />
<ServiceControl Id="redisServiceControl" Name="Redis" Start="install" Stop="both" Remove="uninstall" Wait="yes" />
<fw:FirewallException Id="fw_redis_server" Program="[#file_redis_server]" Description="Exception for Redis server" Name="Redis" Scope="any" />
</Component>

<!--
The following component gives the NetworkService user full access to the Redis install directory.
It needs this to start the service.
-->
<Component Id="cmp_give_network_service_folder_permissions" Guid="{55E5EFB3-61E6-4D51-934E-BFEEFB430701}">
<CreateFolder>
<util:PermissionEx User="[WIX_ACCOUNT_NETWORKSERVICE]" GenericAll="yes" />
</CreateFolder>
</Component>
</ComponentGroup>

<!--Documentation files-->
<ComponentGroup Id="DocumentationComponents" Directory="INSTALLFOLDER" Source="..\setups\documentation">
<Component Id="cmp_Redis_on_Windows_Release_NotesDOCX" Guid="*">
<File Name="Redis on Windows Release Notes.docx" />
</Component>

<Component Id="cmp_Redis_on_WindowsDOCX" Guid="*">
<File Name="Redis on Windows.docx" />
</Component>

<Component Id="cmp_redis.windowsCONF" Guid="*">
<File Name="redis.windows.conf" />
</Component>

<Component Id="cmp_Windows_Service_DocumentationDOCX" Guid="*">
<File Name="Windows Service Documentation.docx" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
10 changes: 10 additions & 0 deletions msvs/RedisWindowsX64/RedisWindowsX64.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
</PropertyGroup>
<ItemGroup>
<Compile Include="FileComponents.wxs" />
<Compile Include="Product.wxs" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -68,6 +69,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
<HintPath>..\..\..\..\Program Files (x86)\WiX Toolset v3.9\bin\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
<WixExtension Include="WixFirewallExtension">
<HintPath>$(WixToolPath)WixFirewallExtension.dll</HintPath>
<Name>WixFirewallExtension</Name>
Expand All @@ -77,6 +82,11 @@
<Name>WixUtilExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<Content Include="License.rtf" />
<Content Include="redis_background.jpg" />
<Content Include="top_banner.jpg" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
Binary file added msvs/RedisWindowsX64/redis_background.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added msvs/RedisWindowsX64/top_banner.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.