diff --git a/csync/CMakeLists.txt b/csync/CMakeLists.txt index 49613cab0d..114f6f0308 100644 --- a/csync/CMakeLists.txt +++ b/csync/CMakeLists.txt @@ -3,13 +3,7 @@ # global needed variables set(APPLICATION_NAME "ocsync") -set(APPLICATION_VERSION_MAJOR "0") -set(APPLICATION_VERSION_MINOR "91") -set(APPLICATION_VERSION_PATCH "5") - -set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") - -set(LIBRARY_VERSION "0.2.1") +set(LIBRARY_VERSION ${MIRALL_VERSION}) set(LIBRARY_SOVERSION "0") # add definitions diff --git a/csync/src/csync.h b/csync/src/csync.h index f227c78751..e426f7eb6c 100644 --- a/csync/src/csync.h +++ b/csync/src/csync.h @@ -40,8 +40,6 @@ #include #include -#include "csync_version.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/csync/src/csync_owncloud.c b/csync/src/csync_owncloud.c index 827698291a..0a34024c3e 100644 --- a/csync/src/csync_owncloud.c +++ b/csync/src/csync_owncloud.c @@ -26,6 +26,8 @@ #include "csync_private.h" +#include "csync_version.h" + /* * helper method to build up a user text for SSL problems, called from the @@ -437,8 +439,8 @@ int dav_connect(CSYNC *csyncCtx, const char *base_url) { // Should never take more than some seconds, 30 is really a max. ne_set_connect_timeout(ctx->dav_session.ctx, 30); - snprintf( uaBuf, sizeof(uaBuf), "Mozilla/5.0 (%s) csyncoC/%s", - csync_owncloud_get_platform(), CSYNC_STRINGIFY( LIBCSYNC_VERSION )); + snprintf( uaBuf, sizeof(uaBuf), "Mozilla/5.0 (%s) mirall/%s (csyncoC)", + CSYNC_STRINGIFY( MIRALL_VERSION ), csync_owncloud_get_platform() ); ne_set_useragent( ctx->dav_session.ctx, uaBuf); ne_set_server_auth(ctx->dav_session.ctx, authentication_callback_by_neon, ctx); diff --git a/csync/src/csync_version.h.in b/csync/src/csync_version.h.in index 41a6b077ec..9471734b87 100644 --- a/csync/src/csync_version.h.in +++ b/csync/src/csync_version.h.in @@ -28,22 +28,7 @@ extern "C" { #define CSYNC_STRINGIFY(s) CSYNC_TOSTRING(s) #define CSYNC_TOSTRING(s) #s -/* csync version macros */ -#define CSYNC_VERSION_INT(a, b, c) ((a) << 16 | (b) << 8 | (c)) -#define CSYNC_VERSION_DOT(a, b, c) a ##.## b ##.## c -#define CSYNC_VERSION(a, b, c) CSYNC_VERSION_DOT(a, b, c) - -/* csync version */ -#define LIBCSYNC_VERSION_MAJOR @APPLICATION_VERSION_MAJOR@ -#define LIBCSYNC_VERSION_MINOR @APPLICATION_VERSION_MINOR@ -#define LIBCSYNC_VERSION_MICRO @APPLICATION_VERSION_PATCH@ - -#define LIBCSYNC_VERSION_INT CSYNC_VERSION_INT(LIBCSYNC_VERSION_MAJOR, \ - LIBCSYNC_VERSION_MINOR, \ - LIBCSYNC_VERSION_MICRO) -#define LIBCSYNC_VERSION CSYNC_VERSION(LIBCSYNC_VERSION_MAJOR, \ - LIBCSYNC_VERSION_MINOR, \ - LIBCSYNC_VERSION_MICRO) +#define MIRALL_VERSION @MIRALL_VERSION@ #ifdef __cplusplus }