mirror of
https://github.com/jedisct1/libsodium.git
synced 2024-12-23 20:15:19 -07:00
Bump dev version
This commit is contained in:
parent
48a679650e
commit
9dc6b80d8c
@ -1,4 +1,4 @@
|
|||||||
version: 1.0.18.{build}
|
version: 1.0.20.{build}
|
||||||
|
|
||||||
os: Visual Studio 2019
|
os: Visual Studio 2019
|
||||||
|
|
||||||
|
@ -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.18.0"
|
#define LIBSODIUM_VERSION_STRING "1.0.20.0"
|
||||||
#define LIBSODIUM_VERSION_BIN 1,0,18,0
|
#define LIBSODIUM_VERSION_BIN 1,0,20,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,11 +4,12 @@
|
|||||||
|
|
||||||
#include "export.h"
|
#include "export.h"
|
||||||
|
|
||||||
#define SODIUM_VERSION_STRING "1.0.18"
|
#define SODIUM_VERSION_STRING "1.0.20"
|
||||||
|
|
||||||
#define SODIUM_LIBRARY_VERSION_MAJOR 11
|
#define SODIUM_LIBRARY_VERSION_MAJOR 28
|
||||||
#define SODIUM_LIBRARY_VERSION_MINOR 0
|
#define SODIUM_LIBRARY_VERSION_MINOR 0
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
AC_PREREQ([2.69])
|
AC_PREREQ([2.69])
|
||||||
AC_INIT([libsodium],[1.0.18],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org])
|
AC_INIT([libsodium],[1.0.20],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c])
|
AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c])
|
||||||
@ -12,10 +12,10 @@ AM_DEP_TRACK
|
|||||||
|
|
||||||
AC_SUBST(VERSION)
|
AC_SUBST(VERSION)
|
||||||
|
|
||||||
SODIUM_LIBRARY_VERSION_MAJOR=11
|
SODIUM_LIBRARY_VERSION_MAJOR=28
|
||||||
SODIUM_LIBRARY_VERSION_MINOR=0
|
SODIUM_LIBRARY_VERSION_MINOR=0
|
||||||
DLL_VERSION=27
|
DLL_VERSION=28
|
||||||
SODIUM_LIBRARY_VERSION=27:0:0
|
SODIUM_LIBRARY_VERSION=28:0:0
|
||||||
# | | |
|
# | | |
|
||||||
# +------+ | +---+
|
# +------+ | +---+
|
||||||
# | | |
|
# | | |
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# The x86 static library will not work due to text relocation rules, so static x86 versions are limited to shared libraries.
|
# The x86 static library will not work due to text relocation rules, so static x86 versions are limited to shared libraries.
|
||||||
# To simplify linking, library variants have distinct names: sodium, sodium-static, sodium-minimal and sodium-minimal-static.
|
# To simplify linking, library variants have distinct names: sodium, sodium-static, sodium-minimal and sodium-minimal-static.
|
||||||
|
|
||||||
SODIUM_VERSION="1.0.18.0"
|
SODIUM_VERSION="1.0.20.0"
|
||||||
NDK_VERSION=$(grep "Pkg.Revision = " <"${ANDROID_NDK_HOME}/source.properties" | cut -f 2 -d '=' | cut -f 2 -d' ' | cut -f 1 -d'.')
|
NDK_VERSION=$(grep "Pkg.Revision = " <"${ANDROID_NDK_HOME}/source.properties" | cut -f 2 -d '=' | cut -f 2 -d' ' | cut -f 1 -d'.')
|
||||||
DEST_PATH=$(mktemp -d)
|
DEST_PATH=$(mktemp -d)
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
LIBSODIUM=${LIBSODIUM:-/tmp/sodium/lib/libsodium.27.dylib}
|
LIBSODIUM=${LIBSODIUM:-/tmp/sodium/lib/libsodium.28.dylib}
|
||||||
|
|
||||||
symbols() {
|
symbols() {
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.18/ < src\libsodium\include\sodium\version.h.in > tmp
|
cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.20/ < src\libsodium\include\sodium\version.h.in > tmp
|
||||||
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/11/ < tmp > tmp2
|
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/28/ < 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@/0/ < 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
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PackageId>libsodium</PackageId>
|
<PackageId>libsodium</PackageId>
|
||||||
<Version>1.0.18.4</Version>
|
<Version>1.0.20.0</Version>
|
||||||
<Authors>Frank Denis</Authors>
|
<Authors>Frank Denis</Authors>
|
||||||
<Description>Internal implementation package not meant for direct consumption. Please do not reference directly.</Description>
|
<Description>Internal implementation package not meant for direct consumption. Please do not reference directly.</Description>
|
||||||
<Copyright>© $([System.DateTime]::UtcNow.ToString(yyyy)) Frank Denis</Copyright>
|
<Copyright>© $([System.DateTime]::UtcNow.ToString(yyyy)) Frank Denis</Copyright>
|
||||||
|
Loading…
Reference in New Issue
Block a user