diff --git a/RELEASENOTES.txt b/RELEASENOTES.txt new file mode 100644 index 00000000..db79547a --- /dev/null +++ b/RELEASENOTES.txt @@ -0,0 +1,73 @@ +Redis for Windows - https://github.com/tporadowski/redis +======================================================== + +This file provides information about Windows-specific changes to Redis. +For release notes related to original Redis project - please see 00-RELEASENOTES. + +-------------------------------------------------------- + +2020-01-26: Redis 4.0.14.2 for Windows +https://github.com/tporadowski/redis/releases/tag/v4.0.14.2 + +This is a hotfix release of 4.0.14 branch that fixes #50 related to running in +Sentinel mode. + +-------------------------------------------------------- + +2020-01-15: Redis 4.0.14.1 for Windows +https://github.com/tporadowski/redis/releases/tag/v4.0.14.1 + +This is a hotfix release of 4.0.14 branch that fixes 2 Windows-specific issues: + + * #46 - added support for older Windows versions (prior Windows 8 and Windows Server 2012) + * #47 - fixed problem with parsing command-line arguments. + +-------------------------------------------------------- + +2019-08-29: Redis 4.0.14 for Windows +https://github.com/tporadowski/redis/releases/tag/v4.0.14 + +Redis 4.0.14 for Windows is a merge of Windows-specific changes from latest (unsupported) 3.2.100 release from MSOpenTech and original Redis 4.0.14. + +-------------------------------------------------------- + +2018-10-01: Redis for Windows 4.0.2.3 (alpha) + +This 4.0.2.3 release is still an alpha version, but contains enhancements and fixes for: + + * #14: decrease logging verbosity of some cluster-related messages + * #23: ZRANK/ZREVRANK bugfix (win-port only) + * failed unit tests (bdcf80e). + +-------------------------------------------------------- + +2018-03-26: Redis for Windows 4.0.2.2 (alpha) +https://github.com/tporadowski/redis/releases/tag/v4.0.2.2-alpha + +This 4.0.2.2 release is still an alpha version, but contains a fix to issue #12 +(crash when rewriting AOF file - this issue was specific to Windows port only). + +-------------------------------------------------------- + +2018-03-17: Redis for Windows 4.0.2.1 (alpha) +https://github.com/tporadowski/redis/releases/tag/v4.0.2.1-alpha + +This 4.0.2.1 release is still an alpha version, but contains a fix to issue #11, +which was related to sending back larger amounts of data to Redis clients +(this issue was specific to Windows port only). + +-------------------------------------------------------- + +2017-11-22: Redis 4.0.2 for Windows (alpha) +https://github.com/tporadowski/redis/releases/tag/v4.0.2-alpha + +Alpha version of Redis 4.0.2 for Windows. + +Redis 4.0.2 for Windows is a merge of Windows-specific changes from latest (unsupported) 3.2.100 release +from MSOpenTech and Redis 4.0.2 and this alpha release consists of: + + * all Redis 4.0.2 features except modules, + * all executables of Redis (redis-server, redis-cli, redis-benchmark, redis-check-aof, redis-check-rdb). + +Main difference to official Redis 4.0.2 (except no support for modules at the moment) is old version +of jemalloc-win dependency, which is planned to be updated to the same version in beta release. \ No newline at end of file diff --git a/license.txt b/license.txt index 1f50a9ea..84fd842a 100644 --- a/license.txt +++ b/license.txt @@ -1,5 +1,6 @@ -Copyright (c) 2006-2015, Salvatore Sanfilippo +Copyright (c) 2006-2020, Salvatore Sanfilippo Modifications copyright (c) Microsoft Open Technologies, Inc. +Modifications copyright (c) Tomasz Poradowski All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -8,4 +9,8 @@ Redistribution and use in source and binary forms, with or without modification, * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of Redis nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/msvs/ReleasePackagingTool/Program.cs b/msvs/ReleasePackagingTool/Program.cs index 019139b6..f207edbc 100644 --- a/msvs/ReleasePackagingTool/Program.cs +++ b/msvs/ReleasePackagingTool/Program.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.IO; using System.IO.Compression; using System.Reflection; +using System.Text; using System.Text.RegularExpressions; namespace ReleasePackagingTool @@ -98,9 +99,15 @@ namespace ReleasePackagingTool string documentsRoot = GetTargetPath(@"msvs\setups\documentation"); List documentNames = new List() { + "README.txt", "redis.windows.conf", "redis.windows-service.conf" }; + List releaseNotes = new List() + { + "RELEASENOTES.txt", + "00-RELEASENOTES" + }; using (ZipArchive archive = ZipFile.Open(releasePackagePath, ZipArchiveMode.Create)) { @@ -120,6 +127,10 @@ namespace ReleasePackagingTool { archive.CreateEntryFromFile(Path.Combine(documentsRoot, documentName), documentName); } + foreach (string notes in releaseNotes) + { + archive.CreateEntryFromFile(Path.Combine(rootPath, notes), notes); + } } } @@ -207,7 +218,24 @@ namespace ReleasePackagingTool } } - File.WriteAllLines(rcFilePath, rcLines, System.Text.Encoding.ASCII); + File.WriteAllLines(rcFilePath, rcLines, Encoding.ASCII); + + //update Product.wxs + var wxsPath = GetTargetPath(@"msvs\msi\RedisMsi\Product.wxs"); + var wxsLines = File.ReadAllLines(wxsPath, Encoding.UTF8); + + for (int i = 0, j = wxsLines.Length; i < j; i++) + { + var line = wxsLines[i]; + + if (line.Contains("Version=\"")) + { + wxsLines[i] = Regex.Replace(line, "\"[1-9][0-9.]+\"", $"\"{prepareNewVersion}\""); + break; + } + } + + File.WriteAllLines(wxsPath, wxsLines, Encoding.UTF8); } #endregion Private Methods diff --git a/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs b/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs index 2ff2afb1..1ce6618c 100644 --- a/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs +++ b/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs @@ -12,5 +12,16 @@ - + + + + + + + + + + + + \ No newline at end of file diff --git a/msvs/msi/RedisMsi/Product.wxs b/msvs/msi/RedisMsi/Product.wxs index d672e728..3dc5c948 100644 --- a/msvs/msi/RedisMsi/Product.wxs +++ b/msvs/msi/RedisMsi/Product.wxs @@ -1,4 +1,4 @@ - + @@ -55,8 +55,9 @@ + - + @@ -65,6 +66,7 @@ + @@ -94,4 +96,4 @@ - \ No newline at end of file + diff --git a/msvs/setups/documentation/README.txt b/msvs/setups/documentation/README.txt new file mode 100644 index 00000000..b06e115e --- /dev/null +++ b/msvs/setups/documentation/README.txt @@ -0,0 +1,19 @@ +Redis for Windows - https://github.com/tporadowski/redis +======================================================== + +This version of Redis (https://redis.io/) is an unofficial port to Windows OS +based on work contributed by Microsoft Open Technologies Inc. It is maintained +by Tomasz Poradowski (tomasz@poradowski.com, http://www.poradowski.com/en/). + +Contents of this package: +- *.exe - various Redis for Windows executables compiled for x64 platfrom, +- *.pdb - accompanying PDB files useful for debugging purposes, +- license.txt - license information (BSD-like), +- RELEASENOTES.txt - Windows-specific release notes, +- 00-RELEASENOTES - changelog of original Redis project, those changes are + ported back to this Windows version. + +For more information - please visit https://github.com/tporadowski/redis + +If you find this version of Redis useful and would like to support ongoing +development - please consider sponsoring my work at https://github.com/sponsors/tporadowski