Added symbols to MSI.

Also updated the release number to 2.8.21.
microsoftarchive · Jun 11, 2015 · 13f36c8 · 13f36c8
1 parent c68970e
commit 13f36c8
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 6 deletions.
diff --git a/msvs/msi/RedisMsi/Components/SymbolsComponents.wxs b/msvs/msi/RedisMsi/Components/SymbolsComponents.wxs
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <?define RepoDir="$(var.ProjectDir)..\..\..\" ?>
+    <?define BinDir="$(var.RepoDir)msvs\$(var.Platform)\$(var.Configuration)\" ?>
+
+    <Fragment>
+        <!--Symbols to install-->
+        <ComponentGroup Id="SymbolsComponents" Directory="INSTALLFOLDER">
+
+            <Component Id="cmp_redis_severPDB" Guid="*">
+                <File Source="$(var.BinDir)redis-server.pdb" />
+            </Component>
+
+            <Component Id="cmp_redis_cliPDB" Guid="*">
+                <File Source="$(var.BinDir)redis-cli.pdb" />
+            </Component>
+
+            <Component Id="cmp_redis_benchmarkPDB" Guid="*">
+                <File Source="$(var.BinDir)redis-benchmark.pdb" />
+            </Component>
+
+            <Component Id="cmp_redis_check_aofPDB" Guid="*">
+                <File Source="$(var.BinDir)redis-check-aof.pdb" />
+            </Component>
+
+            <Component Id="cmp_redis_check_dumpPDB" Guid="*">
+                <File Source="$(var.BinDir)redis-check-dump.pdb" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/msvs/msi/RedisMsi/License.rtf b/msvs/msi/RedisMsi/License.rtf
diff --git a/msvs/msi/RedisMsi/Product.wxs b/msvs/msi/RedisMsi/Product.wxs
@@ -21,7 +21,7 @@
   <Product Id="*" 
            Name="Redis on Windows" 
            Language="1033" 
-           Version="2.8.19.1" 
+           Version="2.8.21" 
            Manufacturer="MSOpenTech" 
            UpgradeCode="{05410198-7212-4FC4-B7C8-AFEFC3DA0FBC}">
     <Package InstallerVersion="200" 
@@ -49,6 +49,7 @@
     <!--Features-->
     <Feature Id="ProductFeature" Title="Redis" Level="1">
       <ComponentGroupRef Id="FileComponents" />
+      <ComponentGroupRef Id="SymbolsComponents" />
       <ComponentGroupRef Id="WindowsServiceComponents" />
       <ComponentGroupRef Id="DocumentationComponents" />
     </Feature>

diff --git a/msvs/msi/RedisMsi/RedisMsi.wixproj b/msvs/msi/RedisMsi/RedisMsi.wixproj
@@ -39,6 +39,7 @@
   <ItemGroup>
     <Compile Include="Components\DocumentationComponents.wxs" />
     <Compile Include="Components\FileComponents.wxs" />
+    <Compile Include="Components\SymbolsComponents.wxs" />
     <Compile Include="Components\WindowsServiceComponents.wxs" />
     <Compile Include="Dialogs\CustomInstallDir.wxs" />
     <Compile Include="Dialogs\FirewallDialog.wxs" />
@@ -56,7 +57,7 @@
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUIExtension">
-      <HintPath>..\..\..\..\Program Files (x86)\WiX Toolset v3.9\bin\WixUIExtension.dll</HintPath>
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
       <Name>WixUIExtension</Name>
     </WixExtension>
     <WixExtension Include="WixFirewallExtension">

diff --git a/msvs/setups/chocolatey/Redis.nuspec b/msvs/setups/chocolatey/Redis.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>redis-64</id>
     <title>redis-64</title>
-    <version>2.8.20</version>
+    <version>2.8.21</version>
     <authors>Jonathan Pickett</authors>
     <owners>Microsoft Open Technologies, Inc.</owners>
     <summary>Redis is a very popular open-source, networked, in-memory, key-value data store known for high performance, flexibility, a rich set of data structures, and a simple straightforward API.</summary>
@@ -14,7 +14,7 @@
     <licenseUrl>https://github.com/MSOpenTech/redis/blob/2.8/license.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <iconUrl>http://redis.io/images/redis.png</iconUrl>
-    <releaseNotes>Includes the changes from Redis 2.8.12 -> 2.8.20. Please see the release notes for the UNIX 2.8 branch to understand how this impacts Redis functionality.</releaseNotes>
+    <releaseNotes>Includes the changes from Redis 2.8.12 -> 2.8.21. Please see the release notes for the UNIX 2.8 branch to understand how this impacts Redis functionality.</releaseNotes>
   </metadata>
   <files>
     <file src="..\signed_binaries\*.*" target=".\" />

diff --git a/msvs/setups/documentation/Redis on Windows Release Notes.docx b/msvs/setups/documentation/Redis on Windows Release Notes.docx
diff --git a/msvs/setups/nuget/Redis.nuspec b/msvs/setups/nuget/Redis.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>redis-64</id>
     <title>redis-64</title>
-    <version>2.8.20</version>
+    <version>2.8.21</version>
     <authors>Jonathan Pickett</authors>
     <owners>Microsoft Open Technologies, Inc.</owners>
     <summary>Redis is a very popular open-source, networked, in-memory, key-value data store known for high performance, flexibility, a rich set of data structures, and a simple straightforward API.</summary>
@@ -14,7 +14,7 @@
     <licenseUrl>https://github.com/MSOpenTech/redis/blob/2.8/license.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <iconUrl>http://redis.io/images/redis.png</iconUrl>
-    <releaseNotes>Includes the changes from Redis 2.8.12 -> 2.8.20. Please see the release notes for the UNIX 2.8 branch to understand how this impacts Redis functionality.</releaseNotes>
+    <releaseNotes>Includes the changes from Redis 2.8.12 -> 2.8.21. Please see the release notes for the UNIX 2.8 branch to understand how this impacts Redis functionality.</releaseNotes>
   </metadata>
   <files>
     <file src="..\signed_binaries\*.*" target=".\" />