diff options
| author | Manuel Bentele | 2020-10-19 16:14:41 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2020-10-19 16:16:58 +0200 |
| commit | c6a843122ad60fff05e7daa2f7b30abc2ec101e9 (patch) | |
| tree | aa60daa34b282165f1a70c4654d84530cbd53fa2 /src/server | |
| parent | [BUILD] build Linux kernel module only on Linux systems (diff) | |
| download | dnbd3-c6a843122ad60fff05e7daa2f7b30abc2ec101e9.tar.gz dnbd3-c6a843122ad60fff05e7daa2f7b30abc2ec101e9.tar.xz dnbd3-c6a843122ad60fff05e7daa2f7b30abc2ec101e9.zip | |
[BUILD] set build type and stop Release build if repository is dirty
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/server/rpc.c | 4 | ||||
| -rw-r--r-- | src/server/server.c | 10 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 47dda53..1855d91 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -12,9 +12,6 @@ endif(NOT JANSSON_FOUND) # add compile option to enable enhanced POSIX features add_definitions(-D_GNU_SOURCE) -# export project build type to source code -add_definitions(-DBUILD_TYPE=${CMAKE_BUILD_TYPE}) - if(DNBD3_SERVER_AFL) # build dnbd3-server with AFL support message(STATUS "Building dnbd3-server with AFL support") diff --git a/src/server/rpc.c b/src/server/rpc.c index ab08395..c8da951 100644 --- a/src/server/rpc.c +++ b/src/server/rpc.c @@ -311,8 +311,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_VERSION ) ); - json_object_set_new( statisticsJson, "build", json_string( TOSTRING( BUILD_TYPE ) ) ); + json_object_set_new( statisticsJson, "version", json_string( DNBD3_BUILD_VERSION ) ); + json_object_set_new( statisticsJson, "build", json_string( DNBD3_BUILD_TYPE ) ); } if ( space ) { uint64_t spaceTotal = 0, spaceAvail = 0; diff --git a/src/server/server.c b/src/server/server.c index 8aefece..55ec042 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -105,7 +105,7 @@ static void queueJobInternal(job_t *job); */ void dnbd3_printHelp(char *argv_0) { - printf( "Version: %s\n\n", DNBD3_VERSION ); + printf( "Version: %s\n\n", DNBD3_BUILD_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 +130,7 @@ void dnbd3_printHelp(char *argv_0) */ void dnbd3_printVersion() { - printf( "dnbd3-server version: %s\n", DNBD3_VERSION ); + printf( "dnbd3-server version: %s\n", DNBD3_BUILD_VERSION ); exit( 0 ); } @@ -363,9 +363,9 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } logadd( LOG_INFO, "DNBD3 server starting...." ); - logadd( LOG_INFO, "Machine type: " ENDIAN_MODE ); - logadd( LOG_INFO, "Build Type: " TOSTRING( BUILD_TYPE ) ); - logadd( LOG_INFO, "Version: %s", DNBD3_VERSION ); + 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 ); if ( altservers_load() < 0 ) { logadd( LOG_WARNING, "Could not load alt-servers. Does the file exist in %s?", _configDir ); |