From 51139a080c982a6460aa25975b3a1e0866f518ed Mon Sep 17 00:00:00 2001 From: "Gregory Mullen (grayhatter)" Date: Sat, 24 Sep 2016 16:26:35 -0700 Subject: v0.0.0 => v0.0.1 --- CMakeLists.txt | 2 +- configure.ac | 5 ++- other/apidsl/tox.in.h | 2 +- other/apidsl/toxav.in.h | 67 ------------------------------------- toxav/toxav.c | 24 ------------- toxav/toxav.h | 68 ------------------------------------- toxcore/tox.h | 2 +- toxencryptsave/toxencryptsave.c | 24 ------------- toxencryptsave/toxencryptsave.h | 74 ----------------------------------------- 9 files changed, 5 insertions(+), 263 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbb9a014..a65716e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ include(CTest) # This version is for the entire project. All libraries (core, av, ...) move in # versions in a synchronised way. -set(PROJECT_VERSION "0.0.0") +set(PROJECT_VERSION "0.0.1") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) diff --git a/configure.ac b/configure.ac index 64eb4b5e..1496ba84 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) -AC_INIT([tox], [0.0.0]) +AC_INIT([tox], [0.0.1]) AC_CONFIG_AUX_DIR(configure_aux) AC_CONFIG_SRCDIR([toxcore/net_crypto.c]) AC_CONFIG_HEADERS([config.h]) @@ -13,7 +13,6 @@ AC_CONFIG_MACRO_DIR([m4]) EXTRA_LT_LDFLAGS= LIBTOXCORE_LT_VERSION=0:0:0 -LIBTOXAV_LT_VERSION=0:0:0 dnl dnl current:revision:age dnl @@ -44,7 +43,7 @@ WANT_NACL="no" ADD_NACL_OBJECTS_TO_PKGCONFIG="yes" TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION" -TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION" +TOXAV_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION" AC_ARG_ENABLE([soname-versions], [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)]) ], diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h index dfc658d5..91cd0eb8 100644 --- a/other/apidsl/tox.in.h +++ b/other/apidsl/tox.in.h @@ -179,7 +179,7 @@ const VERSION_MINOR = 0; * The patch or revision number. Incremented when bugfixes are applied without * changing any functionality or API or ABI. */ -const VERSION_PATCH = 0; +const VERSION_PATCH = 1; /** * A macro to check at preprocessing time whether the client code is compatible diff --git a/other/apidsl/toxav.in.h b/other/apidsl/toxav.in.h index 8a7d5358..07808eec 100644 --- a/other/apidsl/toxav.in.h +++ b/other/apidsl/toxav.in.h @@ -93,73 +93,6 @@ class toxAV { */ struct this; - -/******************************************************************************* - * - * :: API version - * - ******************************************************************************/ - - -/** - * The major version number. Incremented when the API or ABI changes in an - * incompatible way. - * - * The function variants of these constants return the version number of the - * library. They can be used to display the Tox library version or to check - * whether the client is compatible with the dynamically linked version of Tox. - */ -const VERSION_MAJOR = 0; - -/** - * The minor version number. Incremented when functionality is added without - * breaking the API or ABI. Set to 0 when the major version number is - * incremented. - */ -const VERSION_MINOR = 0; - -/** - * The patch or revision number. Incremented when bugfixes are applied without - * changing any functionality or API or ABI. - */ -const VERSION_PATCH = 0; - -/** - * A macro to check at preprocessing time whether the client code is compatible - * with the installed version of ToxAV. - */ -#define TOXAV_VERSION_IS_API_COMPATIBLE(MAJOR, MINOR, PATCH) \ - (TOXAV_VERSION_MAJOR == MAJOR && \ - (TOXAV_VERSION_MINOR > MINOR || \ - (TOXAV_VERSION_MINOR == MINOR && \ - TOXAV_VERSION_PATCH >= PATCH))) - -/** - * A macro to make compilation fail if the client code is not compatible with - * the installed version of ToxAV. - */ -#define TOXAV_VERSION_REQUIRE(MAJOR, MINOR, PATCH) \ - typedef char toxav_required_version[TOXAV_IS_COMPATIBLE(MAJOR, MINOR, PATCH) ? 1 : -1] - -/** - * A convenience macro to call ${version.is_compatible} with the currently - * compiling API version. - */ -#define TOXAV_VERSION_IS_ABI_COMPATIBLE() \ - toxav_version_is_compatible(TOXAV_VERSION_MAJOR, TOXAV_VERSION_MINOR, TOXAV_VERSION_PATCH) - - -static namespace version { - - /** - * Return whether the compiled library version is compatible with the passed - * version numbers. - */ - bool is_compatible(uint32_t major, uint32_t minor, uint32_t patch); - -} - - /******************************************************************************* * * :: Creation and destruction diff --git a/toxav/toxav.c b/toxav/toxav.c index a5314d23..c0f64648 100644 --- a/toxav/toxav.c +++ b/toxav/toxav.c @@ -106,30 +106,6 @@ ToxAVCall *call_remove(ToxAVCall *call); bool call_prepare_transmission(ToxAVCall *call); void call_kill_transmission(ToxAVCall *call); -uint32_t toxav_version_major(void) -{ - return TOXAV_VERSION_MAJOR; -} - -uint32_t toxav_version_minor(void) -{ - return TOXAV_VERSION_MINOR; -} - -uint32_t toxav_version_patch(void) -{ - return TOXAV_VERSION_PATCH; -} - -bool toxav_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch) -{ - return (TOXAV_VERSION_MAJOR == major && /* Force the major version */ - (TOXAV_VERSION_MINOR > minor || /* Current minor version must be newer than requested -- or -- */ - (TOXAV_VERSION_MINOR == minor && TOXAV_VERSION_PATCH >= patch) /* the patch must be the same or newer */ - ) - ); -} - ToxAV *toxav_new(Tox *tox, TOXAV_ERR_NEW *error) { TOXAV_ERR_NEW rc = TOXAV_ERR_NEW_OK; diff --git a/toxav/toxav.h b/toxav/toxav.h index 38ba354e..298dbbd0 100644 --- a/toxav/toxav.h +++ b/toxav/toxav.h @@ -91,74 +91,6 @@ typedef struct ToxAV ToxAV; #endif /* TOXAV_DEFINED */ -/******************************************************************************* - * - * :: API version - * - ******************************************************************************/ - - - -/** - * The major version number. Incremented when the API or ABI changes in an - * incompatible way. - * - * The function variants of these constants return the version number of the - * library. They can be used to display the Tox library version or to check - * whether the client is compatible with the dynamically linked version of Tox. - */ -#define TOXAV_VERSION_MAJOR 0 - -uint32_t toxav_version_major(void); - -/** - * The minor version number. Incremented when functionality is added without - * breaking the API or ABI. Set to 0 when the major version number is - * incremented. - */ -#define TOXAV_VERSION_MINOR 0 - -uint32_t toxav_version_minor(void); - -/** - * The patch or revision number. Incremented when bugfixes are applied without - * changing any functionality or API or ABI. - */ -#define TOXAV_VERSION_PATCH 0 - -uint32_t toxav_version_patch(void); - -/** - * A macro to check at preprocessing time whether the client code is compatible - * with the installed version of ToxAV. - */ -#define TOXAV_VERSION_IS_API_COMPATIBLE(MAJOR, MINOR, PATCH) \ - (TOXAV_VERSION_MAJOR == MAJOR && \ - (TOXAV_VERSION_MINOR > MINOR || \ - (TOXAV_VERSION_MINOR == MINOR && \ - TOXAV_VERSION_PATCH >= PATCH))) - -/** - * A macro to make compilation fail if the client code is not compatible with - * the installed version of ToxAV. - */ -#define TOXAV_VERSION_REQUIRE(MAJOR, MINOR, PATCH) \ - typedef char toxav_required_version[TOXAV_IS_COMPATIBLE(MAJOR, MINOR, PATCH) ? 1 : -1] - -/** - * A convenience macro to call toxav_version_is_compatible with the currently - * compiling API version. - */ -#define TOXAV_VERSION_IS_ABI_COMPATIBLE() \ - toxav_version_is_compatible(TOXAV_VERSION_MAJOR, TOXAV_VERSION_MINOR, TOXAV_VERSION_PATCH) - -/** - * Return whether the compiled library version is compatible with the passed - * version numbers. - */ -bool toxav_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch); - - /******************************************************************************* * * :: Creation and destruction diff --git a/toxcore/tox.h b/toxcore/tox.h index ecb21ae2..49710e8a 100644 --- a/toxcore/tox.h +++ b/toxcore/tox.h @@ -180,7 +180,7 @@ uint32_t tox_version_minor(void); * The patch or revision number. Incremented when bugfixes are applied without * changing any functionality or API or ABI. */ -#define TOX_VERSION_PATCH 0 +#define TOX_VERSION_PATCH 1 uint32_t tox_version_patch(void); diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c index 69e5c0f3..a6a75b0d 100644 --- a/toxencryptsave/toxencryptsave.c +++ b/toxencryptsave/toxencryptsave.c @@ -47,30 +47,6 @@ #error TOX_PASS_ENCRYPTION_EXTRA_LENGTH is assumed to be equal to (crypto_box_MACBYTES + crypto_box_NONCEBYTES + crypto_pwhash_scryptsalsa208sha256_SALTBYTES + TOX_ENC_SAVE_MAGIC_LENGTH) #endif -uint32_t toxes_version_major(void) -{ - return TOXES_VERSION_MAJOR; -} - -uint32_t toxes_version_minor(void) -{ - return TOXES_VERSION_MINOR; -} - -uint32_t toxes_version_patch(void) -{ - return TOXES_VERSION_PATCH; -} - -bool toxes_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch) -{ - return (TOXES_VERSION_MAJOR == major && /* Force the major version */ - (TOXES_VERSION_MINOR > minor || /* Current minor version must be newer than requested -- or -- */ - (TOXES_VERSION_MINOR == minor && TOXES_VERSION_PATCH >= patch) /* the patch must be the same or newer */ - ) - ); -} - /* Clients should consider alerting their users that, unlike plain data, if even one bit * becomes corrupted, the data will be entirely unrecoverable. * Ditto if they forget their password, there is no way to recover the data. diff --git a/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h index 6451f3f5..a6537fad 100644 --- a/toxencryptsave/toxencryptsave.h +++ b/toxencryptsave/toxencryptsave.h @@ -49,80 +49,6 @@ struct Tox_Options; #define TOXES_DEFINED #endif /* TOXES_DEFINED */ - -/******************************************************************************* - * - * :: API version - * - ******************************************************************************/ -/** - * The major version number. Incremented when the API or ABI changes in an - * incompatible way. - */ -#define TOXES_VERSION_MAJOR 0u - -/** - * The minor version number. Incremented when functionality is added without - * breaking the API or ABI. Set to 0 when the major version number is - * incremented. - */ -#define TOXES_VERSION_MINOR 0u - -/** - * The patch or revision number. Incremented when bugfixes are applied without - * changing any functionality or API or ABI. - */ -#define TOXES_VERSION_PATCH 0u - -/** - * A macro to check at preprocessing time whether the client code is compatible - * with the installed version of ToxAV. - */ -#define TOXES_VERSION_IS_API_COMPATIBLE(MAJOR, MINOR, PATCH) \ - (TOXES_VERSION_MAJOR == MAJOR && \ - (TOXES_VERSION_MINOR > MINOR || \ - (TOXES_VERSION_MINOR == MINOR && \ - TOXES_VERSION_PATCH >= PATCH))) - -/** - * A macro to make compilation fail if the client code is not compatible with - * the installed version of ToxAV. - */ -#define TOXES_VERSION_REQUIRE(MAJOR, MINOR, PATCH) \ - typedef char toxes_required_version[TOXES_IS_COMPATIBLE(MAJOR, MINOR, PATCH) ? 1 : -1] - -/** - * A convenience macro to call toxES_version_is_compatible with the currently - * compiling API version. - */ -#define TOXES_VERSION_IS_ABI_COMPATIBLE() \ - toxes_version_is_compatible(TOXES_VERSION_MAJOR, TOXES_VERSION_MINOR, TOXES_VERSION_PATCH) - -/** - * Return the major version number of the library. Can be used to display the - * ToxAV library version or to check whether the client is compatible with the - * dynamically linked version of ToxAV. - */ -uint32_t toxes_version_major(void); - -/** - * Return the minor version number of the library. - */ -uint32_t toxes_version_minor(void); - -/** - * Return the patch number of the library. - */ -uint32_t toxes_version_patch(void); - -/** - * Return whether the compiled library version is compatible with the passed - * version numbers. - */ -bool toxes_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch); - - - /* This module is conceptually organized into two parts. The first part are the functions * with "key" in the name. To use these functions, first derive an encryption key * from a password with tox_derive_key_from_pass, and use the returned key to -- cgit v1.2.3