generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-15 15:16:51 +02:00
Code Issues Projects Releases Wiki Activity

Renamed the last digit of version string from RELEASE to REVISION.

Browse Source 
Added REVISION macro and getting API.
This commit is contained in:
Takatoshi Kondo
2014-09-03 13:26:34 +09:00
parent 93d0f0bd00
commit 86ad026f11
7 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -6,9 +6,9 @@ STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${
SET (VERSION_MAJOR ${CMAKE_MATCH_1}) SET (VERSION_MAJOR ${CMAKE_MATCH_1})
STRING (REGEX MATCH "#define MSGPACK_VERSION_MINOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents}) STRING (REGEX MATCH "#define MSGPACK_VERSION_MINOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
SET (VERSION_MINOR ${CMAKE_MATCH_1}) SET (VERSION_MINOR ${CMAKE_MATCH_1})
STRING (REGEX MATCH "#define MSGPACK_VERSION_RELEASE *([0-9a-zA-Z_]*)" NULL_OUT ${contents}) STRING (REGEX MATCH "#define MSGPACK_VERSION_REVISION *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
SET (VERSION_RELEASE ${CMAKE_MATCH_1}) SET (VERSION_REVISION ${CMAKE_MATCH_1})
SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION})
SET (prefix ${CMAKE_INSTALL_PREFIX}) SET (prefix ${CMAKE_INSTALL_PREFIX})
SET (exec_prefix "\${prefix}") SET (exec_prefix "\${prefix}")

6
configure.in
View File

@@ -1,4 +1,4 @@
AC_INIT(msgpack, m4_esyscmd([cat include/msgpack/version_master.h | tr -d "\n" | sed -e 's/#define MSGPACK_VERSION_MAJOR\s*\(\w*\)/\1./g' -e 's/#define MSGPACK_VERSION_MINOR\s*\(\w*\)/\1./g' -e 's/#define MSGPACK_VERSION_RELEASE\s*\(\w*\)/\1/g'])) AC_INIT(msgpack, m4_esyscmd([cat include/msgpack/version_master.h | tr -d "\n" | sed -e 's/#define MSGPACK_VERSION_MAJOR\s*\(\w*\)/\1./g' -e 's/#define MSGPACK_VERSION_MINOR\s*\(\w*\)/\1./g' -e 's/#define MSGPACK_VERSION_REVISION\s*\(\w*\)/\1/g']))
AC_CONFIG_AUX_DIR(ac) AC_CONFIG_AUX_DIR(ac)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@@ -86,10 +86,10 @@ AM_CONDITIONAL(ENABLE_GCC_CXX_ATOMIC, test "$enable_gcc_cxx_atomic" = "yes")
major=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\1/'` major=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
minor=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\2/'` minor=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
release=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\3/'` revision=`echo $VERSION | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
AC_SUBST(VERSION_MAJOR, $major) AC_SUBST(VERSION_MAJOR, $major)
AC_SUBST(VERSION_MINOR, $minor) AC_SUBST(VERSION_MINOR, $minor)
AC_SUBST(VERSION_RELEASE, $release) AC_SUBST(VERSION_REVISION, $revision)
AC_OUTPUT([Makefile AC_OUTPUT([Makefile

4
include/msgpack/version.h
View File

@@ -30,9 +30,9 @@ int msgpack_version_minor(void);
#include "version_master.h" #include "version_master.h"
#define MSGPACK_STR(v) #v #define MSGPACK_STR(v) #v
#define MSGPACK_VERSION_I(maj, min, rel) MSGPACK_STR(maj) "." MSGPACK_STR(min) "." MSGPACK_STR(rel) #define MSGPACK_VERSION_I(maj, min, rev) MSGPACK_STR(maj) "." MSGPACK_STR(min) "." MSGPACK_STR(rev)
#define MSGPACK_VERSION MSGPACK_VERSION_I(MSGPACK_VERSION_MAJOR, MSGPACK_VERSION_MINOR, MSGPACK_VERSION_RELEASE) #define MSGPACK_VERSION MSGPACK_VERSION_I(MSGPACK_VERSION_MAJOR, MSGPACK_VERSION_MINOR, MSGPACK_VERSION_REVISION)
#ifdef __cplusplus #ifdef __cplusplus
} }

8
include/msgpack/version.hpp
View File

@@ -21,9 +21,9 @@
#include "version_master.h" #include "version_master.h"
#define MSGPACK_STR(v) #v #define MSGPACK_STR(v) #v
#define MSGPACK_VERSION_I(maj, min, rel) MSGPACK_STR(maj) "." MSGPACK_STR(min) "." MSGPACK_STR(rel) #define MSGPACK_VERSION_I(maj, min, rev) MSGPACK_STR(maj) "." MSGPACK_STR(min) "." MSGPACK_STR(rev)
#define MSGPACK_VERSION MSGPACK_VERSION_I(MSGPACK_VERSION_MAJOR, MSGPACK_VERSION_MINOR, MSGPACK_VERSION_RELEASE) #define MSGPACK_VERSION MSGPACK_VERSION_I(MSGPACK_VERSION_MAJOR, MSGPACK_VERSION_MINOR, MSGPACK_VERSION_REVISION)
inline const char* msgpack_version(void) { inline const char* msgpack_version(void) {
return MSGPACK_VERSION; return MSGPACK_VERSION;
@@ -37,4 +37,8 @@ inline int msgpack_version_minor(void) {
return MSGPACK_VERSION_MINOR; return MSGPACK_VERSION_MINOR;
} }
inline int msgpack_version_revision(void) {
return MSGPACK_VERSION_REVISION;
}
#endif /* msgpack/version.hpp */ #endif /* msgpack/version.hpp */

6
include/msgpack/version_master.h
View File

@@ -1,3 +1,3 @@
#define MSGPACK_VERSION_MAJOR 0 #define MSGPACK_VERSION_MAJOR 0
#define MSGPACK_VERSION_MINOR 6 #define MSGPACK_VERSION_MINOR 6
#define MSGPACK_VERSION_RELEASE 0 #define MSGPACK_VERSION_REVISION 0

5
src/version.c
View File

@@ -15,3 +15,8 @@ int msgpack_version_minor(void)
return MSGPACK_VERSION_MINOR; return MSGPACK_VERSION_MINOR;
} }
int msgpack_version_revision(void)
{
return MSGPACK_VERSION_REVISION;
}

15
test/version.cpp
View File

@@ -3,11 +3,12 @@
TEST(version, print) TEST(version, print)
{ {
printf("MSGPACK_VERSION : %s\n", MSGPACK_VERSION); printf("MSGPACK_VERSION : %s\n", MSGPACK_VERSION);
printf("MSGPACK_VERSION_MAJOR : %d\n", MSGPACK_VERSION_MAJOR); printf("MSGPACK_VERSION_MAJOR : %d\n", MSGPACK_VERSION_MAJOR);
printf("MSGPACK_VERSION_MINOR : %d\n", MSGPACK_VERSION_MINOR); printf("MSGPACK_VERSION_MINOR : %d\n", MSGPACK_VERSION_MINOR);
printf("msgpack_version() : %s\n", msgpack_version()); printf("MSGPACK_VERSION_REVISION : %d\n", MSGPACK_VERSION_REVISION);
printf("msgpack_version_major() : %d\n", msgpack_version_major()); printf("msgpack_version() : %s\n", msgpack_version());
printf("msgpack_version_minor() : %d\n", msgpack_version_minor()); printf("msgpack_version_major() : %d\n", msgpack_version_major());
printf("msgpack_version_minor() : %d\n", msgpack_version_minor());
printf("msgpack_version_revision() : %d\n", msgpack_version_revision());
} }