From f9872723efc831827d179c3baf5b9f6c428512c4 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Thu, 22 Oct 2020 12:08:34 +0200
Subject: [BUILD] add CMake targets to build binary and source packages with
 CPack

This patch adds the following CMake targets

  - package
  - source

to build bundeled packages. Those packages contain either all built
binary artifacts or all source files for source code distribution. Both
CMake targets are available in Release build configuration.
---
 src/server/CMakeLists.txt | 5 +++--
 src/server/rpc.c          | 5 +++--
 src/server/server.c       | 9 +++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/server')

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index aa981f6..de2a550 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -54,7 +54,7 @@ add_executable(dnbd3-server ${CMAKE_CURRENT_SOURCE_DIR}/altservers.c
                             ${CMAKE_CURRENT_SOURCE_DIR}/uplink.c
                             ${CMAKE_CURRENT_SOURCE_DIR}/urldecode.c)
 target_include_directories(dnbd3-server PRIVATE ${JANSSON_INCLUDE_DIR})
-target_link_libraries(dnbd3-server dnbd3-version dnbd3-shared ${CMAKE_THREAD_LIBS_INIT} ${JANSSON_LIBRARIES})
+target_link_libraries(dnbd3-server dnbd3-version dnbd3-build dnbd3-shared ${CMAKE_THREAD_LIBS_INIT} ${JANSSON_LIBRARIES})
 
 if(DNBD3_SERVER_FUSE)
     # include Fuse headers and link with Fuse library
@@ -78,4 +78,5 @@ if(DNBD3_SERVER_DEBUG_THREADS)
     target_compile_options(dnbd3-server DNBD3_SERVER_DEBUG_THREADS)
 endif(DNBD3_SERVER_DEBUG_THREADS)
 
-install(TARGETS dnbd3-server RUNTIME DESTINATION bin)
+install(TARGETS dnbd3-server RUNTIME DESTINATION bin
+        COMPONENT server)
diff --git a/src/server/rpc.c b/src/server/rpc.c
index c8da951..f2877fa 100644
--- a/src/server/rpc.c
+++ b/src/server/rpc.c
@@ -7,6 +7,7 @@
 #include "altservers.h"
 #include <dnbd3/shared/sockhelper.h>
 #include <dnbd3/version.h>
+#include <dnbd3/build.h>
 #include "fileutil.h"
 #include "picohttpparser/picohttpparser.h"
 #include "urldecode.h"
@@ -311,8 +312,8 @@ static bool handleStatus(int sock, int permissions, struct field *fields, size_t
 				"runId", randomRunId );
 	}
 	if ( version ) {
-		json_object_set_new( statisticsJson, "version", json_string( DNBD3_BUILD_VERSION ) );
-		json_object_set_new( statisticsJson, "build", json_string( DNBD3_BUILD_TYPE ) );
+		json_object_set_new( statisticsJson, "version", json_string( DNBD3_VERSION ) );
+		json_object_set_new( statisticsJson, "build", json_string( DNBD3_BUILD ) );
 	}
 	if ( space ) {
 		uint64_t spaceTotal = 0, spaceAvail = 0;
diff --git a/src/server/server.c b/src/server/server.c
index 0ee51c4..c9a0a92 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -32,6 +32,7 @@
 #include "fuse.h"
 
 #include <dnbd3/version.h>
+#include <dnbd3/build.h>
 #include <dnbd3/shared/sockhelper.h>
 #include <dnbd3/shared/timing.h>
 
@@ -105,7 +106,7 @@ static void queueJobInternal(job_t *job);
  */
 void dnbd3_printHelp(char *argv_0)
 {
-	printf( "Version: %s\n\n", DNBD3_BUILD_VERSION );
+	printf( "Version: %s\n\n", DNBD3_VERSION );
 	printf( "Usage: %s [OPTIONS]...\n", argv_0 );
 	printf( "Start the DNBD3 server\n" );
 	printf( "-c or --config      Configuration directory (default /etc/dnbd3-server/)\n" );
@@ -130,7 +131,7 @@ void dnbd3_printHelp(char *argv_0)
  */
 void dnbd3_printVersion()
 {
-	printf( "dnbd3-server version: %s\n", DNBD3_BUILD_VERSION );
+	printf( "dnbd3-server version: %s\n", DNBD3_VERSION );
 	exit( 0 );
 }
 
@@ -371,8 +372,8 @@ int main(int argc, char *argv[])
 	}
 	logadd( LOG_INFO, "DNBD3 server starting...." );
 	logadd( LOG_INFO, "Machine type: " DNBD3_ENDIAN_MODE );
-	logadd( LOG_INFO, "Build Type: %s", DNBD3_BUILD_TYPE );
-	logadd( LOG_INFO, "Version: %s", DNBD3_BUILD_VERSION );
+	logadd( LOG_INFO, "Build Type: %s", DNBD3_BUILD );
+	logadd( LOG_INFO, "Version: %s", DNBD3_VERSION );
 
 	if ( altservers_load() < 0 ) {
 		logadd( LOG_WARNING, "Could not load alt-servers. Does the file exist in %s?", _configDir );
-- 
cgit v1.2.3-55-g7522