Added a 64-bit Windows installer

437a9c35 · NickMRamirez · Alexis Campailla · 9bc6c6ee · 437a9c35 · 437a9c35
3 changed file
--- a/msvs/RedisServer.sln
+++ b/msvs/RedisServer.sln
@@ -44,6 +44,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReleasePackagingTool", "Rel
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "RedisWindowsX86", "RedisWindowsX86\RedisWindowsX86.wixproj", "{1A5CC75A-CB72-4741-8881-77CC039FFCE1}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "RedisWindowsX64", "RedisWindowsX64\RedisWindowsX64.wixproj", "{C829D256-16B4-4DC7-9BF9-6814F76B441E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -195,19 +197,29 @@ Global
 		{74A69E5D-6540-43CC-9975-20989BF19EB0}.Release|x64.Build.0 = Release|x64
 		{74A69E5D-6540-43CC-9975-20989BF19EB0}.Release|x86.ActiveCfg = Release|x64
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Debug|Win32.ActiveCfg = Debug|x86
-		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Debug|Win32.Build.0 = Debug|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Debug|x64.ActiveCfg = Debug|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Debug|x86.ActiveCfg = Debug|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Debug|x86.Build.0 = Debug|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Release|Mixed Platforms.Build.0 = Release|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Release|Win32.ActiveCfg = Release|x86
-		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Release|Win32.Build.0 = Release|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Release|x64.ActiveCfg = Release|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Release|x86.ActiveCfg = Release|x86
 		{1A5CC75A-CB72-4741-8881-77CC039FFCE1}.Release|x86.Build.0 = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Win32.ActiveCfg = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Win32.Build.0 = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x64.ActiveCfg = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x64.Build.0 = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x86.ActiveCfg = Debug|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Mixed Platforms.Build.0 = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Win32.ActiveCfg = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Win32.Build.0 = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x64.ActiveCfg = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x64.Build.0 = Release|x86
+		{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x86.ActiveCfg = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/msvs/RedisWindowsX64/Product.wxs
+++ b/msvs/RedisWindowsX64/Product.wxs
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <!--
+    32-bit installer
+    
+    Example installation (command-line):
+      msiexec /i Redis-Windows-x64.msi LOGLEVEL=verbose CONFIG=redis.windows.conf
+  -->
+  <Product Id="*" Name="Redis on Windows" Language="1033" Version="1.0.0.0" Manufacturer="MSOpenTech" UpgradeCode="{05410198-7212-4FC4-B7C8-AFEFC3DA0FBC}">
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MediaTemplate EmbedCab="yes" />
+
+    <Property Id="ARPURLINFOABOUT" Value="https://github.com/MSOpenTech/redis" />
+
+    <Feature Id="ProductFeature" Title="Redis" Level="1">
+      <ComponentGroupRef Id="ProductComponents" />
+      <ComponentGroupRef Id="DocumentationComponents" />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFiles64Folder">
+        <Directory Id="INSTALLFOLDER" Name="Redis-Windows" />
+      </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 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" />
+      </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>
\ No newline at end of file
--- a/msvs/RedisWindowsX64/RedisWindowsX64.wixproj
+++ b/msvs/RedisWindowsX64/RedisWindowsX64.wixproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.9</ProductVersion>
+    <ProjectGuid>c829d256-16b4-4dc7-9bf9-6814f76b441e</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Redis-Windows-x64</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+    <CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\RedisBenchmark\RedisBenchmark.vcxproj">
+      <Name>RedisBenchmark</Name>
+      <Project>{b00d4bb5-44de-405e-839c-d16f547006cf}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\RedisCheckAof\RedisCheckAof.vcxproj">
+      <Name>RedisCheckAof</Name>
+      <Project>{a65c2cd6-72a3-441a-aea3-d754bea9a86a}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\RedisCheckDump\RedisCheckDump.vcxproj">
+      <Name>RedisCheckDump</Name>
+      <Project>{52193a97-d010-41d6-bf2b-33e8e764e308}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\RedisCli\RedisCli.vcxproj">
+      <Name>RedisCli</Name>
+      <Project>{392bbb91-3934-4a56-af42-65c5728311e8}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\RedisServer.vcxproj">
+      <Name>RedisServer</Name>
+      <Project>{46842776-68a5-ec98-6a09-1859bbfc73aa}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file