Changeset 1159:05f74dc19c49 in freeDiameter

Timestamp:

May 31, 2013, 12:20:27 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Include source rev number in version information when available

Files:

• cmake/Modules/GetVersionWithHg.cmake (added)
• freeDiameterd/main.c (modified) (1 diff)
• include/freeDiameter/CMakeLists.txt (modified) (1 diff)
• include/freeDiameter/libfdcore.h (modified) (3 diffs)
• include/freeDiameter/libfdproto.h (modified) (1 diff)
• include/freeDiameter/version.h.in (added)
• libfdcore/CMakeLists.txt (modified) (2 diffs)
• libfdcore/core.c (modified) (3 diffs)
• libfdcore/version.c (added)
• libfdproto/CMakeLists.txt (modified) (3 diffs)
• libfdproto/version.c (added)

freeDiameterd/main.c

@@ -111 +111 @@
 static void main_version_core(void)
 {
-        printf("%s, version %d.%d.%d"
-#ifdef HG_VERSION
-                " (r%s"
-# ifdef PACKAGE_HG_REVISION
-                "/%s"
-# endif /* PACKAGE_HG_VERSION */
-                ")"
-#endif /* HG_VERSION */
-                " (libfdcore: %s)\n", 
-                FD_PROJECT_NAME, FD_PROJECT_VERSION_MAJOR, FD_PROJECT_VERSION_MINOR, FD_PROJECT_VERSION_REV
-#ifdef HG_VERSION
-                , HG_VERSION
-# ifdef PACKAGE_HG_REVISION
-                , PACKAGE_HG_REVISION
-# endif /* PACKAGE_HG_VERSION */
-#endif /* HG_VERSION */
-                , fd_core_version());
+        printf("%s, version %s\n", FD_PROJECT_NAME, fd_core_version);
 }
 

include/freeDiameter/CMakeLists.txt

@@ -187 +187 @@
 ##########################
 
+# Additional hg version when relevant, stored in version.h
+if (EXISTS "${CMAKE_SOURCE_DIR}/.hg")
+        # Search for hg binary to use
+        FIND_PROGRAM(HGCOMMAND hg)
+        if (HGCOMMAND)
+                # Ok, add the custom target so that hg is executed at every build
+                ADD_CUSTOM_TARGET(version_information
+                                   COMMAND ${CMAKE_COMMAND} -D HGCOMMAND="${HGCOMMAND}" -D SRC="${CMAKE_CURRENT_SOURCE_DIR}/version.h.in" -D DST="${CMAKE_CURRENT_BINARY_DIR}/version.h" -P "${CMAKE_SOURCE_DIR}/cmake/Modules/GetVersionWithHg.cmake"
+                                   DEPENDS "${CMAKE_SOURCE_DIR}/.hg/dirstate"
+                                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                                   COMMENT "Retrieving version of the hg repository"
+                                   )
+        else (HGCOMMAND)
+                # Display at least "unknown" rev in this case
+                SET(FD_PROJECT_VERSION_HG "unknown")
+                CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+                ADD_CUSTOM_TARGET(version_information DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+        endif(HGCOMMAND)
+else (EXISTS "${CMAKE_SOURCE_DIR}/.hg")
+        # We use the pure version number without extension
+        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+        ADD_CUSTOM_TARGET(version_information DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+endif (EXISTS "${CMAKE_SOURCE_DIR}/.hg")
+
+
+##########################
+
 # LFDPROTO_LIBS = libraries required by the libfdproto.
 SET(LFDPROTO_LIBS ${CLOCK_GETTIME_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${IDNA_LIBRARIES} PARENT_SCOPE)

include/freeDiameter/libfdcore.h

@@ -61 +61 @@
                 CHECK_PRELUDE(__call__);                                                                \
                 if (__ret__ < 0) {                                                                      \
-                        __ret__ = errno;                                                                \
-                        LOG(faillevel, "ERROR: in '%s' :\t%s",  #__call__ ,  gnutls_strerror(__ret__)); \
+                        LOG(faillevel, "TLS ERROR: in '%s' :\t%s",  #__call__ ,  gnutls_strerror(__ret__)); \
                         __fallback__;                                                                   \
                 }                                                                                       \
@@ -76 +75 @@
 #ifndef EXCLUDE_DEPRECATED
 /* Macro for transition, replace with CHECK_GNUTLS_GEN */
-#define CHECK_GNUTLS_DO( __call__, __fallback__ ) {                                                     \
-                CHECK_PRELUDE(__call__);                                                                \
-                if (__ret__ < 0) {                                                                      \
-                        __ret__ = errno;                                                                \
-                        TRACE_ERROR("ERROR: in '%s' :\t%s",  #__call__ ,  gnutls_strerror(__ret__));    \
-                        __fallback__;                                                                   \
-                }                                                                                       \
-}
+#define CHECK_GNUTLS_DO( __call__, __fallback__ )       \
+        CHECK_GNUTLS_GEN( FD_LOG_ERROR, __call__, __fallback__  )
 
 #endif /* EXCLUDE_DEPRECATED */
@@ -96 +89 @@
 int fd_core_initialize(void);
 
-/* Return a string describing the version of the library */
-const char *fd_core_version(void);
+/* A string describing the version of the library */
+extern const char fd_core_version[];
 
 /* Parse the freeDiameter.conf configuration file, load the extensions */

include/freeDiameter/libfdproto.h

@@ -123 +123 @@
 void fd_libproto_fini(void);
 
+/* Retrieve the version of the binary */
+extern const char fd_libproto_version[];
 
 /*============================================================*/

libfdcore/CMakeLists.txt

@@ -35 +35 @@
         server.c
         tcp.c
+        version.c
         )
 
@@ -53 +54 @@
 # Include path
 INCLUDE_DIRECTORIES(${LFDCORE_INCLUDES})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 # Build the executable
 ADD_LIBRARY(libfdcore SHARED ${FDCORE_SRC} ${FDCORE_GEN_SRC})
+ADD_DEPENDENCIES(libfdcore version_information)
 
 # Avoid the liblib name, and set the version

libfdcore/core.c

@@ -166 +166 @@
 /* Public interfaces */
 
-/* Return a string describing the version of the library */
-const char *fd_core_version(void)
-{
-        return _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV);
-}
-
 /* Initialize the libfdcore internals. This also initializes libfdproto */
 int fd_core_initialize(void)
@@ -189 +183 @@
         }
         
-        LOG_N("libfdproto initialized.");
-        
         /* Name this thread */
         fd_log_threadname("Main");
+        
+        LOG_N("libfdproto '%s' initialized.", fd_libproto_version);
         
         /* Initialize gcrypt and gnutls */
@@ -227 +221 @@
         core_state_set(CORE_LIBS_INIT);
         
+        LOG_N("libfdcore '%s' initialized.", fd_core_version);
+        
+        
         /* Next thing is to parse the config, leave this for a different function */
         return 0;

libfdproto/CMakeLists.txt

@@ -1 +1 @@
 # Name of the subproject
 Project("libfdproto" C)
+
 
 # List of source files for the library
@@ -18 +19 @@
         sessions.c
         utils.c
+        version.c
         )
+
 
 # Save the list of files for testcases in the core's directory
@@ -28 +31 @@
 # Build as a shared library
 ADD_LIBRARY(libfdproto SHARED ${LFDPROTO_SRC})
+
+ADD_DEPENDENCIES(libfdproto version_information)
 
 # Avoid the liblib name, and set the version