Changeset 1159:05f74dc19c49 in freeDiameter for libfdcore

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

Location:

libfdcore

Files:

• CMakeLists.txt (modified) (2 diffs)
• core.c (modified) (3 diffs)
• version.c (added)

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;