From aa7ded10e7e8a02d023e4ff00cb6e272e0270920 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 28 Mar 2017 12:57:19 +0200 Subject: [PATCH] Bump package (not library) version --- .travis.yml | 2 +- builds/msvc/version.h | 2 +- configure.ac | 2 +- msvc-scripts/process.bat | 2 +- packaging/dotnet-core/README.md | 6 +++--- packaging/dotnet-core/prepare.py | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 489c2837..04acffb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ addons: coverity_scan: project: name: jedisct1/libsodium - version: 1.0.12 + version: 1.0.13 description: libsodium notification_email: coverityscan@pureftpd.org build_command_prepend: ./autogen.sh ; ./configure diff --git a/builds/msvc/version.h b/builds/msvc/version.h index cc958cc1..6bfbef90 100644 --- a/builds/msvc/version.h +++ b/builds/msvc/version.h @@ -4,7 +4,7 @@ #include "export.h" -#define SODIUM_VERSION_STRING "1.0.12" +#define SODIUM_VERSION_STRING "1.0.13" #define SODIUM_LIBRARY_VERSION_MAJOR 9 #define SODIUM_LIBRARY_VERSION_MINOR 4 diff --git a/configure.ac b/configure.ac index d017b9fb..027a075f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.65]) -AC_INIT([libsodium],[1.0.12], +AC_INIT([libsodium],[1.0.13], [https://github.com/jedisct1/libsodium/issues], [libsodium], [https://github.com/jedisct1/libsodium]) diff --git a/msvc-scripts/process.bat b/msvc-scripts/process.bat index 79a361d1..69df093d 100755 --- a/msvc-scripts/process.bat +++ b/msvc-scripts/process.bat @@ -1,4 +1,4 @@ -cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.12/ < src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.13/ < src\libsodium\include\sodium\version.h.in > tmp cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/9/ < tmp > tmp2 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/4/ < tmp2 > tmp3 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h diff --git a/packaging/dotnet-core/README.md b/packaging/dotnet-core/README.md index 66ec9703..f3454972 100644 --- a/packaging/dotnet-core/README.md +++ b/packaging/dotnet-core/README.md @@ -19,8 +19,8 @@ The metadata for the NuGet package is located in `libsodium.props`. **Making a pre-release** -1. Run `python3 prepare.py 1.0.12-preview-01` to generate the `Makefile`. - `1.0.12` is the libsodium version number; `01` is the pre-release +1. Run `python3 prepare.py 1.0.13-preview-01` to generate the `Makefile`. + `1.0.13` is the libsodium version number; `01` is the pre-release number and needs to be incremented for each pre-release. 2. Take a look at the generated `Makefile`. It uses `sudo` a few times. 3. Run `make` to download and build the binaries and create the NuGet @@ -36,6 +36,6 @@ The metadata for the NuGet package is located in `libsodium.props`. **Making a release** -1. Run `python3 prepare.py 1.0.12` to generate the `Makefile`. +1. Run `python3 prepare.py 1.0.13` to generate the `Makefile`. The remaining steps are the same. diff --git a/packaging/dotnet-core/prepare.py b/packaging/dotnet-core/prepare.py index e9f11eef..ee174513 100644 --- a/packaging/dotnet-core/prepare.py +++ b/packaging/dotnet-core/prepare.py @@ -175,10 +175,10 @@ def main(args): print(' python3 prepare.py [-preview-##]') print() print('Examples:') - print(' python3 prepare.py 1.0.12-preview-01') - print(' python3 prepare.py 1.0.12-preview-02') - print(' python3 prepare.py 1.0.12-preview-03') - print(' python3 prepare.py 1.0.12') + print(' python3 prepare.py 1.0.13-preview-01') + print(' python3 prepare.py 1.0.13-preview-02') + print(' python3 prepare.py 1.0.13-preview-03') + print(' python3 prepare.py 1.0.13') return 1 version = Version(m.group(1), m.group(2))