cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version bump [not released yet]

Browse Source
This commit is contained in:
Frank Denis 2017-12-05 22:23:37 +00:00
parent a4c7d9729d
commit 18e2038fbb
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/msvc/resource.rc
View File

@ -4,8 +4,8 @@
#include "windows.h" #include "windows.h"
//specify the version numbers for the dll's //specify the version numbers for the dll's
#define LIBSODIUM_VERSION_STRING "1.0.15.0" #define LIBSODIUM_VERSION_STRING "1.0.16.0"
#define LIBSODIUM_VERSION_BIN 1,0,15,0 #define LIBSODIUM_VERSION_BIN 1,0,16,0
//specify the product name for the dlls based on the platform we are compiling for //specify the product name for the dlls based on the platform we are compiling for
#if defined(x64) #if defined(x64)

4
builds/msvc/version.h
View File

@ -4,10 +4,10 @@
#include "export.h" #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_MAJOR 10
#define SODIUM_LIBRARY_VERSION_MINOR 0 #define SODIUM_LIBRARY_VERSION_MINOR 1
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.65]) AC_PREREQ([2.65])
AC_INIT([libsodium],[1.0.15], AC_INIT([libsodium],[1.0.16],
[https://github.com/jedisct1/libsodium/issues], [https://github.com/jedisct1/libsodium/issues],
[libsodium], [libsodium],
[https://github.com/jedisct1/libsodium]) [https://github.com/jedisct1/libsodium])
@ -17,9 +17,9 @@ ISODATE=`date +%Y-%m-%d`
AC_SUBST(ISODATE) AC_SUBST(ISODATE)
SODIUM_LIBRARY_VERSION_MAJOR=10 SODIUM_LIBRARY_VERSION_MAJOR=10
SODIUM_LIBRARY_VERSION_MINOR=0 SODIUM_LIBRARY_VERSION_MINOR=1
DLL_VERSION=8 DLL_VERSION=8
SODIUM_LIBRARY_VERSION=23:0:0 SODIUM_LIBRARY_VERSION=24:0:1
# | | | # | | |
# +------+ | +---+ # +------+ | +---+
# | | | # | | |

4
msvc-scripts/process.bat
View File

@ -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_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 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h
del tmp tmp2 tmp3 del tmp tmp2 tmp3

10
packaging/dotnet-core/README.md
View File

@ -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, 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 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 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 the libsodium version, starting at `1`. For example, `1.0.16` is the initial
release of the package for libsodium 1.0.15 and `1.0.15.5` is the fifth release of the package for libsodium 1.0.16 and `1.0.16.5` is the fifth
revision (sixth release) of that package. revision (sixth release) of that package.
* *pre-release label* * *pre-release label*
If a package is a pre-release, a label is appended to the version number in 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 `-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 `01`. For example, `1.0.16-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 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.15. fifth revision of the package for libsodium 1.0.16.
**Making a release** **Making a release**

14
packaging/dotnet-core/prepare.py
View File

@ -170,13 +170,13 @@ def main(args):
print(' python3 prepare.py <version>') print(' python3 prepare.py <version>')
print() print()
print('Examples:') print('Examples:')
print(' python3 prepare.py 1.0.15-preview-01') print(' python3 prepare.py 1.0.16-preview-01')
print(' python3 prepare.py 1.0.15-preview-02') print(' python3 prepare.py 1.0.16-preview-02')
print(' python3 prepare.py 1.0.15-preview-03') print(' python3 prepare.py 1.0.16-preview-03')
print(' python3 prepare.py 1.0.15') print(' python3 prepare.py 1.0.16')
print(' python3 prepare.py 1.0.15.1-preview-01') print(' python3 prepare.py 1.0.16.1-preview-01')
print(' python3 prepare.py 1.0.15.1') print(' python3 prepare.py 1.0.16.1')
print(' python3 prepare.py 1.0.15.2') print(' python3 prepare.py 1.0.16.2')
return 1 return 1
version = Version(m.group(2), m.group(0)) version = Version(m.group(2), m.group(0))

2
packaging/nuget/package.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- These values are populated into the package.gsl templates by package.bat. --> <!-- These values are populated into the package.gsl templates by package.bat. -->
<!-- The target attribute controls path and file name only, id controls package naming. --> <!-- The target attribute controls path and file name only, id controls package naming. -->
<package id="libsodium_vc120" target="libsodium" version = "1.0.15.0" pathversion="1_0_15_0" platformtoolset="v120" /> <package id="libsodium_vc120" target="libsodium" version = "1.0.16.0" pathversion="1_0_16_0" platformtoolset="v120" />