[Setup] Nuget/Chocolatey packages update.

[Change] Updated the ReleasePackagingTool to include all .pdb files. [Change] Updated the nuget/chocolatey templates to conform with the guidelines: - Replaced the Redis logo with the Redis icon. - Changed the package title. - Changed the package description. - Removed the package summary to use a short version of the decription instead. [Change] Updated license.txt to 2015.
wyj152031 · Jul 22, 2015 · fc5eebd · fc5eebd
1 parent a08fd29
commit fc5eebd
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 25 deletions.
diff --git a/license.txt b/license.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2014, Salvatore Sanfilippo
+Copyright (c) 2006-2015, Salvatore Sanfilippo
 Modifications copyright (c) Microsoft Open Technologies, Inc. 
 All rights reserved.
 

diff --git a/msvs/ReleasePackagingTool/Program.cs b/msvs/ReleasePackagingTool/Program.cs
@@ -105,8 +105,18 @@ void BuildReleasePackage(string version)
                 "redis-check-aof.exe",
                 "redis-check-dump.exe",
                 "redis-cli.exe",
-                "redis-server.exe",
-                "redis-server.pdb",
+                "redis-server.exe"
+            };
+            List<string> symbolNames = new List<string>()
+            {
+                "redis-benchmark.pdb",
+                "redis-check-aof.pdb",
+                "redis-check-dump.pdb",
+                "redis-cli.pdb",
+                "redis-server.pdb"
+            };
+            List<string> dependencyNames = new List<string>()
+            {
                 "EventLog.dll"
             };
             string documentsRoot = Path.Combine(rootPath, @"msvs\setups\documentation");
@@ -125,6 +135,14 @@ void BuildReleasePackage(string version)
                 {
                     archive.CreateEntryFromFile(Path.Combine(executablesRoot, executableName), executableName);
                 }
+                foreach (string symbolName in symbolNames)
+                {
+                    archive.CreateEntryFromFile(Path.Combine(executablesRoot, symbolName), symbolName);
+                }
+                foreach (string dependencyName in dependencyNames)
+                {
+                    archive.CreateEntryFromFile(Path.Combine(executablesRoot, dependencyName), dependencyName);
+                }
                 foreach (string documentName in docuementNames)
                 {
                     archive.CreateEntryFromFile(Path.Combine(documentsRoot, documentName), documentName);

diff --git a/msvs/setups/chocolatey/Redis.nuspec b/msvs/setups/chocolatey/Redis.nuspec
@@ -2,21 +2,28 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>redis-64</id>
-    <title>Redis 64</title>
+    <title>Redis 64-bit</title>
     <version>3.0.100-alpha1</version>
     <authors>Alexis Campailla, Enrico Giordani, 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>
-    <description>Redis on Windows 64-bit.</description>
+    <description>A porting of Redis on Windows 64-bit.  
+
+[Redis](http://redis.io/) 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.  
+
+This package will install the Redis binaries in the default Chocolatey lib directory (i.e. C:\\ProgramData\\chocolatey\\lib\\redis-64).
+    </description>
     <projectUrl>https://msopentech.com/opentech-projects/redis/</projectUrl>
     <tags>Redis nosql cache</tags>
     <copyright>Copyright Microsoft Open Technologies, Inc.</copyright>
     <licenseUrl>https://github.com/MSOpenTech/redis/blob/2.8/license.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://redis.io/images/redis.png</iconUrl>
-    <releaseNotes>https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md</releaseNotes>
+    <iconUrl>https://cdn.rawgit.com/anonymous/5cfcb53c27ce7430d899/raw/e8d7e5f45c95314797128f535e96b16efd9d7c89/redis.svg</iconUrl>
+    <releaseNotes>The release notes are available [here](https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md)</releaseNotes>
   </metadata>
   <files>
-    <file src="..\signed_binaries\*.*" target=".\" />
+    <file src="..\signed_binaries\*.exe" target=".\" />
+    <file src="..\signed_binaries\*.pdb" target=".\" />
+    <file src="..\signed_binaries\*.conf" target=".\" />
+    <file src="..\signed_binaries\*.docx" target=".\" />
   </files>
 </package>
diff --git a/msvs/setups/chocolatey/template/Redis.nuspec.template b/msvs/setups/chocolatey/template/Redis.nuspec.template
@@ -2,21 +2,28 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>redis-64</id>
-    <title>Redis 64</title>
+    <title>Redis 64-bit</title>
     <version>CurrentRedisVersion</version>
     <authors>Alexis Campailla, Enrico Giordani, 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>
-    <description>Redis on Windows 64-bit.</description>
+    <description>A porting of Redis on Windows 64-bit.  
+
+[Redis](http://redis.io/) 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.  
+
+This package will install the Redis binaries in the default Chocolatey lib directory (i.e. C:\\ProgramData\\chocolatey\\lib\\redis-64).
+    </description>
     <projectUrl>https://msopentech.com/opentech-projects/redis/</projectUrl>
     <tags>Redis nosql cache</tags>
     <copyright>Copyright Microsoft Open Technologies, Inc.</copyright>
     <licenseUrl>https://github.com/MSOpenTech/redis/blob/2.8/license.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://redis.io/images/redis.png</iconUrl>
-    <releaseNotes>https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md</releaseNotes>
+    <iconUrl>https://cdn.rawgit.com/anonymous/5cfcb53c27ce7430d899/raw/e8d7e5f45c95314797128f535e96b16efd9d7c89/redis.svg</iconUrl>
+    <releaseNotes>The release notes are available [here](https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md)</releaseNotes>
   </metadata>
   <files>
-    <file src="..\signed_binaries\*.*" target=".\" />
+    <file src="..\signed_binaries\*.exe" target=".\" />
+    <file src="..\signed_binaries\*.pdb" target=".\" />
+    <file src="..\signed_binaries\*.conf" target=".\" />
+    <file src="..\signed_binaries\*.docx" target=".\" />
   </files>
 </package>
diff --git a/msvs/setups/nuget/Redis.nuspec b/msvs/setups/nuget/Redis.nuspec
@@ -2,19 +2,23 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>redis-64</id>
-    <title>Redis-64</title>
+    <title>Redis 64-bit</title>
     <version>3.0.100-alpha1</version>
     <authors>Alexis Campailla, Enrico Giordani, 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>
-    <description>Redis on Windows 64-bit.</description>
+    <description>A porting of Redis on Windows 64-bit.  
+
+[Redis](http://redis.io/) 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.  
+
+This package will install the Redis binaries in the default Chocolatey lib directory (i.e. C:\\ProgramData\\chocolatey\\lib\\redis-64).
+    </description>
     <projectUrl>https://msopentech.com/opentech-projects/redis/</projectUrl>
     <tags>Redis nosql cache</tags>
     <copyright>Copyright Microsoft Open Technologies, Inc.</copyright>
     <licenseUrl>https://github.com/MSOpenTech/redis/blob/2.8/license.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://redis.io/images/redis.png</iconUrl>
-    <releaseNotes>https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md</releaseNotes>
+    <iconUrl>https://cdn.rawgit.com/anonymous/5cfcb53c27ce7430d899/raw/e8d7e5f45c95314797128f535e96b16efd9d7c89/redis.svg</iconUrl>
+    <releaseNotes>The release notes are available [here](https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md)</releaseNotes>
   </metadata>
   <files>
     <file src="..\signed_binaries\*.exe" target=".\" />

diff --git a/msvs/setups/nuget/template/Redis.nuspec.template b/msvs/setups/nuget/template/Redis.nuspec.template
@@ -2,19 +2,23 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>redis-64</id>
-    <title>Redis-64</title>
+    <title>Redis 64-bit</title>
     <version>CurrentRedisVersion</version>
     <authors>Alexis Campailla, Enrico Giordani, 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>
-    <description>Redis on Windows 64-bit.</description>
+    <description>A porting of Redis on Windows 64-bit.  
+
+[Redis](http://redis.io/) 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.  
+
+This package will install the Redis binaries in the default Chocolatey lib directory (i.e. C:\\ProgramData\\chocolatey\\lib\\redis-64).
+    </description>
     <projectUrl>https://msopentech.com/opentech-projects/redis/</projectUrl>
     <tags>Redis nosql cache</tags>
     <copyright>Copyright Microsoft Open Technologies, Inc.</copyright>
     <licenseUrl>https://github.com/MSOpenTech/redis/blob/2.8/license.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://redis.io/images/redis.png</iconUrl>
-    <releaseNotes>https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md</releaseNotes>
+    <iconUrl>https://cdn.rawgit.com/anonymous/5cfcb53c27ce7430d899/raw/e8d7e5f45c95314797128f535e96b16efd9d7c89/redis.svg</iconUrl>
+    <releaseNotes>The release notes are available [here](https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md)</releaseNotes>
   </metadata>
   <files>
     <file src="..\signed_binaries\*.exe" target=".\" />