From 1cb3e8481435677510e042f59388299b9ff29d7e Mon Sep 17 00:00:00 2001
From: Enrico Giordani <enrico.giordani@gmail.com>
Date: Wed, 24 Jun 2015 11:59:45 +0200
Subject: [PATCH] ReleasePackagingTool changes:  [change] the release notes
 file is not anymore generated from a template  [change] the .md files are not
 anymore generated from the .docx files  [new] added redis-server.pdb symbols
 to the zip package file  [fix] create the release package directory if it
 doesn't exist

---
 msvs/ReleasePackagingTool/Program.cs          | 19 ++++++++++++++++---
 .../chocolatey/template/Redis.nuspec.template |  6 +++---
 .../nuget/template/Redis.nuspec.template      |  6 +++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/msvs/ReleasePackagingTool/Program.cs b/msvs/ReleasePackagingTool/Program.cs
index dd7d1789..fbe9286d 100644
--- a/msvs/ReleasePackagingTool/Program.cs
+++ b/msvs/ReleasePackagingTool/Program.cs
@@ -28,10 +28,16 @@ namespace ReleasePackagingTool
 
                 string version;
                 version = p.GetRedisVersion();
-                p.UpdateReleaseNotes(version);
+                // Starting with the 2.8.21 release the Release Notes file has a new format and it doesn't need to be updated
+                //p.UpdateReleaseNotes(version); 
+
                 p.UpdateNuSpecFiles(version);
+                
                 p.BuildReleasePackage(version);
-                p.DocxToMd();
+                
+                // Starting with the 2.8.21 release the .md documents are not anymore generated using the .docx files
+                //p.DocxToMd();
+                
                 Console.Write("Release packaging complete.");
                 Environment.ExitCode = 0;
             }
@@ -154,6 +160,12 @@ namespace ReleasePackagingTool
 
         void BuildReleasePackage(string version)
         {
+            string releasePackageDir = Path.Combine(rootPath, @"bin\Release\");
+            if (Directory.Exists(releasePackageDir) == false)
+            {
+                Directory.CreateDirectory(releasePackageDir);
+            }
+
             string releasePackagePath = Path.Combine(rootPath, @"bin\Release\redis-" + version + ".zip");
             ForceFileErase(releasePackagePath);
 
@@ -164,7 +176,8 @@ namespace ReleasePackagingTool
                 "redis-check-aof.exe",
                 "redis-check-dump.exe",
                 "redis-cli.exe",
-                "redis-server.exe"
+                "redis-server.exe",
+                "redis-server.pdb"
             };
             string documentsRoot = Path.Combine(rootPath, @"msvs\setups\documentation");
             List<string> docuementNames = new List<string>()
diff --git a/msvs/setups/chocolatey/template/Redis.nuspec.template b/msvs/setups/chocolatey/template/Redis.nuspec.template
index c44066ed..475c1c3a 100644
--- a/msvs/setups/chocolatey/template/Redis.nuspec.template
+++ b/msvs/setups/chocolatey/template/Redis.nuspec.template
@@ -4,17 +4,17 @@
     <id>redis-64</id>
     <title>redis-64</title>
     <version>CurrentRedisVersion</version>
-    <authors>Jonathan Pickett</authors>
+    <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>A production-ready Windows port of Redis, including 64-bit support, Chocolatey support, and much more.</description>
+    <description>Redis on Windows 64-bit.</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>Includes the changes from Redis 2.8.12 -> CurrentRedisVersion. Please see the release notes for the UNIX 2.8 branch to understand how this impacts Redis functionality.</releaseNotes>
+    <releaseNotes>https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md</releaseNotes>
   </metadata>
   <files>
     <file src="..\signed_binaries\*.*" target=".\" />
diff --git a/msvs/setups/nuget/template/Redis.nuspec.template b/msvs/setups/nuget/template/Redis.nuspec.template
index c44066ed..475c1c3a 100644
--- a/msvs/setups/nuget/template/Redis.nuspec.template
+++ b/msvs/setups/nuget/template/Redis.nuspec.template
@@ -4,17 +4,17 @@
     <id>redis-64</id>
     <title>redis-64</title>
     <version>CurrentRedisVersion</version>
-    <authors>Jonathan Pickett</authors>
+    <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>A production-ready Windows port of Redis, including 64-bit support, Chocolatey support, and much more.</description>
+    <description>Redis on Windows 64-bit.</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>Includes the changes from Redis 2.8.12 -> CurrentRedisVersion. Please see the release notes for the UNIX 2.8 branch to understand how this impacts Redis functionality.</releaseNotes>
+    <releaseNotes>https://raw.githubusercontent.com/MSOpenTech/redis/2.8/Redis%20on%20Windows%20Release%20Notes.md</releaseNotes>
   </metadata>
   <files>
     <file src="..\signed_binaries\*.*" target=".\" />