diff --git a/CMakeLists.txt b/CMakeLists.txt index e6b4c0b46a..7ef6fa4cac 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ include(utils) set(PKG_VERSION_GIT_TAG_PREFIX "rdc_pkg_ver") # Provide git to utilities find_program(GIT NAMES git) -get_version_from_tag("1.1.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) +get_version_from_tag("1.2.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) # VERSION_* variables should be set by get_version_from_tag message("Package version: ${VERSION_STRING}") diff --git a/rdc_libs/CMakeLists.txt b/rdc_libs/CMakeLists.txt index e89c4e03b5..136c3cfd05 100755 --- a/rdc_libs/CMakeLists.txt +++ b/rdc_libs/CMakeLists.txt @@ -58,7 +58,7 @@ find_program(GIT NAMES git) # Debian package specific variables # Set a default value for the package version -get_version_from_tag("1.1.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) +get_version_from_tag("1.2.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT) # VERSION_* variables should be set by get_version_from_tag set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}") diff --git a/rdci/src/rdci.cc b/rdci/src/rdci.cc index 2228ed025e..65ac82ca7a 100644 --- a/rdci/src/rdci.cc +++ b/rdci/src/rdci.cc @@ -32,16 +32,16 @@ THE SOFTWARE. #include "RdciFieldGroupSubSystem.h" #include "RdciGroupSubSystem.h" #include "RdciHealthSubSystem.h" -#include "RdciTopologyLinkSubSystem.h" #include "RdciPolicySubSystem.h" #include "RdciStatsSubSystem.h" +#include "RdciTopologyLinkSubSystem.h" #include "RdciXgmiLinkStatusSubSystem.h" #include "rdc/rdc.h" #include "rdc_lib/RdcException.h" #include "rdc_lib/rdc_common.h" #define RDC_CLIENT_VERSION_MAJOR 1 -#define RDC_CLIENT_VERSION_MINOR 1 +#define RDC_CLIENT_VERSION_MINOR 2 #define RDC_CLIENT_VERSION_RELEASE 0 #define RDC_CLIENT_VERSION_CREATE_STRING(MAJOR, MINOR, RELEASE) (#MAJOR "." #MINOR "." #RELEASE) @@ -58,7 +58,8 @@ int main(int argc, char** argv) { const std::string usage_help = "Usage:\trdci |\n" "subsystem: \n" - " discovery, dmon, group, fieldgroup, stats, diag, config, policy, health, topo, link\n" + " discovery, dmon, group, fieldgroup, stats, diag, config, policy, health, topo, " + "link\n" "options: \n" " -v(--version) : Print client version information only\n"; diff --git a/server/include/rdc/rdc_server_main.h b/server/include/rdc/rdc_server_main.h index 2a0859ca28..75e58b7dd9 100644 --- a/server/include/rdc/rdc_server_main.h +++ b/server/include/rdc/rdc_server_main.h @@ -31,12 +31,15 @@ THE SOFTWARE. #include "rdc/rdc_api_service.h" #define RDC_SERVER_VERSION_MAJOR 1 -#define RDC_SERVER_VERSION_MINOR 1 +#define RDC_SERVER_VERSION_MINOR 2 #define RDC_SERVER_VERSION_RELEASE 0 #define RDC_SERVER_VERSION_CREATE_STRING(MAJOR, MINOR, RELEASE) (#MAJOR "." #MINOR "." #RELEASE) -#define RDC_SERVER_VERSION_EXPAND_PARTS(MAJOR_STR, MINOR_STR, RELEASE_STR) RDC_SERVER_VERSION_CREATE_STRING(MAJOR_STR, MINOR_STR, RELEASE_STR) -#define RDC_SERVER_VERSION_STRING RDC_SERVER_VERSION_EXPAND_PARTS(RDC_SERVER_VERSION_MAJOR, RDC_SERVER_VERSION_MINOR, RDC_SERVER_VERSION_RELEASE) +#define RDC_SERVER_VERSION_EXPAND_PARTS(MAJOR_STR, MINOR_STR, RELEASE_STR) \ + RDC_SERVER_VERSION_CREATE_STRING(MAJOR_STR, MINOR_STR, RELEASE_STR) +#define RDC_SERVER_VERSION_STRING \ + RDC_SERVER_VERSION_EXPAND_PARTS(RDC_SERVER_VERSION_MAJOR, RDC_SERVER_VERSION_MINOR, \ + RDC_SERVER_VERSION_RELEASE) #define Q(x) #x #define QUOTE(x) Q(x)