From 18e2038fbb7c385054b67e114a50db93f3a3cfb1 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 5 Dec 2017 22:23:37 +0000 Subject: [PATCH] Version bump [not released yet] --- builds/msvc/resource.rc | 4 ++-- builds/msvc/version.h | 4 ++-- configure.ac | 6 +++--- msvc-scripts/process.bat | 4 ++-- packaging/dotnet-core/README.md | 10 +++++----- packaging/dotnet-core/prepare.py | 14 +++++++------- packaging/nuget/package.config | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc index 88ae9ae7..cb30e7b1 100644 --- a/builds/msvc/resource.rc +++ b/builds/msvc/resource.rc @@ -4,8 +4,8 @@ #include "windows.h" //specify the version numbers for the dll's -#define LIBSODIUM_VERSION_STRING "1.0.15.0" -#define LIBSODIUM_VERSION_BIN 1,0,15,0 +#define LIBSODIUM_VERSION_STRING "1.0.16.0" +#define LIBSODIUM_VERSION_BIN 1,0,16,0 //specify the product name for the dlls based on the platform we are compiling for #if defined(x64) diff --git a/builds/msvc/version.h b/builds/msvc/version.h index 8b720d6c..56ec2b95 100644 --- a/builds/msvc/version.h +++ b/builds/msvc/version.h @@ -4,10 +4,10 @@ #include "export.h" -#define SODIUM_VERSION_STRING "1.0.15" +#define SODIUM_VERSION_STRING "1.0.16" #define SODIUM_LIBRARY_VERSION_MAJOR 10 -#define SODIUM_LIBRARY_VERSION_MINOR 0 +#define SODIUM_LIBRARY_VERSION_MINOR 1 #ifdef __cplusplus extern "C" { diff --git a/configure.ac b/configure.ac index 26f81d07..46936a08 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.65]) -AC_INIT([libsodium],[1.0.15], +AC_INIT([libsodium],[1.0.16], [https://github.com/jedisct1/libsodium/issues], [libsodium], [https://github.com/jedisct1/libsodium]) @@ -17,9 +17,9 @@ ISODATE=`date +%Y-%m-%d` AC_SUBST(ISODATE) SODIUM_LIBRARY_VERSION_MAJOR=10 -SODIUM_LIBRARY_VERSION_MINOR=0 +SODIUM_LIBRARY_VERSION_MINOR=1 DLL_VERSION=8 -SODIUM_LIBRARY_VERSION=23:0:0 +SODIUM_LIBRARY_VERSION=24:0:1 # | | | # +------+ | +---+ # | | | diff --git a/msvc-scripts/process.bat b/msvc-scripts/process.bat index 5f52cf3e..84c44786 100755 --- a/msvc-scripts/process.bat +++ b/msvc-scripts/process.bat @@ -1,5 +1,5 @@ -cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.15/ < src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.16/ < src\libsodium\include\sodium\version.h.in > tmp cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/10/ < tmp > tmp2 -cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/0/ < tmp2 > tmp3 +cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/1/ < tmp2 > tmp3 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h del tmp tmp2 tmp3 diff --git a/packaging/dotnet-core/README.md b/packaging/dotnet-core/README.md index e4cfeee2..0521ce3c 100644 --- a/packaging/dotnet-core/README.md +++ b/packaging/dotnet-core/README.md @@ -31,15 +31,15 @@ Version numbers for the packages for .NET Core consist of three components: It may be necessary to release more than one package for a libsodium version, e.g., when adding support for a new platform or if a release contains a broken binary. In this case, a package revision number is added as a fourth part to - the libsodium version, starting at `1`. For example, `1.0.15` is the initial - release of the package for libsodium 1.0.15 and `1.0.15.5` is the fifth + the libsodium version, starting at `1`. For example, `1.0.16` is the initial + release of the package for libsodium 1.0.16 and `1.0.16.5` is the fifth revision (sixth release) of that package. * *pre-release label* If a package is a pre-release, a label is appended to the version number in `-preview-##` format where `##` is the number of the pre-release, starting at - `01`. For example, `1.0.15-preview-01` is the first pre-release of the package - for libsodium 1.0.15 and `1.0.15.5-preview-02` the second pre-release of the - fifth revision of the package for libsodium 1.0.15. + `01`. For example, `1.0.16-preview-01` is the first pre-release of the package + for libsodium 1.0.16 and `1.0.16.5-preview-02` the second pre-release of the + fifth revision of the package for libsodium 1.0.16. **Making a release** diff --git a/packaging/dotnet-core/prepare.py b/packaging/dotnet-core/prepare.py index c1248734..50e6e7fa 100755 --- a/packaging/dotnet-core/prepare.py +++ b/packaging/dotnet-core/prepare.py @@ -170,13 +170,13 @@ def main(args): print(' python3 prepare.py ') print() print('Examples:') - print(' python3 prepare.py 1.0.15-preview-01') - print(' python3 prepare.py 1.0.15-preview-02') - print(' python3 prepare.py 1.0.15-preview-03') - print(' python3 prepare.py 1.0.15') - print(' python3 prepare.py 1.0.15.1-preview-01') - print(' python3 prepare.py 1.0.15.1') - print(' python3 prepare.py 1.0.15.2') + print(' python3 prepare.py 1.0.16-preview-01') + print(' python3 prepare.py 1.0.16-preview-02') + print(' python3 prepare.py 1.0.16-preview-03') + print(' python3 prepare.py 1.0.16') + print(' python3 prepare.py 1.0.16.1-preview-01') + print(' python3 prepare.py 1.0.16.1') + print(' python3 prepare.py 1.0.16.2') return 1 version = Version(m.group(2), m.group(0)) diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index 2a297134..ffac6538 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,4 +1,4 @@ - +