diff --git a/.cmake-format.py b/.cmake-format.py new file mode 100644 index 00000000000..8ad2550c8c1 --- /dev/null +++ b/.cmake-format.py @@ -0,0 +1,141 @@ + +# -------------------------- +# General Formatting Options +# -------------------------- +# How wide to allow formatted cmake files +line_width = 80 + +# How many spaces to tab for indent +tab_size = 2 + +# If an argument group contains more than this many sub-groups (parg or kwarg +# groups), then force it to a vertical layout. +max_subgroups_hwrap = 2 + +# If a positional argument group contains more than this many arguments, then +# force it to a vertical layout. +max_pargs_hwrap = 8 + +# If true, separate flow control names from their parentheses with a space +separate_ctrl_name_with_space = False + +# If true, separate function names from parentheses with a space +separate_fn_name_with_space = False + +# If a statement is wrapped to more than one line, than dangle the closing +# parenthesis on it's own line. +dangle_parens = True + +# If the trailing parenthesis must be 'dangled' on it's on line, then align it +# to this reference: `prefix`: the start of the statement, `prefix-indent`: the +# start of the statement, plus one indentation level, `child`: align to the +# column of the arguments +dangle_align = 'prefix' + +min_prefix_chars = 4 + +# If the statement spelling length (including space and parenthesis is larger +# than the tab width by more than this among, then force reject un-nested +# layouts. +max_prefix_chars = 10 + +# If a candidate layout is wrapped horizontally but it exceeds this many lines, +# then reject the layout. +max_lines_hwrap = 2 + +# What style line endings to use in the output. +line_ending = 'unix' + +# Format command names consistently as 'lower' or 'upper' case +command_case = 'canonical' + +# Format keywords consistently as 'lower' or 'upper' case +keyword_case = 'unchanged' + +# Specify structure for custom cmake functions +additional_commands = { + "bareos_add_test": { + "pargs": 1, + "flags": [ + "", + "" + ], + "kwargs": { + "ADDITIONAL_SOURCES": "*", + "LINK_LIBRARIES": "*", + "COMPILE_DEFINITIONS": "*" + } + } +} + +# A list of command names which should always be wrapped +always_wrap = [] + +# If true, the argument lists which are known to be sortable will be sorted +# lexicographically +enable_sort = True + +# If true, the parsers may infer whether or not an argument list is sortable +# (without annotation). +autosort = False + +# If a comment line starts with at least this many consecutive hash characters, +# then don't lstrip() them off. This allows for lazy hash rulers where the first +# hash char is not separated by space +hashruler_min_length = 10 + +# A dictionary containing any per-command configuration overrides. Currently +# only `command_case` is supported. +per_command = {} + +# A dictionary mapping layout nodes to a list of wrap decisions. See the +# documentation for more information. +layout_passes = {} + + +# -------------------------- +# Comment Formatting Options +# -------------------------- +# What character to use for bulleted lists +bullet_char = '*' + +# What character to use as punctuation after numerals in an enumerated list +enum_char = '.' + +# enable comment markup parsing and reflow +enable_markup = True + +# If comment markup is enabled, don't reflow the first comment block in each +# listfile. Use this to preserve formatting of your copyright/license +# statements. +first_comment_is_literal = True + +# If comment markup is enabled, don't reflow any comment block which matches +# this (regex) pattern. Default is `None` (disabled). +literal_comment_pattern = None + +# Regular expression to match preformat fences in comments +# default=r'^\s*([`~]{3}[`~]*)(.*)$' +fence_pattern = '^\\s*([`~]{3}[`~]*)(.*)$' + +# Regular expression to match rulers in comments +# default=r'^\s*[^\w\s]{3}.*[^\w\s]{3}$' +ruler_pattern = '^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$' + +# If true, then insert a space between the first hash char and remaining hash +# chars in a hash ruler, and normalize it's length to fill the column +canonicalize_hashrulers = True + + +# --------------------------------- +# Miscellaneous Options +# --------------------------------- +# If true, emit the unicode byte-order mark (BOM) at the start of the file +emit_byteorder_mark = False + +# Specify the encoding of the input file. Defaults to utf-8. +input_encoding = 'utf-8' + +# Specify the encoding of the output file. Defaults to utf-8. Note that cmake +# only claims to support utf-8 so be careful when using anything else +output_encoding = 'utf-8' diff --git a/CMakeLists.txt b/CMakeLists.txt index 1441dca587c..8954f0d4415 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,39 +21,58 @@ cmake_minimum_required(VERSION 3.0) project(bareos NONE) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/core/cmake") set(default_build_type "Debug") + +find_package(Git) +include(BareosVersionFromGit) +include(BareosExtractVersionInfo) + +set(BUILDNAME + "${BAREOS_FULL_VERSION}" + CACHE STRING "site name variable for CDash" +) +set(SITE + "${CMAKE_SYSTEM}" + CACHE STRING "build name variable for CDash" +) # enable "make test" enable_testing() set(CMAKE_CTEST_COMMAND ctest -V) include(CTest) -IF(docs-build-json) -# check for wrong combinations of build flags - IF(docs-only) - MESSAGE(FATAL_ERROR "\n\"docs-build-json\" needs bareos-executables and cannot be combined with \"docs-only\"") - ENDIF() - IF(NOT traymonitor) - MESSAGE(FATAL_ERROR "\n\"docs-build-json\" needs the traymonitor executable: add \"-Dtraymonitor=yes\"") - ENDIF() -ENDIF() - -IF(docs-only) +if(docs-build-json) + # check for wrong combinations of build flags + if(docs-only) + message( + FATAL_ERROR + "\n\"docs-build-json\" needs bareos-executables and cannot be combined with \"docs-only\"" + ) + endif() + if(NOT traymonitor) + message( + FATAL_ERROR + "\n\"docs-build-json\" needs the traymonitor executable: add \"-Dtraymonitor=yes\"" + ) + endif() +endif() + +if(docs-only) set(BUILD_BAREOS_BINARIES no) -ELSE() +else() set(BUILD_BAREOS_BINARIES yes) -ENDIF() - -find_package(Git) -include(BareosVersionFromGit) - -IF(BUILD_BAREOS_BINARIES) -add_subdirectory(core) -add_subdirectory(webui) -add_subdirectory(systemtests) -ENDIF() +endif() -IF(docs OR docs-only OR docs-build-json) - add_subdirectory(docs/manuals) -ENDIF() +if(BUILD_BAREOS_BINARIES) + add_subdirectory(core) + add_subdirectory(webui) + add_subdirectory(systemtests) +endif() +if(docs + OR docs-only + OR docs-build-json +) + add_subdirectory(docs/manuals) +endif() diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 5c774fd6f7a..352e61187e0 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -1,10 +1,10 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## -## # The following are required to submit to the CDash dashboard: -## ENABLE_TESTING() -## INCLUDE(CTest) +# This file should be placed in the root directory of your project. +# Then modify the CMakeLists.txt file in the root directory of your +# project to incorporate the testing dashboard. +# +# # The following are required to submit to the CDash dashboard: +# ENABLE_TESTING() +# INCLUDE(CTest) set(CTEST_PROJECT_NAME "Bareos") set(CTEST_NIGHTLY_START_TIME "23:00:00 CET") diff --git a/cmake/BareosVersionFromGit.cmake b/cmake/BareosVersionFromGit.cmake index c2a0af44a0e..a42a885102f 100644 --- a/cmake/BareosVersionFromGit.cmake +++ b/cmake/BareosVersionFromGit.cmake @@ -18,66 +18,56 @@ # Extract version information and commit timestamp if run in a git checkout if(Git_FOUND) - execute_process(COMMAND ${GIT_EXECUTABLE} - log - -1 - --pretty=format:%ct - RESULT_VARIABLE GIT_COMMIT_TIMESTAMP_RESULT - OUTPUT_VARIABLE GIT_COMMIT_TIMESTAMP - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - ERROR_QUIET) + execute_process( + COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%ct + RESULT_VARIABLE GIT_COMMIT_TIMESTAMP_RESULT + OUTPUT_VARIABLE GIT_COMMIT_TIMESTAMP + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + ERROR_QUIET + ) endif() if(GIT_COMMIT_TIMESTAMP_RESULT EQUAL 0) - execute_process(COMMAND ${GIT_EXECUTABLE} - describe - --tags - --exact-match - --match - "Release/*" - --dirty=.dirty - RESULT_VARIABLE GIT_DESCRIBE_RELEASE_RESULT - OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process( + COMMAND ${GIT_EXECUTABLE} describe --tags --exact-match --match "Release/*" + --dirty=.dirty + RESULT_VARIABLE GIT_DESCRIBE_RELEASE_RESULT + OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE + ) if(NOT GIT_DESCRIBE_RELEASE_RESULT EQUAL 0) - execute_process(COMMAND ${GIT_EXECUTABLE} - describe - --tags - --match - "WIP/*" - --dirty=.dirty - RESULT_VARIABLE GIT_DESCRIBE_WIP_RESULT - OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT - WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process( + COMMAND ${GIT_EXECUTABLE} describe --tags --match "WIP/*" --dirty=.dirty + RESULT_VARIABLE GIT_DESCRIBE_WIP_RESULT + OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE + ) endif() endif() if(NOT GIT_DESCRIBE_OUTPUT STREQUAL "") set(GIT_DESCRIBE_REGEX_LONG - "^([^/]+)/([^-]+)-(([^-]+)?)-?([0-9]+)-g([0-9a-f]+(.dirty)?)[ \n]*") + "^([^/]+)/([^-]+)-(([^-]+)?)-?([0-9]+)-g([0-9a-f]+(.dirty)?)[ \n]*" + ) set(GIT_DESCRIBE_REPLACE_LONG "\\2~\\3\\5.\\6") set(GIT_DESCRIBE_REGEX_SHORT "^([^/]+)/([0-9.]+)((-[^-]+)?)((.dirty)?)[ \n]*") set(GIT_DESCRIBE_REPLACE_SHORT "\\2\\3\\5") - string(REGEX MATCH - "${GIT_DESCRIBE_REGEX_LONG}" - GIT_DESCRIBE_REGEX_LONG_MATCH - "${GIT_DESCRIBE_OUTPUT}") + string(REGEX MATCH "${GIT_DESCRIBE_REGEX_LONG}" GIT_DESCRIBE_REGEX_LONG_MATCH + "${GIT_DESCRIBE_OUTPUT}" + ) if(GIT_DESCRIBE_REGEX_LONG_MATCH STREQUAL "") - string(REGEX - REPLACE "${GIT_DESCRIBE_REGEX_SHORT}" - "${GIT_DESCRIBE_REPLACE_SHORT}" - GIT_DESCRIBE_VERSION - "${GIT_DESCRIBE_OUTPUT}") + string( + REGEX + REPLACE "${GIT_DESCRIBE_REGEX_SHORT}" "${GIT_DESCRIBE_REPLACE_SHORT}" + GIT_DESCRIBE_VERSION "${GIT_DESCRIBE_OUTPUT}" + ) else() string(REGEX - REPLACE "${GIT_DESCRIBE_REGEX_LONG}" - "${GIT_DESCRIBE_REPLACE_LONG}" - GIT_DESCRIBE_VERSION - "${GIT_DESCRIBE_OUTPUT}") + REPLACE "${GIT_DESCRIBE_REGEX_LONG}" "${GIT_DESCRIBE_REPLACE_LONG}" + GIT_DESCRIBE_VERSION "${GIT_DESCRIBE_OUTPUT}" + ) endif() endif() diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 09e2a4f98ce..95ec5ccc3a7 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -25,9 +25,9 @@ if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") message(FATAL_ERROR "In-source builds are not allowed.") endif() -SET(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME common) +set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME common) -INCLUDE(GNUInstallDirs) +include(GNUInstallDirs) find_program(CCACHE_FOUND ccache) if(CCACHE_FOUND) @@ -37,298 +37,377 @@ endif(CCACHE_FOUND) # switch on CXX 11 Support # -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) endif() -# cmake does not understand how to enforce CMAKE_CXX_STANDARD 11 -# on Solaris so we do it manually. -if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +# cmake does not understand how to enforce CMAKE_CXX_STANDARD 11 on Solaris so +# we do it manually. +if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif() include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) -CHECK_CXX_COMPILER_FLAG(-Wsuggest-override compiler_will_suggest_override) +check_cxx_compiler_flag(-Wsuggest-override compiler_will_suggest_override) -if (${compiler_will_suggest_override}) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override") +if(${compiler_will_suggest_override}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override") endif() # make format-security issues a compiler-error -CHECK_CXX_COMPILER_FLAG(-Wformat compiler_format_security) -if (${compiler_format_security}) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat") +check_cxx_compiler_flag(-Wformat compiler_format_security) +if(${compiler_format_security}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat") endif() -CHECK_CXX_COMPILER_FLAG(-Werror=format-security compiler_error_format_security) -if (${compiler_error_format_security}) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security") +check_cxx_compiler_flag(-Werror=format-security compiler_error_format_security) +if(${compiler_error_format_security}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security") endif() -option(DEBUG_PREFIX_MAP "remap absolute debug paths to relative if compiler supports it" ON) -CHECK_C_COMPILER_FLAG(-fdebug-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=. c_compiler_debug_prefix_map) -CHECK_CXX_COMPILER_FLAG(-fdebug-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=. cxx_compiler_debug_prefix_map) -if(DEBUG_PREFIX_MAP AND c_compiler_debug_prefix_map AND cxx_compiler_debug_prefix_map) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdebug-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdebug-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") +option(DEBUG_PREFIX_MAP + "remap absolute debug paths to relative if compiler supports it" ON +) +check_c_compiler_flag( + -fdebug-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=. c_compiler_debug_prefix_map +) +check_cxx_compiler_flag( + -fdebug-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=. + cxx_compiler_debug_prefix_map +) +if(DEBUG_PREFIX_MAP + AND c_compiler_debug_prefix_map + AND cxx_compiler_debug_prefix_map +) + set(CMAKE_C_FLAGS + "${CMAKE_C_FLAGS} -fdebug-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=." + ) + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -fdebug-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=." + ) endif() -CHECK_C_COMPILER_FLAG(-fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=. c_compiler_macro_prefix_map) -CHECK_CXX_COMPILER_FLAG(-fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=. cxx_compiler_macro_prefix_map) -if (c_compiler_macro_prefix_map) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") +check_c_compiler_flag( + -fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=. c_compiler_macro_prefix_map +) +check_cxx_compiler_flag( + -fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=. + cxx_compiler_macro_prefix_map +) +if(c_compiler_macro_prefix_map) + set(CMAKE_C_FLAGS + "${CMAKE_C_FLAGS} -fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=." + ) endif() -if (cxx_compiler_macro_prefix_map) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.") +if(cxx_compiler_macro_prefix_map) + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=." + ) endif() - -CHECK_CXX_COMPILER_FLAG(-Wno-unknown-pragmas compiler_has_no_unknown_pragmas) -if (${compiler_has_no_unknown_pragmas}) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas") +check_cxx_compiler_flag(-Wno-unknown-pragmas compiler_has_no_unknown_pragmas) +if(${compiler_has_no_unknown_pragmas}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas") endif() - - -# warn on sign-conversion -#include(CheckCCompilerFlag) -#CHECK_C_COMPILER_FLAG(-Wsign-conversion c_compiler_will_warn_sign_conversion) +# warn on sign-conversion include(CheckCCompilerFlag) +# CHECK_C_COMPILER_FLAG(-Wsign-conversion c_compiler_will_warn_sign_conversion) # -#if (${c_compiler_will_warn_sign_conversion}) -# set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wsign-conversion") -#endif() +# if (${c_compiler_will_warn_sign_conversion}) set (CMAKE_C_FLAGS +# "${CMAKE_C_FLAGS} -Wsign-conversion") endif() # -#CHECK_CXX_COMPILER_FLAG(-Wsign-conversion cxx_compiler_will_warn_sign_conversion) +# CHECK_CXX_COMPILER_FLAG(-Wsign-conversion +# cxx_compiler_will_warn_sign_conversion) # -#if (${cxx_compiler_will_warn_sign_conversion}) -# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion") -#endif() +# if (${cxx_compiler_will_warn_sign_conversion}) set (CMAKE_CXX_FLAGS +# "${CMAKE_CXX_FLAGS} -Wsign-conversion") endif() -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") -include_directories(/usr/include) +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") + include_directories(/usr/include) endif() - set(CMAKE_MODULE_PATH - ${CMAKE_MODULE_PATH} - ${PROJECT_SOURCE_DIR}/../../SOURCES - ${PROJECT_SOURCE_DIR}/../SOURCES - ${PROJECT_SOURCE_DIR}/cmake - ) + ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/../../SOURCES + ${PROJECT_SOURCE_DIR}/../SOURCES ${PROJECT_SOURCE_DIR}/cmake +) -SET(host ${CMAKE_SYSTEM}) +set(host ${CMAKE_SYSTEM}) -SET(CMAKE_EXPORT_COMPILE_COMMANDS ON) - -# enable "make test" -enable_testing() -set(CMAKE_CTEST_COMMAND ctest -V) -include(CTest) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # run git-info to collect sourcecode info file(MAKE_DIRECTORY build) execute_process( - COMMAND ${PROJECT_SOURCE_DIR}/scripts/git-info.sh - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/build + COMMAND ${PROJECT_SOURCE_DIR}/scripts/git-info.sh + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/build ) -INCLUDE(BareosExtractVersionInfo) - -IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(OPENSSL_ROOT_DIR /usr/local/opt/openssl) - set(Readline_ROOT_DIR /usr/local/opt/readline) -ENDIF() - -INCLUDE(BareosFindAllLibraries) +include(BareosExtractVersionInfo) +include(BareosLocalBuildDefinitions OPTIONAL + RESULT_VARIABLE BareosLocalBuildDefinitionsFile +) -IF (NOT ${OPENSSL_FOUND}) - MESSAGE(FATAL_ERROR "FATAL ERROR: OpenSSL is required but was not found.") -ENDIF() +include(BareosGetDistInfo) -IF (coverage) - set(COVERAGE_COMPILER_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage" CACHE INTERNAL "") - MESSAGE(STATUS "coverage requested, adding COVERAGE_COMPILER_FLAGS : ${COVERAGE_COMPILER_FLAGS}") - set(CMAKE_BUILD_TYPE Debug) - if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - link_libraries(gcov) - else() - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") - endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}") -ENDIF() +set(BUILDNAME + "${BAREOS_NUMERIC_VERSION}" + CACHE STRING "site name variable for CDash" +) +set(SITE + "${CMAKE_SYSTEM_NAME}-${DISTVER}-${CMAKE_HOST_SYSTEM_PROCESSOR}" + CACHE STRING "build name variable for CDash" +) +# enable "make test" +enable_testing() +set(CMAKE_CTEST_COMMAND ctest -V) +include(CTest) -if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(HAVE_LINUX_OS 1) - set(PSCMD "ps -e") - include_directories(/usr/include/tirpc) +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(OPENSSL_ROOT_DIR /usr/local/opt/openssl) + set(Readline_ROOT_DIR /usr/local/opt/readline) endif() -if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") - set(HAVE_SUN_OS 1) - set(PSCMD "ps -e -o pid,comm") - link_libraries(nsl socket curses) -endif() +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + set(MINGW_PREFIX ${CMAKE_INSTALL_PREFIX}) + set(MINGW_BINDIR "${MINGW_PREFIX}/bin") + if(${WINDOWS_BITS} MATCHES "32") + set(CMAKE_CROSSCOMPILING_EMULATOR wine) + set(SITE + "${CMAKE_SYSTEM}-32" + CACHE STRING "build name variable for CDash" + ) + else() + set(CMAKE_CROSSCOMPILING_EMULATOR wine64) + set(SITE + "${CMAKE_SYSTEM}-64" + CACHE STRING "build name variable for CDash" + ) + endif() -if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - set(HAVE_FREEBSD_OS 1) - set(PSCMD "ps -ax -o pid,command") - include_directories(/usr/local/include) - link_directories(/usr/local/lib) - link_libraries(intl) -endif() + # search for dll.a files before .dll + set(MINGW_LIBDIR "${MINGW_PREFIX}/lib") + set(CMAKE_LIBRARY_PATH ${MINGW_LIBDIR}) -IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(HAVE_DARWIN_OS 1) - #set(CMAKE_INCLUDE_PATH "${OPENSSL_INCLUDE_DIR}:${CMAKE_INCLUDE_PATH}") - set(CMAKE_INCLUDE_PATH "/usr/local/opt/:${CMAKE_INCLUDE_PATH}") - link_directories(/usr/local/lib) + # set WINEPATH so that cross-compiled .exe tests find their dlls + set(WINEPATH "Z:${MINGW_BINDIR}\\\\;") + string(APPEND WINEPATH "Z:${CMAKE_CURRENT_BINARY_DIR}/src/lib\\\\;") + string(APPEND WINEPATH "Z:${CMAKE_CURRENT_BINARY_DIR}/src/fastlz\\\\;") + string(APPEND WINEPATH "Z:${CMAKE_CURRENT_BINARY_DIR}/src/findlib\\\\;") + string(APPEND WINEPATH "Z:${CMAKE_CURRENT_BINARY_DIR}/src/stored\\\\;") + string(APPEND WINEPATH "Z:${CMAKE_CURRENT_BINARY_DIR}/src/cats\\\\;") - include_directories(/usr/local/opt/gettext/include) - link_libraries(/usr/local/opt/gettext/lib/libintl.a iconv "-framework CoreFoundation") - set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}") -ENDIF() + message(${WINEPATH}) + # replace slash with backslash everywhere + string(REPLACE "/" "\\" WINEPATH ${WINEPATH}) + # MESSAGE(FATAL_ERROR ${WINEPATH}) -# hpux -if (${CMAKE_SYSTEM_NAME} MATCHES "HP-UX") - set(HAVE_HPUX_OS 1) - set(PSCMD "UNIX95=1; ps -e -o pid,comm") - add_definitions(-D_XOPEN_SOURCE_EXTENDED=1) - add_definitions(-D_INCLUDE_XOPEN_SOURCE_EXTENDED=1) - add_definitions(-D_INCLUDE_LONGLONG=1) - include_directories(/usr/local/include/) - link_directories(/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib ) - link_libraries(dld intl) -endif() + set(ENV{WINEPATH} ${WINEPATH}) -if (${CMAKE_SYSTEM_NAME} MATCHES "AIX") - set(HAVE_AIX_OS 1) - set(lmdb 0FF) - link_libraries(intl) endif() +include(BareosFindAllLibraries) +include(BareosFindPrograms) -if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - include_directories(SYSTEM - ${PROJECT_SOURCE_DIR}/src/win32/include - ${PROJECT_SOURCE_DIR}/src/win32/compat/include - ) +if(NOT ${OPENSSL_FOUND}) + message(FATAL_ERROR "FATAL ERROR: OpenSSL is required but was not found.") +endif() - set(HAVE_WIN32 1) +if(coverage) + set(COVERAGE_COMPILER_FLAGS + "-g -O0 --coverage -fprofile-arcs -ftest-coverage" + CACHE INTERNAL "" + ) + message( + STATUS + "coverage requested, adding COVERAGE_COMPILER_FLAGS : ${COVERAGE_COMPILER_FLAGS}" + ) + set(CMAKE_BUILD_TYPE Debug) + if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + link_libraries(gcov) + else() + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}") +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(HAVE_LINUX_OS 1) + set(PSCMD "ps -e") + include_directories(/usr/include/tirpc) +endif() - set(WINDOWS_LIBRARIES ws2_32) +if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + set(HAVE_SUN_OS 1) + set(PSCMD "ps -e -o pid,comm") + link_libraries(nsl socket curses) +endif() - SET(PYTHON_LIBRARIES ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}/python27.dll ) - SET(PYTHON_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include) - SET(HAVE_PYTHON 1) +if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + set(HAVE_FREEBSD_OS 1) + set(PSCMD "ps -ax -o pid,command") + include_directories(/usr/local/include) + link_directories(/usr/local/lib) + link_libraries(intl) +endif() - SET(PostgreSQL_LIBRARY ${PROJECT_SOURCE_DIR}/src/win32/cats/pgsql/lib/${WINDOWS_BITS}/libpq.dll) - SET(PostgreSQL_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/win32/cats/pgsql/include) - SET(PostgreSQL_TYPE_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include) +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(HAVE_DARWIN_OS 1) + # set(CMAKE_INCLUDE_PATH "${OPENSSL_INCLUDE_DIR}:${CMAKE_INCLUDE_PATH}") + set(CMAKE_INCLUDE_PATH "/usr/local/opt/:${CMAKE_INCLUDE_PATH}") + link_directories(/usr/local/lib) - SET(dynamic-storage-backends OFF) - SET(HAVE_DYNAMIC_SD_BACKENDS 0) + include_directories(/usr/local/opt/gettext/include) + link_libraries( + /usr/local/opt/gettext/lib/libintl.a iconv "-framework CoreFoundation" + ) + set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}") +endif() +# hpux +if(${CMAKE_SYSTEM_NAME} MATCHES "HP-UX") + set(HAVE_HPUX_OS 1) + set(PSCMD "UNIX95=1; ps -e -o pid,comm") + add_definitions(-D_XOPEN_SOURCE_EXTENDED=1) + add_definitions(-D_INCLUDE_XOPEN_SOURCE_EXTENDED=1) + add_definitions(-D_INCLUDE_LONGLONG=1) + include_directories(/usr/local/include/) + link_directories(/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib) + link_libraries(dld intl) +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "AIX") + set(HAVE_AIX_OS 1) + set(lmdb 0FF) + link_libraries(intl) +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + include_directories( + SYSTEM ${PROJECT_SOURCE_DIR}/src/win32/include + ${PROJECT_SOURCE_DIR}/src/win32/compat/include + ) + + set(HAVE_WIN32 1) + + set(WINDOWS_LIBRARIES ws2_32) + + set(PYTHON_LIBRARIES + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}/python27.dll + ) + set(PYTHON_INCLUDE_DIRS + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include + ) + set(HAVE_PYTHON 1) + + set(PostgreSQL_LIBRARY + ${PROJECT_SOURCE_DIR}/src/win32/cats/pgsql/lib/${WINDOWS_BITS}/libpq.dll + ) + set(PostgreSQL_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/win32/cats/pgsql/include) + set(PostgreSQL_TYPE_INCLUDE_DIR + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include + ) + + set(dynamic-storage-backends OFF) + set(HAVE_DYNAMIC_SD_BACKENDS 0) else() - add_definitions("-D_FILE_OFFSET_BITS=64") + add_definitions("-D_FILE_OFFSET_BITS=64") endif() -INCLUDE(FindIntl) +include(FindIntl) -IF(developer) - add_definitions("-DDEVELOPER=1") -ENDIF() +if(developer) + add_definitions("-DDEVELOPER=1") +endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-register") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register") endif() -INCLUDE(BareosFindPrograms) - - -INCLUDE(BareosSetVariableDefaults) +include(BareosSetVariableDefaults) -if (${CMAKE_SYSTEM_NAME} MATCHES "AIX") - SET(ENABLE_NLS 0) +if(${CMAKE_SYSTEM_NAME} MATCHES "AIX") + set(ENABLE_NLS 0) endif() -INCLUDE(BareosFindStaticCodeAnalysisTools) - -INCLUDE(BareosGetDistInfo) - -INCLUDE(BareosGenerateDebianInfo) -IF (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - add_definitions(-DWIN32_VSS -DMINGW64 -DHAVE_WIN32 -DHAVE_MINGW -D_WIN32_WINNT=${WINDOWS_VERSION}) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${WINDOWS_BITS} -mwin32 -mthreads") -ENDIF() +include(BareosFindStaticCodeAnalysisTools) +include(BareosGenerateDebianInfo) +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + add_definitions( + -DWIN32_VSS -DMINGW64 -DHAVE_WIN32 -DHAVE_MINGW + -D_WIN32_WINNT=${WINDOWS_VERSION} + ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${WINDOWS_BITS} -mwin32 -mthreads") +endif() -# set INSTALL_LIB_DIR automatically to lib or lib64 automatically -# Taken from https://cmake.org/pipermail/cmake/2013-July/055374.html +# set INSTALL_LIB_DIR automatically to lib or lib64 automatically Taken from +# https://cmake.org/pipermail/cmake/2013-July/055374.html get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) -if ("${LIB64}" STREQUAL "TRUE") - set(LIBSUFFIX 64) +if("${LIB64}" STREQUAL "TRUE") + set(LIBSUFFIX 64) else() - set(LIBSUFFIX "") + set(LIBSUFFIX "") endif() -set(INSTALL_LIB_DIR "usr/lib${LIBSUFFIX}" CACHE PATH "Installation directory for libraries") +set(INSTALL_LIB_DIR + "usr/lib${LIBSUFFIX}" + CACHE PATH "Installation directory for libraries" +) mark_as_advanced(INSTALL_LIB_DIR) - # RPATH settings (from https://cmake.org/Wiki/CMake_RPATH_handling) -SET(CMAKE_SKIP_BUILD_RPATH FALSE) - -SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +set(CMAKE_SKIP_BUILD_RPATH FALSE) -SET(CMAKE_INSTALL_RPATH "${libdir}") +set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +set(CMAKE_INSTALL_RPATH "${libdir}") +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) site_name(hostname) set(dbdriver sqlite3) -#manual definitions -set (BAREOS "Bareos") +# manual definitions +set(BAREOS "Bareos") set(LOCALEDIR \"${CMAKE_INSTALL_LOCALEDIR}\") set(HAVE_CRYPTO 1) -INCLUDE(BareosTypeSizes) +include(BareosTypeSizes) -INCLUDE(TestBigEndian) -TEST_BIG_ENDIAN(IS_BIGENDIAN) -IF(IS_BIGENDIAN) - #SET(WORDS_BIGENDIAN 1) - SET(HAVE_BIG_ENDIAN 1) -ELSE() - SET(HAVE_LITTLE_ENDIAN 1) -ENDIF() +include(TestBigEndian) +test_big_endian(IS_BIGENDIAN) +if(IS_BIGENDIAN) + # SET(WORDS_BIGENDIAN 1) + set(HAVE_BIG_ENDIAN 1) +else() + set(HAVE_LITTLE_ENDIAN 1) +endif() -MESSAGE( STATUS "VERSION: " ${CMAKE_MATCH_1} ) -MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} ) +message(STATUS "VERSION: " ${CMAKE_MATCH_1}) +message(STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) # needed for check_include set(CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") -INCLUDE(BareosCheckIncludes) +include(BareosCheckIncludes) -INCLUDE(BareosCheckFunctions) +include(BareosCheckFunctions) -INCLUDE(BareosCheckSymbols) +include(BareosCheckSymbols) -INCLUDE(BareosCheckStructHasMembers) +include(BareosCheckStructHasMembers) -INCLUDE(BareosDetermineHaveLowLevelScsiInterface) +include(BareosDetermineHaveLowLevelScsiInterface) -INCLUDE(acltypes) +include(acltypes) include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS}) @@ -343,161 +422,175 @@ set(CMAKE_EXTRA_INCLUDE_FILES) set(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h) +# ------------------------- Begin Generic CMake Variable Logging +# ------------------ +# /* C++ comment style not allowed */ +# if you are building in-source, this is the same as PROJECT_SOURCE_DIR, +# otherwise this is the top level directory of your build tree +message(STATUS "CMAKE_BINARY_DIR: " ${CMAKE_BINARY_DIR}) -# ------------------------- Begin Generic CMake Variable Logging ------------------ - -# /* C++ comment style not allowed */ +# if you are building in-source, this is the same as CMAKE_CURRENT_SOURCE_DIR, +# otherwise this is the directory where the compiled or generated files from the +# current CMakeLists.txt will go to +message(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR}) +# this is the directory, from which cmake was started, i.e. the top level source +# directory +message(STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) -# if you are building in-source, this is the same as PROJECT_SOURCE_DIR, otherwise -# this is the top level directory of your build tree -MESSAGE( STATUS "CMAKE_BINARY_DIR: " ${CMAKE_BINARY_DIR} ) - -# if you are building in-source, this is the same as CMAKE_CURRENT_SOURCE_DIR, otherwise this -# is the directory where the compiled or generated files from the current CMakeLists.txt will go to -MESSAGE( STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR} ) - -# this is the directory, from which cmake was started, i.e. the top level source directory -MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} ) - -# this is the directory where the currently processed CMakeLists.txt is located in -MESSAGE( STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR} ) +# this is the directory where the currently processed CMakeLists.txt is located +# in +message(STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR}) # contains the full path to the top level directory of your build tree -MESSAGE( STATUS "PROJECT_BINARY_DIR: " ${PROJECT_BINARY_DIR} ) +message(STATUS "PROJECT_BINARY_DIR: " ${PROJECT_BINARY_DIR}) -# contains the full path to the root of your project source directory, -# i.e. to the nearest directory where CMakeLists.txt contains the PROJECT() command -MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} ) +# contains the full path to the root of your project source directory, i.e. to +# the nearest directory where CMakeLists.txt contains the PROJECT() command +message(STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) -# set this variable to specify a common place where CMake should put all executable files -# (instead of CMAKE_CURRENT_BINARY_DIR) -MESSAGE( STATUS "EXECUTABLE_OUTPUT_PATH: " ${EXECUTABLE_OUTPUT_PATH} ) +# set this variable to specify a common place where CMake should put all +# executable files (instead of CMAKE_CURRENT_BINARY_DIR) +message(STATUS "EXECUTABLE_OUTPUT_PATH: " ${EXECUTABLE_OUTPUT_PATH}) -# set this variable to specify a common place where CMake should put all libraries -# (instead of CMAKE_CURRENT_BINARY_DIR) -MESSAGE( STATUS "LIBRARY_OUTPUT_PATH: " ${LIBRARY_OUTPUT_PATH} ) +# set this variable to specify a common place where CMake should put all +# libraries (instead of CMAKE_CURRENT_BINARY_DIR) +message(STATUS "LIBRARY_OUTPUT_PATH: " ${LIBRARY_OUTPUT_PATH}) -# tell CMake to search first in directories listed in CMAKE_MODULE_PATH -# when you use FIND_PACKAGE() or INCLUDE() -MESSAGE( STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH} ) +# tell CMake to search first in directories listed in CMAKE_MODULE_PATH when you +# use FIND_PACKAGE() or INCLUDE() +message(STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH}) -# this is the complete path of the cmake which runs currently (e.g. /usr/local/bin/cmake) -MESSAGE( STATUS "CMAKE_COMMAND: " ${CMAKE_COMMAND} ) +# this is the complete path of the cmake which runs currently (e.g. +# /usr/local/bin/cmake) +message(STATUS "CMAKE_COMMAND: " ${CMAKE_COMMAND}) # this is the CMake installation directory -MESSAGE( STATUS "CMAKE_ROOT: " ${CMAKE_ROOT} ) +message(STATUS "CMAKE_ROOT: " ${CMAKE_ROOT}) -# this is the filename including the complete path of the file where this variable is used. -MESSAGE( STATUS "CMAKE_CURRENT_LIST_FILE: " ${CMAKE_CURRENT_LIST_FILE} ) +# this is the filename including the complete path of the file where this +# variable is used. +message(STATUS "CMAKE_CURRENT_LIST_FILE: " ${CMAKE_CURRENT_LIST_FILE}) # this is linenumber where the variable is used -MESSAGE( STATUS "CMAKE_CURRENT_LIST_LINE: " ${CMAKE_CURRENT_LIST_LINE} ) +message(STATUS "CMAKE_CURRENT_LIST_LINE: " ${CMAKE_CURRENT_LIST_LINE}) -# this is used when searching for include files e.g. using the FIND_PATH() command. -MESSAGE( STATUS "CMAKE_INCLUDE_PATH: " ${CMAKE_INCLUDE_PATH} ) +# this is used when searching for include files e.g. using the FIND_PATH() +# command. +message(STATUS "CMAKE_INCLUDE_PATH: " ${CMAKE_INCLUDE_PATH}) -# this is used when searching for libraries e.g. using the FIND_LIBRARY() command. -MESSAGE( STATUS "CMAKE_LIBRARY_PATH: " ${CMAKE_LIBRARY_PATH} ) +# this is used when searching for libraries e.g. using the FIND_LIBRARY() +# command. +message(STATUS "CMAKE_LIBRARY_PATH: " ${CMAKE_LIBRARY_PATH}) -# the complete system name, e.g. "Linux-2.4.22", "FreeBSD-5.4-RELEASE" or "Windows 5.1" -MESSAGE( STATUS "CMAKE_SYSTEM: " ${CMAKE_SYSTEM} ) +# the complete system name, e.g. "Linux-2.4.22", "FreeBSD-5.4-RELEASE" or +# "Windows 5.1" +message(STATUS "CMAKE_SYSTEM: " ${CMAKE_SYSTEM}) # the short system name, e.g. "Linux", "FreeBSD" or "Windows" -MESSAGE( STATUS "CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME} ) +message(STATUS "CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME}) # only the version part of CMAKE_SYSTEM -MESSAGE( STATUS "CMAKE_SYSTEM_VERSION: " ${CMAKE_SYSTEM_VERSION} ) +message(STATUS "CMAKE_SYSTEM_VERSION: " ${CMAKE_SYSTEM_VERSION}) # the processor name (e.g. "Intel(R) Pentium(R) M processor 2.00GHz") -MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR} ) +message(STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR}) # is TRUE on all UNIX-like OS's, including Apple OS X and CygWin -MESSAGE( STATUS "UNIX: " ${UNIX} ) +message(STATUS "UNIX: " ${UNIX}) # is TRUE on Windows, including CygWin -MESSAGE( STATUS "WIN32: " ${WIN32} ) +message(STATUS "WIN32: " ${WIN32}) # is TRUE on Apple OS X -MESSAGE( STATUS "APPLE: " ${APPLE} ) +message(STATUS "APPLE: " ${APPLE}) # is TRUE when using the MinGW compiler in Windows -MESSAGE( STATUS "MINGW: " ${MINGW} ) +message(STATUS "MINGW: " ${MINGW}) # is TRUE on Windows when using the CygWin version of cmake -MESSAGE( STATUS "CYGWIN: " ${CYGWIN} ) +message(STATUS "CYGWIN: " ${CYGWIN}) # is TRUE on Windows when using a Borland compiler -MESSAGE( STATUS "BORLAND: " ${BORLAND} ) +message(STATUS "BORLAND: " ${BORLAND}) # Microsoft compiler -MESSAGE( STATUS "MSVC: " ${MSVC} ) -MESSAGE( STATUS "MSVC_IDE: " ${MSVC_IDE} ) -MESSAGE( STATUS "MSVC60: " ${MSVC60} ) -MESSAGE( STATUS "MSVC70: " ${MSVC70} ) -MESSAGE( STATUS "MSVC71: " ${MSVC71} ) -MESSAGE( STATUS "MSVC80: " ${MSVC80} ) -MESSAGE( STATUS "CMAKE_COMPILER_2005: " ${CMAKE_COMPILER_2005} ) - - -# set this to true if you don't want to rebuild the object files if the rules have changed, -# but not the actual source files or headers (e.g. if you changed the some compiler switches) -MESSAGE( STATUS "CMAKE_SKIP_RULE_DEPENDENCY: " ${CMAKE_SKIP_RULE_DEPENDENCY} ) - -# since CMake 2.1 the install rule depends on all, i.e. everything will be built before installing. -# If you don't like this, set this one to true. -MESSAGE( STATUS "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY: " ${CMAKE_SKIP_INSTALL_ALL_DEPENDENCY} ) - -# If set, runtime paths are not added when using shared libraries. Default it is set to OFF -MESSAGE( STATUS "CMAKE_SKIP_RPATH: " ${CMAKE_SKIP_RPATH} ) +message(STATUS "MSVC: " ${MSVC}) +message(STATUS "MSVC_IDE: " ${MSVC_IDE}) +message(STATUS "MSVC60: " ${MSVC60}) +message(STATUS "MSVC70: " ${MSVC70}) +message(STATUS "MSVC71: " ${MSVC71}) +message(STATUS "MSVC80: " ${MSVC80}) +message(STATUS "CMAKE_COMPILER_2005: " ${CMAKE_COMPILER_2005}) + +# set this to true if you don't want to rebuild the object files if the rules +# have changed, but not the actual source files or headers (e.g. if you changed +# the some compiler switches) +message(STATUS "CMAKE_SKIP_RULE_DEPENDENCY: " ${CMAKE_SKIP_RULE_DEPENDENCY}) + +# since CMake 2.1 the install rule depends on all, i.e. everything will be built +# before installing. If you don't like this, set this one to true. +message(STATUS "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY: " + ${CMAKE_SKIP_INSTALL_ALL_DEPENDENCY} +) -# set this to true if you are using makefiles and want to see the full compile and link -# commands instead of only the shortened ones -MESSAGE( STATUS "CMAKE_VERBOSE_MAKEFILE: " ${CMAKE_VERBOSE_MAKEFILE} ) +# If set, runtime paths are not added when using shared libraries. Default it is +# set to OFF +message(STATUS "CMAKE_SKIP_RPATH: " ${CMAKE_SKIP_RPATH}) -# this will cause CMake to not put in the rules that re-run CMake. This might be useful if -# you want to use the generated build files on another machine. -MESSAGE( STATUS "CMAKE_SUPPRESS_REGENERATION: " ${CMAKE_SUPPRESS_REGENERATION} ) +# set this to true if you are using makefiles and want to see the full compile +# and link commands instead of only the shortened ones +message(STATUS "CMAKE_VERBOSE_MAKEFILE: " ${CMAKE_VERBOSE_MAKEFILE}) +# this will cause CMake to not put in the rules that re-run CMake. This might be +# useful if you want to use the generated build files on another machine. +message(STATUS "CMAKE_SUPPRESS_REGENERATION: " ${CMAKE_SUPPRESS_REGENERATION}) -# A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). -# But there are also two variables exactly for this purpose: +# A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). But +# there are also two variables exactly for this purpose: # the compiler flags for compiling C sources -MESSAGE( STATUS "CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS} ) +message(STATUS "CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS}) # the compiler flags for compiling C++ sources -MESSAGE( STATUS "CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS} ) +message(STATUS "CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS}) -# wheter or not -MESSAGE( STATUS "CCACHE_FOUND: " ${CCACHE_FOUND}) +# wheter or not +message(STATUS "CCACHE_FOUND: " ${CCACHE_FOUND}) # Choose the type of build. Example: SET(CMAKE_BUILD_TYPE Debug) -MESSAGE( STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE} ) +message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE}) -# if this is set to ON, then all libraries are built as shared libraries by default. -MESSAGE( STATUS "BUILD_SHARED_LIBS: " ${BUILD_SHARED_LIBS} ) +# if this is set to ON, then all libraries are built as shared libraries by +# default. +message(STATUS "BUILD_SHARED_LIBS: " ${BUILD_SHARED_LIBS}) # the compiler used for C files -MESSAGE( STATUS "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} ) +message(STATUS "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER}) # the compiler used for C++ files -MESSAGE( STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER} ) +message(STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER}) # if the compiler is a variant of gcc, this should be set to 1 -MESSAGE( STATUS "CMAKE_COMPILER_IS_GNUCC: " ${CMAKE_COMPILER_IS_GNUCC} ) +message(STATUS "CMAKE_COMPILER_IS_GNUCC: " ${CMAKE_COMPILER_IS_GNUCC}) # if the compiler is a variant of g++, this should be set to 1 -MESSAGE( STATUS "CMAKE_COMPILER_IS_GNUCXX : " ${CMAKE_COMPILER_IS_GNUCXX} ) +message(STATUS "CMAKE_COMPILER_IS_GNUCXX : " ${CMAKE_COMPILER_IS_GNUCXX}) # the tools for creating libraries -MESSAGE( STATUS "CMAKE_AR: " ${CMAKE_AR} ) -MESSAGE( STATUS "CMAKE_RANLIB: " ${CMAKE_RANLIB} ) +message(STATUS "CMAKE_AR: " ${CMAKE_AR}) +message(STATUS "CMAKE_RANLIB: " ${CMAKE_RANLIB}) + +message(STATUS "CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX}) -MESSAGE( STATUS "CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX} ) +if(HAVE_DYNAMIC_SD_BACKENDS) + set(UNCOMMENT_SD_BACKEND_DIRECTORY "") +else() + set(UNCOMMENT_SD_BACKEND_DIRECTORY "# ") +endif() set(uncomment_dbi "#") @@ -510,260 +603,315 @@ set(CCVERSION ${CMAKE_CXX_COMPILER_VERSION}) set(CXX ${CMAKE_CXX_COMPILER}) set(CXXVERSION ${CMAKE_CXX_COMPILER_VERSION}) -IF( "${HAVE_OPENSSL}" ) - set(HAVE_TLS "1") -ENDIF() +if("${HAVE_OPENSSL}") + set(HAVE_TLS "1") +endif() -IF(NOT openssl) - unset(HAVE_OPENSSL) - unset(HAVE_TLS) -ENDIF() +if(NOT openssl) + unset(HAVE_OPENSSL) + unset(HAVE_TLS) +endif() -set(largefile_support "" ) +set(largefile_support "") -set(got_readline "${READLINE_FOUND}" ) -if ("${READLINE_FOUND}") - set(HAVE_READLINE 1) +set(got_readline "${READLINE_FOUND}") +if("${READLINE_FOUND}") + set(HAVE_READLINE 1) endif() -if ("${PAM_FOUND}") - set(HAVE_PAM 1) +if("${PAM_FOUND}") + set(HAVE_PAM 1) endif() -set(have_tls "${HAVE_TLS}" ) -set(have_crypto "${HAVE_CRYPTO}" ) -set(have_openssl "${HAVE_OPENSSL}" ) -set(have_zlib "${ZLIB_FOUND}" ) +set(have_tls "${HAVE_TLS}") +set(have_crypto "${HAVE_CRYPTO}") +set(have_openssl "${HAVE_OPENSSL}") +set(have_zlib "${ZLIB_FOUND}") -set(HAVE_CAPABILITY "${HAVE_CAPABILITY_H}" CACHE BOOL "compile with capability support") -if ("${HAVE_CAPABILITY}") - set(CAPABILITY_LIBS cap) - message( STATUS "CAPABILITY set") +set(HAVE_CAPABILITY + "${HAVE_CAPABILITY_H}" + CACHE BOOL "compile with capability support" +) +if("${HAVE_CAPABILITY}") + set(CAPABILITY_LIBS cap) + message(STATUS "CAPABILITY set") endif() -try_compile(HAVE_IS_TRIVIALLY_COPYABLE ${CMAKE_BINARY_DIR}/compile_tests ${PROJECT_SOURCE_DIR}/src/compile_tests/trivially_copyable.cc) +try_compile( + HAVE_IS_TRIVIALLY_COPYABLE ${CMAKE_BINARY_DIR}/compile_tests + ${PROJECT_SOURCE_DIR}/src/compile_tests/trivially_copyable.cc +) -set(ndmp "${ndmp}" ) -set(lmdb "${lmdb}" ) -set(build_client_only "${client-only}" ) -set(build_dird "${build-dird}" ) -set(build_stored "${build-stored}" ) -set(have_plugins "${have_plugins}" ) -set(have_afs "" ) +set(ndmp "${ndmp}") +set(lmdb "${lmdb}") +set(build_client_only "${client-only}") +set(build_dird "${build-dird}") +set(build_stored "${build-stored}") +set(have_plugins "${have_plugins}") +set(have_afs "") if(${acl}) if(NOT HAVE_WIN32) - if(${HAVE_SYS_ACL_H}) - set(HAVE_ACL 1) - Message(STATUS "acl found, libs: ${ACL_LIBS}") - else() - Message(FATAL_ERROR "build with acl requested, but lib not found") - endif() - endif() + if(${HAVE_SYS_ACL_H}) + set(HAVE_ACL 1) + message(STATUS "acl found, libs: ${ACL_LIBS}") + else() + message(FATAL_ERROR "build with acl requested, but lib not found") + endif() + endif() endif() if("${HAVE_SYS_XATTR_H}" OR "${HAVE_SYS_EXTATTR_H}") - set(HAVE_XATTR 1) - set(have_xattr YES) + set(HAVE_XATTR 1) + set(have_xattr YES) endif() if(${HAVE_RADOS_LIBRADOS_H}) - set(HAVE_CEPH_RADOS 1) - set(have_ceph_rados ${HAVE_CEPH_RADOS} ) + set(HAVE_CEPH_RADOS 1) + set(have_ceph_rados ${HAVE_CEPH_RADOS}) endif() if(${HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H}) - set(HAVE_CEPH_RADOS_STRIPER 1) - set(have_ceph_rados_striper ${HAVE_CEPH_RADOS_STRIPER}) + set(HAVE_CEPH_RADOS_STRIPER 1) + set(have_ceph_rados_striper ${HAVE_CEPH_RADOS_STRIPER}) endif() if(${HAVE_GLUSTERFS_API_GLFS_H}) - set(HAVE_GLUSTERFS 1) + set(HAVE_GLUSTERFS 1) endif() -set(have_glusterfs ${HAVE_GLUSTERFS_API_GLFS_H} ) -if (${HAVE_GLUSTERFS}) -include_directories(/usr/include/glusterfs) +set(have_glusterfs ${HAVE_GLUSTERFS_API_GLFS_H}) +if(${HAVE_GLUSTERFS}) + include_directories(/usr/include/glusterfs) endif() -if (NOT HAVE_WIN32) - if (${ndmp}) - set(HAVE_NDMP 1) - set(NDMP_LIBS bareosndmp) - endif() -ENDIF() +if(NOT HAVE_WIN32) + if(${ndmp}) + set(HAVE_NDMP 1) + set(NDMP_LIBS bareosndmp) + endif() +endif() -if (${lmdb}) - set(HAVE_LMDB 1) - set(LMDB_LIBS bareoslmdb) +if(${lmdb}) + set(HAVE_LMDB 1) + set(LMDB_LIBS bareoslmdb) endif() -# info what the config files need to be installed -##### PLUGINS ############ -SET(PLUGINS python-ldap-conf.d) +# info what the config files need to be installed PLUGINS ############ +set(PLUGINS python-ldap-conf.d) if(${HAVE_CEPHFS}) -LIST(APPEND PLUGINS cephfs-conf.d) + list(APPEND PLUGINS cephfs-conf.d) endif() if(${HAVE_CEPH_RADOS}) -LIST(APPEND PLUGINS rados-conf.d) + list(APPEND PLUGINS rados-conf.d) endif() if(${HAVE_GLUSTERFS}) -LIST(APPEND PLUGINS gfapi-conf.d) -endif() - -##### BACKENDS #### -IF(build_client_only) - SET(BACKENDS "") -ELSE() - SET(BACKENDS unix_tape_device.d) - LIST(APPEND BACKENDS unix_fifo_device.d) - if(${HAVE_CEPHFS}) - LIST(APPEND BACKENDS rados_device.d) - endif() - if(${HAVE_GLUSTERFS}) - LIST(APPEND BACKENDS gfapi_device.d) - endif() - if(${HAVE_DROPLET}) - LIST(APPEND BACKENDS droplet_device.d) - endif() -ENDIF() - -set(have_elasto "" ) -set(support_systemd "" ) -set(batch_insert_db_backends "" ) -set(have_cmocka "" ) + list(APPEND PLUGINS gfapi-conf.d) +endif() + +# BACKENDS #### +if(build_client_only) + set(BACKENDS "") +else() + set(BACKENDS unix_tape_device.d) + list(APPEND BACKENDS unix_fifo_device.d) + if(${HAVE_CEPHFS}) + list(APPEND BACKENDS rados_device.d) + endif() + if(${HAVE_GLUSTERFS}) + list(APPEND BACKENDS gfapi_device.d) + endif() + if(${HAVE_DROPLET}) + list(APPEND BACKENDS droplet_device.d) + endif() +endif() + +set(have_elasto "") +set(support_systemd "") +set(batch_insert_db_backends "") +set(have_cmocka "") set(_PATH_BAREOS_BACKENDDIR \"${backenddir}\") set(_PATH_BAREOS_PIDDIR \"${piddir}\") set(_PATH_BAREOS_WORKINGDIR \"${workingdir}\") -IF(HAVE_WIN32) - INSTALL(DIRECTORY DESTINATION var/log) -ENDIF() +if(HAVE_WIN32) + install(DIRECTORY DESTINATION var/log) +endif() -INSTALL(DIRECTORY DESTINATION ${logdir}) -INSTALL(DIRECTORY DESTINATION ${workingdir}) +install(DIRECTORY DESTINATION ${logdir}) +install(DIRECTORY DESTINATION ${workingdir}) -INCLUDE(BareosConfigureFile) +include(BareosConfigureFile) add_subdirectory(scripts) add_subdirectory(manpages) add_subdirectory(platforms) add_subdirectory(src) -INCLUDE(BareosLocalBuildDefinitions OPTIONAL RESULT_VARIABLE BareosLocalBuildDefinitionsFile) +include(BareosLocalBuildDefinitions OPTIONAL + RESULT_VARIABLE BareosLocalBuildDefinitionsFile +) -STRING(TIMESTAMP NOW "%Y-%m-%d %H:%M:%S") +string(TIMESTAMP NOW "%Y-%m-%d %H:%M:%S") # give configure output -MESSAGE(" ") -MESSAGE("Configuration on ${NOW} : ") -MESSAGE(" ") - -MESSAGE(" Host: ${host} -- ${DISTNAME} ${DISTVER} ") -MESSAGE(" Bareos version: ${BAREOS} ${BAREOS_FULL_VERSION} (${DATE}) ") -MESSAGE(" Distribution: ${DISTNAME} OBS PROJECT:${OBS_PROJECT} OBS DIST:${OBS_DISTRIBUTION} OBS ARCH:${OBS_ARCH}") -MESSAGE(" Source code location: ${srcdir} ") -MESSAGE(" Modify Debian Control file: ${GENERATE_DEBIAN_CONTROL} ") -MESSAGE(" Install binaries: ${bindir} ") -MESSAGE(" Install system binaries: ${sbindir} ") -MESSAGE(" Install libraries: ${libdir} ") -MESSAGE(" Install system config files: ${sysconfdir} ") -MESSAGE(" Install Bareos config dir: ${confdir} ") -MESSAGE(" Install Bareos config files: ${configtemplatedir} ") -MESSAGE(" Log directory: ${logdir} ") -MESSAGE(" Scripts directory: ${scriptdir} ") -MESSAGE(" Archive directory: ${archivedir} ") -MESSAGE(" Working directory: ${workingdir} ") -MESSAGE(" BSR directory: ${bsrdir} ") -MESSAGE(" PID directory: ${piddir} ") -MESSAGE(" Subsys directory: ${subsysdir} ") -MESSAGE(" Man directory: ${mandir} ") -MESSAGE(" Data directory: ${datarootdir} ") -MESSAGE(" Backend directory: ${backenddir} ") -MESSAGE(" Plugin directory: ${plugindir} ") -MESSAGE(" C Compiler: ${CC} ${CCVERSION} ") -MESSAGE(" C++ Compiler: ${CXX} ${CXXVERSION} ") -MESSAGE(" C Compiler flags: ${CMAKE_C_FLAGS} ") -MESSAGE(" C++ Compiler flags: ${CMAKE_CXX_FLAGS} ") -MESSAGE(" Linker flags: ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS} ") -MESSAGE(" Libraries: ${LIBS} ") -MESSAGE(" Statically Linked Tools: ${support_static_tools} ") -MESSAGE(" Statically Linked FD: ${support_static_fd} ") -MESSAGE(" Statically Linked SD: ${support_static_sd} ") -MESSAGE(" Statically Linked DIR: ${support_static_dir} ") -MESSAGE(" Statically Linked CONS: ${support_static_cons} ") -MESSAGE(" Database backends: ${db_backends} ") -MESSAGE(" Database port: ${db_port} ") -MESSAGE(" Database name: ${db_name} ") -MESSAGE(" Database user: ${db_user} ") -MESSAGE(" Database version: ${BDB_VERSION} ") -MESSAGE(" ") -MESSAGE(" Job Output Email: ${job_email} ") -MESSAGE(" Traceback Email: ${dump_email} ") -MESSAGE(" SMTP Host Address: ${smtp_host} ") -MESSAGE(" ") -MESSAGE(" Director Port: ${dir_port} ") -MESSAGE(" File daemon Port: ${fd_port} ") -MESSAGE(" Storage daemon Port: ${sd_port} ") -MESSAGE(" ") -MESSAGE(" Director User: ${dir_user} ") -MESSAGE(" Director Group: ${dir_group} ") -MESSAGE(" Storage Daemon User: ${sd_user} ") -MESSAGE(" Storage DaemonGroup: ${sd_group} ") -MESSAGE(" File Daemon User: ${fd_user} ") -MESSAGE(" File Daemon Group: ${fd_group} ") -MESSAGE(" ") -MESSAGE(" Large file support: ${largefile_support}") -MESSAGE(" readline support: ${got_readline} ROOT_DIR:${Readline_ROOT_DIR} INCLUDE_DIR:${Readline_INCLUDE_DIR} LIBRARY:${Readline_LIBRARY} - ") -MESSAGE(" TCP Wrappers support: ${WRAP_FOUND} ${WRAP_LIBRARIES} ${WRAP_INCLUDE_DIRS} ") -MESSAGE(" TLS support: ${have_tls} ") -MESSAGE(" Encryption support: ${have_crypto} ") -MESSAGE(" OpenSSL support: ${OPENSSL_FOUND} ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIR} ${OPENSSL_LIBRARIES} ") -MESSAGE(" PAM support: ${PAM_FOUND} ${PAM_LIBRARIES} ${PAM_INCLUDE_DIRS} ") -MESSAGE(" ZLIB support: ${ZLIB_FOUND} ${ZLIB_LIBRARIES} ${ZLIB_INCLUDE_DIRS} ") -MESSAGE(" LZO2 support: ${LZO2_FOUND} ${LZO2_LIBRARIES} ${LZO2_INCLUDE_DIRS} ") -MESSAGE(" JANSSON support: ${JANSSON_FOUND} ${JANSSON_LIBRARIES} ${JANSSON_INCLUDE_DIRS} ") -MESSAGE(" LMDB support: ${lmdb} ") -MESSAGE(" NDMP support: ${ndmp} ") -MESSAGE(" Build ndmjob binary: ${build_ndmjob} ") -MESSAGE(" enable-lockmgr: ${lockmgr} ") -MESSAGE(" bat support: ${support_bat} ") -MESSAGE(" tray-monitor support: ${HAVE_TRAYMONITOR} ") -MESSAGE(" test-plugin support: ${HAVE_TEST_PLUGIN} ") -MESSAGE(" client-only: ${build_client_only} ") -MESSAGE(" build-dird: ${build_dird} ") -MESSAGE(" build-stored: ${build_stored} ") -MESSAGE(" Plugin support: ${have_plugins} ") -MESSAGE(" AFS support: ${have_afs} ") -MESSAGE(" ACL support: ${HAVE_ACL} ${ACL_LIBS}") -MESSAGE(" XATTR support: ${have_xattr} ") -MESSAGE(" SCSI Crypto support: ${scsi-crypto} ${HAVE_LOWLEVEL_SCSI_INTERFACE} ") -MESSAGE(" GFAPI(GLUSTERFS) support: ${GFAPI_FOUND} ${GFAPI_LIBRARIES} ${GFAPI_INCLUDE_DIRS} ") -MESSAGE(" DROPLET support: ${DROPLET_FOUND} ${DROPLET_LIBRARIES} ${DROPLET_INCLUDE_DIRS} ") -MESSAGE(" CEPH RADOS support: ${RADOS_FOUND} ${RADOS_LIBRARIES} ${RADOS_INCLUDE_DIRS} ") -MESSAGE(" RADOS striping support: ${RADOSSTRIPER_FOUND} ${RADOSSTRIPER_LIBRARIES} ${RADOSSTRIPER_INCLUDE_DIRS} ") -MESSAGE(" CEPHFS support: ${CEPHFS_FOUND} ${CEPHFS_LIBRARIES} ${CEPHFS_INCLUDE_DIRS} ") -MESSAGE(" ELASTO support: ${have_elasto} ") -MESSAGE(" Python support: ${PYTHONLIBS_FOUND} ${PYTHONLIBS_VERSION_STRING} ${PYTHON_INCLUDE_PATH}") -MESSAGE(" systemd support: ${WITH_SYSTEMD} ${SYSTEMD_UNITDIR}") -MESSAGE(" Batch insert enabled: ${USE_BATCH_FILE_INSERT}") +message(" ") +message("Configuration on ${NOW} : ") +message(" ") + +message(" Host: ${host} -- ${DISTNAME} ${DISTVER} ") +message( + " Bareos version: ${BAREOS} ${BAREOS_FULL_VERSION} (${DATE}) " +) +message( + " Distribution: ${DISTNAME} OBS PROJECT:${OBS_PROJECT} OBS DIST:${OBS_DISTRIBUTION} OBS ARCH:${OBS_ARCH}" +) +message(" Source code location: ${srcdir} ") +message(" Modify Debian Control file: ${GENERATE_DEBIAN_CONTROL} ") +message(" Install binaries: ${bindir} ") +message(" Install system binaries: ${sbindir} ") +message(" Install libraries: ${libdir} ") +message(" Install system config files: ${sysconfdir} ") +message(" Install Bareos config dir: ${confdir} ") +message(" Install Bareos config files: ${configtemplatedir} ") +message(" Log directory: ${logdir} ") +message(" Scripts directory: ${scriptdir} ") +message(" Archive directory: ${archivedir} ") +message(" Working directory: ${workingdir} ") +message(" BSR directory: ${bsrdir} ") +message(" PID directory: ${piddir} ") +message(" Subsys directory: ${subsysdir} ") +message(" Man directory: ${mandir} ") +message(" Data directory: ${datarootdir} ") +message(" Backend directory: ${backenddir} ") +message(" Plugin directory: ${plugindir} ") +message(" C Compiler: ${CC} ${CCVERSION} ") +message(" C++ Compiler: ${CXX} ${CXXVERSION} ") +message(" C Compiler flags: ${CMAKE_C_FLAGS} ") +message(" C++ Compiler flags: ${CMAKE_CXX_FLAGS} ") +message( + " Linker flags: ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS} " +) +message(" Libraries: ${LIBS} ") +message(" Statically Linked Tools: ${support_static_tools} ") +message(" Statically Linked FD: ${support_static_fd} ") +message(" Statically Linked SD: ${support_static_sd} ") +message(" Statically Linked DIR: ${support_static_dir} ") +message(" Statically Linked CONS: ${support_static_cons} ") +message(" Database backends: ${db_backends} ") +message(" Database port: ${db_port} ") +message(" Database name: ${db_name} ") +message(" Database user: ${db_user} ") +message(" Database version: ${BDB_VERSION} ") +message(" ") +message(" Job Output Email: ${job_email} ") +message(" Traceback Email: ${dump_email} ") +message(" SMTP Host Address: ${smtp_host} ") +message(" ") +message(" Director Port: ${dir_port} ") +message(" File daemon Port: ${fd_port} ") +message(" Storage daemon Port: ${sd_port} ") +message(" ") +message(" Director User: ${dir_user} ") +message(" Director Group: ${dir_group} ") +message(" Storage Daemon User: ${sd_user} ") +message(" Storage DaemonGroup: ${sd_group} ") +message(" File Daemon User: ${fd_user} ") +message(" File Daemon Group: ${fd_group} ") +message(" ") +message(" Large file support: ${largefile_support}") +message( + " readline support: ${got_readline} ROOT_DIR:${Readline_ROOT_DIR} INCLUDE_DIR:${Readline_INCLUDE_DIR} LIBRARY:${Readline_LIBRARY} + " +) +message( + " TCP Wrappers support: ${WRAP_FOUND} ${WRAP_LIBRARIES} ${WRAP_INCLUDE_DIRS} " +) +message(" TLS support: ${have_tls} ") +message(" Encryption support: ${have_crypto} ") +message( + " OpenSSL support: ${OPENSSL_FOUND} ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIR} ${OPENSSL_LIBRARIES} " +) +message( + " PAM support: ${PAM_FOUND} ${PAM_LIBRARIES} ${PAM_INCLUDE_DIRS} " +) +message( + " ZLIB support: ${ZLIB_FOUND} ${ZLIB_LIBRARIES} ${ZLIB_INCLUDE_DIRS} " +) +message( + " LZO2 support: ${LZO2_FOUND} ${LZO2_LIBRARIES} ${LZO2_INCLUDE_DIRS} " +) +message( + " JANSSON support: ${JANSSON_FOUND} ${JANSSON_LIBRARIES} ${JANSSON_INCLUDE_DIRS} " +) +message(" LMDB support: ${lmdb} ") +message(" NDMP support: ${ndmp} ") +message(" Build ndmjob binary: ${build_ndmjob} ") +message(" enable-lockmgr: ${lockmgr} ") +message(" bat support: ${support_bat} ") +message(" tray-monitor support: ${HAVE_TRAYMONITOR} ") +message(" test-plugin support: ${HAVE_TEST_PLUGIN} ") +message(" client-only: ${build_client_only} ") +message(" build-dird: ${build_dird} ") +message(" build-stored: ${build_stored} ") +message(" Plugin support: ${have_plugins} ") +message(" AFS support: ${have_afs} ") +message(" ACL support: ${HAVE_ACL} ${ACL_LIBS}") +message(" XATTR support: ${have_xattr} ") +message( + " SCSI Crypto support: ${scsi-crypto} ${HAVE_LOWLEVEL_SCSI_INTERFACE} " +) +message( + " GFAPI(GLUSTERFS) support: ${GFAPI_FOUND} ${GFAPI_LIBRARIES} ${GFAPI_INCLUDE_DIRS} " +) +message( + " DROPLET support: ${DROPLET_FOUND} ${DROPLET_LIBRARIES} ${DROPLET_INCLUDE_DIRS} " +) +message( + " CEPH RADOS support: ${RADOS_FOUND} ${RADOS_LIBRARIES} ${RADOS_INCLUDE_DIRS} " +) +message( + " RADOS striping support: ${RADOSSTRIPER_FOUND} ${RADOSSTRIPER_LIBRARIES} ${RADOSSTRIPER_INCLUDE_DIRS} " +) +message( + " CEPHFS support: ${CEPHFS_FOUND} ${CEPHFS_LIBRARIES} ${CEPHFS_INCLUDE_DIRS} " +) +message(" ELASTO support: ${have_elasto} ") +message( + " Python support: ${PYTHONLIBS_FOUND} ${PYTHONLIBS_VERSION_STRING} ${PYTHON_INCLUDE_PATH}" +) +message(" systemd support: ${WITH_SYSTEMD} ${SYSTEMD_UNITDIR}") +message(" Batch insert enabled: ${USE_BATCH_FILE_INSERT}") if(GTEST_FOUND) - MESSAGE(" gtest support: ${GTEST_FOUND} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ") + message( + " gtest support: ${GTEST_FOUND} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} " + ) if(GMOCK_FOUND) - MESSAGE(" gmock support: ${GMOCK_FOUND} ${GMOCK_LIBRARIES} ") + message( + " gmock support: ${GMOCK_FOUND} ${GMOCK_LIBRARIES} " + ) else() - MESSAGE(" gmock support: ${GMOCK_FOUND} (some unit tests will be disabled)") + message( + " gmock support: ${GMOCK_FOUND} (some unit tests will be disabled)" + ) endif() else() - MESSAGE(" gtest support: ${GTEST_FOUND} (unit tests will be disabled)") + message( + " gtest support: ${GTEST_FOUND} (unit tests will be disabled)" + ) endif() -MESSAGE(" Intl support: ${Intl_FOUND} ${INTLINCLUDE_DIRS} ${INTL_LIBRARIES}") +message( + " Intl support: ${Intl_FOUND} ${INTLINCLUDE_DIRS} ${INTL_LIBRARIES}" +) -MESSAGE(" Dynamic cats backends: ${dynamic-cats-backends} ${HAVE_DYNAMIC_CATS_BACKENDS} ") -MESSAGE(" Dynamic storage backends: ${dynamic-storage-backends} ${HAVE_DYNAMIC_SD_BACKENDS} ") -MESSAGE(" Build for Test Coverage : ${coverage} ") +message( + " Dynamic cats backends: ${dynamic-cats-backends} ${HAVE_DYNAMIC_CATS_BACKENDS} " +) +message( + " Dynamic storage backends: ${dynamic-storage-backends} ${HAVE_DYNAMIC_SD_BACKENDS} " +) +message(" Build for Test Coverage : ${coverage} ") message(" PSCMD: ${PSCMD}") message(" PS: ${PS}") @@ -779,15 +927,18 @@ message(" HAVE_IS_TRIVIALLY_COPYABLE: ${HAVE_IS_TRIVIALLY_COPYABLE}") message(" do-static-code-checks: ${DO_STATIC_CODE_CHECKS}") if(DO_STATIC_CODE_CHECKS) -message(" static code check tools:") -message(" CMAKE_CXX_INCLUDE_WHAT_YOU_USE: ${CMAKE_CXX_INCLUDE_WHAT_YOU_USE}") -message(" CMAKE_CXX_CLANG_TIDY: ${CMAKE_CXX_CLANG_TIDY}") -message(" CMAKE_CXX_CPPCHECK: ${CMAKE_CXX_CPPCHECK}") -message(" CMAKE_CXX_CPPLINT: ${CMAKE_CXX_CPPLINT}") -message(" CMAKE_LINK_WHAT_YOU_USE: ${CMAKE_LINK_WHAT_YOU_USE}") -endif() - -IF(HAVE_WIN32) - message(" WINDOWS_VERSION: ${WINDOWS_VERSION}") - message(" WINDOWS_BITS: ${WINDOWS_BITS}") -ENDIF() + message(" static code check tools:") + message( + " CMAKE_CXX_INCLUDE_WHAT_YOU_USE: ${CMAKE_CXX_INCLUDE_WHAT_YOU_USE}" + ) + message(" CMAKE_CXX_CLANG_TIDY: ${CMAKE_CXX_CLANG_TIDY}") + message(" CMAKE_CXX_CPPCHECK: ${CMAKE_CXX_CPPCHECK}") + message(" CMAKE_CXX_CPPLINT: ${CMAKE_CXX_CPPLINT}") + message(" CMAKE_LINK_WHAT_YOU_USE: ${CMAKE_LINK_WHAT_YOU_USE}") +endif() + +if(HAVE_WIN32) + message(" WINDOWS_VERSION: ${WINDOWS_VERSION}") + message(" WINDOWS_BITS: ${WINDOWS_BITS}") + message(" WINEPATH environment: $ENV{WINEPATH}") +endif() diff --git a/core/CTestConfig.cmake b/core/CTestConfig.cmake index 94b3a04aec7..352e61187e0 100644 --- a/core/CTestConfig.cmake +++ b/core/CTestConfig.cmake @@ -1,28 +1,15 @@ -# BAREOS® - Backup Archiving REcovery Open Sourced +# This file should be placed in the root directory of your project. +# Then modify the CMakeLists.txt file in the root directory of your +# project to incorporate the testing dashboard. # -# Copyright (C) 2019-2019 Bareos GmbH & Co. KG -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of version three of the GNU Affero General Public -# License as published by the Free Software Foundation and included -# in the file LICENSE. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# # The following are required to submit to the CDash dashboard: +# ENABLE_TESTING() +# INCLUDE(CTest) set(CTEST_PROJECT_NAME "Bareos") -set(CTEST_NIGHTLY_START_TIME "13:00:00 CET") +set(CTEST_NIGHTLY_START_TIME "23:00:00 CET") -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") +set(CTEST_DROP_METHOD "https") +set(CTEST_DROP_SITE "cdash.bareos.org") set(CTEST_DROP_LOCATION "/submit.php?project=Bareos") set(CTEST_DROP_SITE_CDASH TRUE) - -set(UPDATE_COMMAND "git") diff --git a/core/cmake/BareosCheckFunctions.cmake b/core/cmake/BareosCheckFunctions.cmake index 3a9aceae005..a24c52487d6 100644 --- a/core/cmake/BareosCheckFunctions.cmake +++ b/core/cmake/BareosCheckFunctions.cmake @@ -17,105 +17,109 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -INCLUDE (CheckFunctionExists) +include(CheckFunctionExists) -CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL) -CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE) -CHECK_FUNCTION_EXISTS(backtrace_symbols HAVE_BACKTRACE_SYMBOLS) -CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) -CHECK_FUNCTION_EXISTS(fchdir HAVE_FCHDIR) -CHECK_FUNCTION_EXISTS(fchmod HAVE_FCHMOD) -CHECK_FUNCTION_EXISTS(fchown HAVE_FCHOWN) +check_function_exists(strtoll HAVE_STRTOLL) +check_function_exists(backtrace HAVE_BACKTRACE) +check_function_exists(backtrace_symbols HAVE_BACKTRACE_SYMBOLS) +check_function_exists(bcopy HAVE_BCOPY) +check_function_exists(fchdir HAVE_FCHDIR) +check_function_exists(fchmod HAVE_FCHMOD) +check_function_exists(fchown HAVE_FCHOWN) -CHECK_FUNCTION_EXISTS(add_proplist_entry HAVE_ADD_PROPLIST_ENTRY) +check_function_exists(add_proplist_entry HAVE_ADD_PROPLIST_ENTRY) # CHECK_FUNCTION_EXISTS(chflags HAVE_CHFLAGS) -CHECK_FUNCTION_EXISTS(closefrom HAVE_CLOSEFROM) -CHECK_FUNCTION_EXISTS(extattr_get_file HAVE_EXTATTR_GET_FILE) -CHECK_FUNCTION_EXISTS(extattr_get_link HAVE_EXTATTR_GET_LINK) -CHECK_FUNCTION_EXISTS(extattr_list_file HAVE_EXTATTR_LIST_FILE) -CHECK_FUNCTION_EXISTS(extattr_list_link HAVE_EXTATTR_LIST_LINK) -CHECK_FUNCTION_EXISTS(extattr_namespace_to_string HAVE_EXTATTR_NAMESPACE_TO_STRING) -CHECK_FUNCTION_EXISTS(extattr_set_file HAVE_EXTATTR_SET_FILE) -CHECK_FUNCTION_EXISTS(extattr_set_link HAVE_EXTATTR_SET_LINK) -CHECK_FUNCTION_EXISTS(extattr_string_to_namespace HAVE_EXTATTR_STRING_TO_NAMESPACE) -CHECK_FUNCTION_EXISTS(fchownat HAVE_FCHOWNAT) -CHECK_FUNCTION_EXISTS(fdatasync HAVE_FDATASYNC) -CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO) -CHECK_FUNCTION_EXISTS(futimens HAVE_FUTIMENS) -CHECK_FUNCTION_EXISTS(futimes HAVE_FUTIMES) -CHECK_FUNCTION_EXISTS(futimesat HAVE_FUTIMESAT) -CHECK_FUNCTION_EXISTS(getaddrinfo HAVE_GETADDRINFO) -CHECK_FUNCTION_EXISTS(getcwd HAVE_GETCWD) -CHECK_FUNCTION_EXISTS(getea HAVE_GETEA) -CHECK_FUNCTION_EXISTS(gethostbyname2 HAVE_GETHOSTBYNAME2) -CHECK_FUNCTION_EXISTS(gethostid HAVE_GETHOSTID) -CHECK_FUNCTION_EXISTS(gethostname HAVE_GETHOSTNAME) -CHECK_FUNCTION_EXISTS(getmntent HAVE_GETMNTENT) -CHECK_FUNCTION_EXISTS(getmntinfo HAVE_GETMNTINFO) -CHECK_FUNCTION_EXISTS(getpagesize HAVE_GETPAGESIZE) -CHECK_FUNCTION_EXISTS(getpid HAVE_GETPID) -CHECK_FUNCTION_EXISTS(getproplist HAVE_GETPROPLIST) -CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) -CHECK_FUNCTION_EXISTS(getxattr HAVE_GETXATTR) -CHECK_FUNCTION_EXISTS(get_proplist_entry HAVE_GET_PROPLIST_ENTRY) -CHECK_FUNCTION_EXISTS(glfs_readdirplus HAVE_GLFS_READDIRPLUS) -CHECK_FUNCTION_EXISTS(glob HAVE_GLOB) -CHECK_FUNCTION_EXISTS(inet_ntop HAVE_INET_NTOP) -CHECK_FUNCTION_EXISTS(inet_pton HAVE_INET_PTON) -CHECK_FUNCTION_EXISTS(lchmod HAVE_LCHMOD) -CHECK_FUNCTION_EXISTS(lchown HAVE_LCHOWN) -CHECK_FUNCTION_EXISTS(lgetea HAVE_LGETEA) -CHECK_FUNCTION_EXISTS(lgetxattr HAVE_LGETXATTR) -CHECK_FUNCTION_EXISTS(listea HAVE_LISTEA) -CHECK_FUNCTION_EXISTS(listxattr HAVE_LISTXATTR) -CHECK_FUNCTION_EXISTS(llistea HAVE_LLISTEA) -CHECK_FUNCTION_EXISTS(llistxattr HAVE_LLISTXATTR) -CHECK_FUNCTION_EXISTS(localtime_r HAVE_LOCALTIME_R) -CHECK_FUNCTION_EXISTS(lsetea HAVE_LSETEA) -CHECK_FUNCTION_EXISTS(lsetxattr HAVE_LSETXATTR) -CHECK_FUNCTION_EXISTS(lstat HAVE_LSTAT) -CHECK_FUNCTION_EXISTS(lutimes HAVE_LUTIMES) -CHECK_FUNCTION_EXISTS(malloc_trim HAVE_MALLOC_TRIM) -CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP) -CHECK_FUNCTION_EXISTS(nl_langinfo HAVE_NL_LANGINFO) -CHECK_FUNCTION_EXISTS(openat HAVE_OPENAT) -CHECK_FUNCTION_EXISTS(poll HAVE_POLL) -CHECK_FUNCTION_EXISTS(posix_fadvise HAVE_POSIX_FADVISE) -CHECK_FUNCTION_EXISTS(prctl HAVE_PRCTL) -CHECK_FUNCTION_EXISTS(putenv HAVE_PUTENV) -CHECK_FUNCTION_EXISTS(readdir_r HAVE_READDIR_R) -CHECK_FUNCTION_EXISTS(select HAVE_SELECT) -CHECK_FUNCTION_EXISTS(setea HAVE_SETEA) -CHECK_FUNCTION_EXISTS(setenv HAVE_SETENV) -CHECK_FUNCTION_EXISTS(setlocale HAVE_SETLOCALE) -CHECK_FUNCTION_EXISTS(setpgid HAVE_SETPGID) -CHECK_FUNCTION_EXISTS(setpgrp HAVE_SETPGRP) -CHECK_FUNCTION_EXISTS(setproplist HAVE_SETPROPLIST) -CHECK_FUNCTION_EXISTS(setreuid HAVE_SETREUID) -CHECK_FUNCTION_EXISTS(setsid HAVE_SETSID) -CHECK_FUNCTION_EXISTS(setxattr HAVE_SETXATTR) -CHECK_FUNCTION_EXISTS(hl_loa HAVE_HL_LOA) -CHECK_FUNCTION_EXISTS(signal HAVE_SIGNAL) -CHECK_FUNCTION_EXISTS(sizeof_proplist_entry HAVE_SIZEOF_PROPLIST_ENTRY) -CHECK_FUNCTION_EXISTS(sqlite3_threadsafe HAVE_SQLITE3_THREADSAFE) -CHECK_FUNCTION_EXISTS(stpcpy HAVE_STPCPY) -CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP) -CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) -CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R) -CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME) -CHECK_FUNCTION_EXISTS(strncmp HAVE_STRNCMP) -CHECK_FUNCTION_EXISTS(strncpy HAVE_STRNCPY) -CHECK_FUNCTION_EXISTS(tcgetattr HAVE_TCGETATTR) -CHECK_FUNCTION_EXISTS(unlinkat HAVE_UNLINKAT) -CHECK_FUNCTION_EXISTS(utimes HAVE_UTIMES) -CHECK_FUNCTION_EXISTS(vfprintf HAVE_VFPRINTF) -CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) -CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF) -CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF) +check_function_exists(closefrom HAVE_CLOSEFROM) +check_function_exists(extattr_get_file HAVE_EXTATTR_GET_FILE) +check_function_exists(extattr_get_link HAVE_EXTATTR_GET_LINK) +check_function_exists(extattr_list_file HAVE_EXTATTR_LIST_FILE) +check_function_exists(extattr_list_link HAVE_EXTATTR_LIST_LINK) +check_function_exists( + extattr_namespace_to_string HAVE_EXTATTR_NAMESPACE_TO_STRING +) +check_function_exists(extattr_set_file HAVE_EXTATTR_SET_FILE) +check_function_exists(extattr_set_link HAVE_EXTATTR_SET_LINK) +check_function_exists( + extattr_string_to_namespace HAVE_EXTATTR_STRING_TO_NAMESPACE +) +check_function_exists(fchownat HAVE_FCHOWNAT) +check_function_exists(fdatasync HAVE_FDATASYNC) +check_function_exists(fseeko HAVE_FSEEKO) +check_function_exists(futimens HAVE_FUTIMENS) +check_function_exists(futimes HAVE_FUTIMES) +check_function_exists(futimesat HAVE_FUTIMESAT) +check_function_exists(getaddrinfo HAVE_GETADDRINFO) +check_function_exists(getcwd HAVE_GETCWD) +check_function_exists(getea HAVE_GETEA) +check_function_exists(gethostbyname2 HAVE_GETHOSTBYNAME2) +check_function_exists(gethostid HAVE_GETHOSTID) +check_function_exists(gethostname HAVE_GETHOSTNAME) +check_function_exists(getmntent HAVE_GETMNTENT) +check_function_exists(getmntinfo HAVE_GETMNTINFO) +check_function_exists(getpagesize HAVE_GETPAGESIZE) +check_function_exists(getpid HAVE_GETPID) +check_function_exists(getproplist HAVE_GETPROPLIST) +check_function_exists(gettimeofday HAVE_GETTIMEOFDAY) +check_function_exists(getxattr HAVE_GETXATTR) +check_function_exists(get_proplist_entry HAVE_GET_PROPLIST_ENTRY) +check_function_exists(glfs_readdirplus HAVE_GLFS_READDIRPLUS) +check_function_exists(glob HAVE_GLOB) +check_function_exists(inet_ntop HAVE_INET_NTOP) +check_function_exists(inet_pton HAVE_INET_PTON) +check_function_exists(lchmod HAVE_LCHMOD) +check_function_exists(lchown HAVE_LCHOWN) +check_function_exists(lgetea HAVE_LGETEA) +check_function_exists(lgetxattr HAVE_LGETXATTR) +check_function_exists(listea HAVE_LISTEA) +check_function_exists(listxattr HAVE_LISTXATTR) +check_function_exists(llistea HAVE_LLISTEA) +check_function_exists(llistxattr HAVE_LLISTXATTR) +check_function_exists(localtime_r HAVE_LOCALTIME_R) +check_function_exists(lsetea HAVE_LSETEA) +check_function_exists(lsetxattr HAVE_LSETXATTR) +check_function_exists(lstat HAVE_LSTAT) +check_function_exists(lutimes HAVE_LUTIMES) +check_function_exists(malloc_trim HAVE_MALLOC_TRIM) +check_function_exists(nanosleep HAVE_NANOSLEEP) +check_function_exists(nl_langinfo HAVE_NL_LANGINFO) +check_function_exists(openat HAVE_OPENAT) +check_function_exists(poll HAVE_POLL) +check_function_exists(posix_fadvise HAVE_POSIX_FADVISE) +check_function_exists(prctl HAVE_PRCTL) +check_function_exists(putenv HAVE_PUTENV) +check_function_exists(readdir_r HAVE_READDIR_R) +check_function_exists(select HAVE_SELECT) +check_function_exists(setea HAVE_SETEA) +check_function_exists(setenv HAVE_SETENV) +check_function_exists(setlocale HAVE_SETLOCALE) +check_function_exists(setpgid HAVE_SETPGID) +check_function_exists(setpgrp HAVE_SETPGRP) +check_function_exists(setproplist HAVE_SETPROPLIST) +check_function_exists(setreuid HAVE_SETREUID) +check_function_exists(setsid HAVE_SETSID) +check_function_exists(setxattr HAVE_SETXATTR) +check_function_exists(hl_loa HAVE_HL_LOA) +check_function_exists(signal HAVE_SIGNAL) +check_function_exists(sizeof_proplist_entry HAVE_SIZEOF_PROPLIST_ENTRY) +check_function_exists(sqlite3_threadsafe HAVE_SQLITE3_THREADSAFE) +check_function_exists(stpcpy HAVE_STPCPY) +check_function_exists(strcasecmp HAVE_STRCASECMP) +check_function_exists(strerror HAVE_STRERROR) +check_function_exists(strerror_r HAVE_STRERROR_R) +check_function_exists(strftime HAVE_STRFTIME) +check_function_exists(strncmp HAVE_STRNCMP) +check_function_exists(strncpy HAVE_STRNCPY) +check_function_exists(tcgetattr HAVE_TCGETATTR) +check_function_exists(unlinkat HAVE_UNLINKAT) +check_function_exists(utimes HAVE_UTIMES) +check_function_exists(vfprintf HAVE_VFPRINTF) +check_function_exists(snprintf HAVE_SNPRINTF) +check_function_exists(vsnprintf HAVE_VSNPRINTF) +check_function_exists(vprintf HAVE_VPRINTF) -CHECK_FUNCTION_EXISTS(dcgettext HAVE_DCGETTEXT) -CHECK_FUNCTION_EXISTS(fork HAVE_FORK) -CHECK_FUNCTION_EXISTS(gai_strerror HAVE_GAI_STRERROR) -CHECK_FUNCTION_EXISTS(gethostbyname_r HAVE_GETHOSTBYNAME_R) -CHECK_FUNCTION_EXISTS(gettext HAVE_GETTEXT) -CHECK_FUNCTION_EXISTS(glfs_readdirplus HAVE_GLFS_READDIRPLUS) +check_function_exists(dcgettext HAVE_DCGETTEXT) +check_function_exists(fork HAVE_FORK) +check_function_exists(gai_strerror HAVE_GAI_STRERROR) +check_function_exists(gethostbyname_r HAVE_GETHOSTBYNAME_R) +check_function_exists(gettext HAVE_GETTEXT) +check_function_exists(glfs_readdirplus HAVE_GLFS_READDIRPLUS) diff --git a/core/cmake/BareosCheckIncludes.cmake b/core/cmake/BareosCheckIncludes.cmake index 0ec89a68347..eacbcf161ce 100644 --- a/core/cmake/BareosCheckIncludes.cmake +++ b/core/cmake/BareosCheckIncludes.cmake @@ -17,123 +17,126 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - -INCLUDE (CheckIncludeFiles) - -CHECK_INCLUDE_FILES(rpc/rpc.h HAVE_RPC_RPC_H) -CHECK_INCLUDE_FILES(alloca.h HAVE_ALLOCA_H) -CHECK_INCLUDE_FILES(tcpd.h HAVE_TCPD_H) -CHECK_INCLUDE_FILES(afs/afsint.h HAVE_AFS_AFSINT_H) -CHECK_INCLUDE_FILES(afs/venus.h HAVE_AFS_VENUS_H) -CHECK_INCLUDE_FILES(arpa/nameser.h HAVE_ARPA_NAMESER_H) -CHECK_INCLUDE_FILES(attr.h HAVE_ATTR_H) -CHECK_INCLUDE_FILES(curses.h HAVE_CURSES_H) -CHECK_INCLUDE_FILES(demangle.h HAVE_DEMANGLE_H) -CHECK_INCLUDE_FILES(dlfcn.h HAVE_DLFCN_H) -CHECK_INCLUDE_FILES(dl.h HAVE_DL_H) -CHECK_INCLUDE_FILES(execinfo.h HAVE_EXECINFO_H) -CHECK_INCLUDE_FILES(jansson.h HAVE_JANSSON_H) -CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H) -CHECK_INCLUDE_FILES(grp.h HAVE_GRP_H) -CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) -CHECK_INCLUDE_FILES(libutil.h HAVE_LIBUTIL_H) -CHECK_INCLUDE_FILES(limits.h HAVE_LIMITS_H) -CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H) -CHECK_INCLUDE_FILES(mtio.h HAVE_MTIO_H) -CHECK_INCLUDE_FILES(pwd.h HAVE_PWD_H) -CHECK_INCLUDE_FILES(regex.h HAVE_REGEX_H) -CHECK_INCLUDE_FILES(setjmp.h HAVE_SETJMP_H) -CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H) -CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H) -CHECK_INCLUDE_FILES(string.h HAVE_STRING_H) -CHECK_INCLUDE_FILES("sys/types.h;sys/acl.h" HAVE_SYS_ACL_H) -CHECK_INCLUDE_FILES(sys/attr.h HAVE_SYS_ATTR_H) -CHECK_INCLUDE_FILES(sys/bitypes.h HAVE_SYS_BITYPES_H) -CHECK_INCLUDE_FILES(sys/byteorder.h HAVE_SYS_BYTEORDER_H) -CHECK_INCLUDE_FILES(sys/capability.h HAVE_SYS_CAPABILITY_H) -CHECK_INCLUDE_FILES(sys/dir.h HAVE_SYS_DIR_H) -CHECK_INCLUDE_FILES(sys/dl.h HAVE_SYS_DL_H) -CHECK_INCLUDE_FILES(sys/ea.h HAVE_SYS_EA_H) -CHECK_INCLUDE_FILES("sys/types.h;sys/extattr.h" HAVE_SYS_EXTATTR_H) -CHECK_INCLUDE_FILES(sys/ioctl.h HAVE_SYS_IOCTL_H) -CHECK_INCLUDE_FILES(sys/mtio.h HAVE_SYS_MTIO_H) -CHECK_INCLUDE_FILES(sys/ndir.h HAVE_SYS_NDIR_H) -CHECK_INCLUDE_FILES(sys/nvpair.h HAVE_SYS_NVPAIR_H) -CHECK_INCLUDE_FILES(sys/select.h HAVE_SYS_SELECT_H) -CHECK_INCLUDE_FILES(sys/socket.h HAVE_SYS_SOCKET_H) -CHECK_INCLUDE_FILES(sys/sockio.h HAVE_SYS_SOCKIO_H) -CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H) - -CHECK_INCLUDE_FILES("sys/types.h;sys/tape.h" HAVE_SYS_TAPE_H) - -CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) -CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) -CHECK_INCLUDE_FILES(termios.h HAVE_TERMIOS_H) -CHECK_INCLUDE_FILES(utime.h HAVE_UTIME_H) -CHECK_INCLUDE_FILES(varargs.h HAVE_VARARGS_H) -CHECK_INCLUDE_FILES(NSI HAVE_NSI) - -CHECK_INCLUDE_FILES(fcntl.h HAVE_DLFCN_H) -CHECK_INCLUDE_FILES(dlfcn.h HAVE_DLFCN_H) -CHECK_INCLUDE_FILES(dirent.h HAVE_DIRENT_H) -CHECK_INCLUDE_FILE_CXX(cxxabi.h HAVE_CXXABI_H) -CHECK_INCLUDE_FILES(sys/wait.h HAVE_SYS_WAIT_H) -CHECK_INCLUDE_FILES(curses.h HAVE_CURSES_H) -CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) -CHECK_INCLUDE_FILES(varargs.h HAVE_VARARGS_H) -CHECK_INCLUDE_FILES(stdarg.h HAVE_STDARG_H) -CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H) -CHECK_INCLUDE_FILES(glob.h HAVE_GLOB_H) -CHECK_INCLUDE_FILES(poll.h HAVE_POLL_H) -CHECK_INCLUDE_FILES(sys/poll.h HAVE_SYS_POLL_H) -CHECK_INCLUDE_FILES(varargs.h HAVE_VARARGS_H) -CHECK_INCLUDE_FILES(sys/statvfs.h HAVE_SYS_STATVFS_H) -CHECK_INCLUDE_FILES(umem.h HAVE_UMEM_H) -CHECK_INCLUDE_FILES(cxxabi.h HAVE_CXXABI_H) -CHECK_INCLUDE_FILES(ucontext.h HAVE_UCONTEXT_H) -CHECK_INCLUDE_FILES(demangle.h HAVE_DEMANGLE_H) - -CHECK_INCLUDE_FILES(acl.h HAVE_ACL_H) -CHECK_INCLUDE_FILES(sys/extattr.h HAVE_SYS_EXTATTR_H) -CHECK_INCLUDE_FILES(libutil.h HAVE_LIBUTIL_H) -CHECK_INCLUDE_FILES(sys/ea.h HAVE_SYS_EA_H) -CHECK_INCLUDE_FILES(sys/proplist.h HAVE_SYS_PROPLIST_H) -CHECK_INCLUDE_FILES(sys/xattr.h HAVE_SYS_XATTR_H) -CHECK_INCLUDE_FILES(api/glfs.h HAVE_API_GLFS_H) - -CHECK_INCLUDE_FILES(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) -CHECK_INCLUDE_FILES("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H) -CHECK_INCLUDE_FILES(rados/librados.h HAVE_RADOS_LIBRADOS_H) -CHECK_INCLUDE_FILES(radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) - -#CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H) -CHECK_INCLUDE_FILES(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) - -CHECK_INCLUDE_FILES(elasto/data.h HAVE_ELASTO_DATA_H) -CHECK_INCLUDE_FILES(elasto/file.h HAVE_ELASTO_FILE_H) -CHECK_INCLUDE_FILES(sys/prctl.h HAVE_SYS_PRCTL_H) -CHECK_INCLUDE_FILES(time.h HAVE_TIME_H) - -CHECK_INCLUDE_FILES(sys/capability.h HAVE_SYS_CAPABILITY_H) -CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H) -CHECK_INCLUDE_FILES(lzo/lzoconf.h HAVE_LZO_LZOCONF_H) -CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_LZO1X_H) - -CHECK_INCLUDE_FILES(assert.h HAVE_ASSERT_H) -CHECK_INCLUDE_FILES(curses.h HAVE_CURSES_H) - -CHECK_INCLUDE_FILES(scsi/scsi.h HAVE_SCSI_SCSI_H) - -CHECK_INCLUDE_FILES("stddef.h;scsi/sg.h" HAVE_SCSI_SG_H) - -CHECK_INCLUDE_FILES(sys/dir.h HAVE_SYS_DIR_H) -CHECK_INCLUDE_FILES(termcap.h HAVE_TERMCAP_H) -CHECK_INCLUDE_FILES(term.h HAVE_TERM_H) - -CHECK_INCLUDE_FILES("sys/types.h;sys/scsi/impl/uscsi.h" HAVE_SYS_SCSI_IMPL_USCSI_H) -CHECK_INCLUDE_FILES("stdio.h;camlib.h" HAVE_CAMLIB_H) -CHECK_INCLUDE_FILES(cam/scsi/scsi_message.h HAVE_CAM_SCSI_SCSI_MESSAGE_H) -CHECK_INCLUDE_FILES(dev/scsipi/scsipi_all.h HAVE_DEV_SCSIPI_SCSIPI_ALL_H) - -CHECK_INCLUDE_FILES(scsi/uscsi_all.h HAVE_USCSI_ALL_H) -CHECK_INCLUDE_FILES(scsi/uscsi_all.h HAVE_SCSI_USCSI_ALL_H) +include(CheckIncludeFiles) + +check_include_files(rpc/rpc.h HAVE_RPC_RPC_H) +check_include_files(alloca.h HAVE_ALLOCA_H) +check_include_files(tcpd.h HAVE_TCPD_H) +check_include_files(afs/afsint.h HAVE_AFS_AFSINT_H) +check_include_files(afs/venus.h HAVE_AFS_VENUS_H) +check_include_files(arpa/nameser.h HAVE_ARPA_NAMESER_H) +check_include_files(attr.h HAVE_ATTR_H) +check_include_files(curses.h HAVE_CURSES_H) +check_include_files(demangle.h HAVE_DEMANGLE_H) +check_include_files(dlfcn.h HAVE_DLFCN_H) +check_include_files(dl.h HAVE_DL_H) +check_include_files(execinfo.h HAVE_EXECINFO_H) +check_include_files(jansson.h HAVE_JANSSON_H) +check_include_files(fcntl.h HAVE_FCNTL_H) +check_include_files(grp.h HAVE_GRP_H) +check_include_files(inttypes.h HAVE_INTTYPES_H) +check_include_files(libutil.h HAVE_LIBUTIL_H) +check_include_files(limits.h HAVE_LIMITS_H) +check_include_files(memory.h HAVE_MEMORY_H) +check_include_files(mtio.h HAVE_MTIO_H) +check_include_files(pwd.h HAVE_PWD_H) +check_include_files(regex.h HAVE_REGEX_H) +check_include_files(setjmp.h HAVE_SETJMP_H) +check_include_files(stdlib.h HAVE_STDLIB_H) +check_include_files(strings.h HAVE_STRINGS_H) +check_include_files(string.h HAVE_STRING_H) +check_include_files("sys/types.h;sys/acl.h" HAVE_SYS_ACL_H) +check_include_files(sys/attr.h HAVE_SYS_ATTR_H) +check_include_files(sys/bitypes.h HAVE_SYS_BITYPES_H) +check_include_files(sys/byteorder.h HAVE_SYS_BYTEORDER_H) +check_include_files(sys/capability.h HAVE_SYS_CAPABILITY_H) +check_include_files(sys/dir.h HAVE_SYS_DIR_H) +check_include_files(sys/dl.h HAVE_SYS_DL_H) +check_include_files(sys/ea.h HAVE_SYS_EA_H) +check_include_files("sys/types.h;sys/extattr.h" HAVE_SYS_EXTATTR_H) +check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H) +check_include_files(sys/mtio.h HAVE_SYS_MTIO_H) +check_include_files(sys/ndir.h HAVE_SYS_NDIR_H) +check_include_files(sys/nvpair.h HAVE_SYS_NVPAIR_H) +check_include_files(sys/select.h HAVE_SYS_SELECT_H) +check_include_files(sys/socket.h HAVE_SYS_SOCKET_H) +check_include_files(sys/sockio.h HAVE_SYS_SOCKIO_H) +check_include_files(sys/stat.h HAVE_SYS_STAT_H) + +check_include_files("sys/types.h;sys/tape.h" HAVE_SYS_TAPE_H) + +check_include_files(sys/time.h HAVE_SYS_TIME_H) +check_include_files(sys/types.h HAVE_SYS_TYPES_H) +check_include_files(termios.h HAVE_TERMIOS_H) +check_include_files(utime.h HAVE_UTIME_H) +check_include_files(varargs.h HAVE_VARARGS_H) +check_include_files(NSI HAVE_NSI) + +check_include_files(fcntl.h HAVE_DLFCN_H) +check_include_files(dlfcn.h HAVE_DLFCN_H) +check_include_files(dirent.h HAVE_DIRENT_H) +check_include_file_cxx(cxxabi.h HAVE_CXXABI_H) +check_include_files(sys/wait.h HAVE_SYS_WAIT_H) +check_include_files(curses.h HAVE_CURSES_H) +check_include_files(unistd.h HAVE_UNISTD_H) +check_include_files(varargs.h HAVE_VARARGS_H) +check_include_files(stdarg.h HAVE_STDARG_H) +check_include_files(stdlib.h HAVE_STDLIB_H) +check_include_files(glob.h HAVE_GLOB_H) +check_include_files(poll.h HAVE_POLL_H) +check_include_files(sys/poll.h HAVE_SYS_POLL_H) +check_include_files(varargs.h HAVE_VARARGS_H) +check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H) +check_include_files(umem.h HAVE_UMEM_H) +check_include_files(cxxabi.h HAVE_CXXABI_H) +check_include_files(ucontext.h HAVE_UCONTEXT_H) +check_include_files(demangle.h HAVE_DEMANGLE_H) + +check_include_files(acl.h HAVE_ACL_H) +check_include_files(sys/extattr.h HAVE_SYS_EXTATTR_H) +check_include_files(libutil.h HAVE_LIBUTIL_H) +check_include_files(sys/ea.h HAVE_SYS_EA_H) +check_include_files(sys/proplist.h HAVE_SYS_PROPLIST_H) +check_include_files(sys/xattr.h HAVE_SYS_XATTR_H) +check_include_files(api/glfs.h HAVE_API_GLFS_H) + +check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) +check_include_files("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H) +check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) +check_include_files( + radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H +) + +# CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H) +check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) + +check_include_files(elasto/data.h HAVE_ELASTO_DATA_H) +check_include_files(elasto/file.h HAVE_ELASTO_FILE_H) +check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H) +check_include_files(time.h HAVE_TIME_H) + +check_include_files(sys/capability.h HAVE_SYS_CAPABILITY_H) +check_include_files(zlib.h HAVE_ZLIB_H) +check_include_files(lzo/lzoconf.h HAVE_LZO_LZOCONF_H) +check_include_files(lzo/lzo1x.h HAVE_LZO_LZO1X_H) + +check_include_files(assert.h HAVE_ASSERT_H) +check_include_files(curses.h HAVE_CURSES_H) + +check_include_files(scsi/scsi.h HAVE_SCSI_SCSI_H) + +check_include_files("stddef.h;scsi/sg.h" HAVE_SCSI_SG_H) + +check_include_files(sys/dir.h HAVE_SYS_DIR_H) +check_include_files(termcap.h HAVE_TERMCAP_H) +check_include_files(term.h HAVE_TERM_H) + +check_include_files( + "sys/types.h;sys/scsi/impl/uscsi.h" HAVE_SYS_SCSI_IMPL_USCSI_H +) +check_include_files("stdio.h;camlib.h" HAVE_CAMLIB_H) +check_include_files(cam/scsi/scsi_message.h HAVE_CAM_SCSI_SCSI_MESSAGE_H) +check_include_files(dev/scsipi/scsipi_all.h HAVE_DEV_SCSIPI_SCSIPI_ALL_H) + +check_include_files(scsi/uscsi_all.h HAVE_USCSI_ALL_H) +check_include_files(scsi/uscsi_all.h HAVE_SCSI_USCSI_ALL_H) diff --git a/core/cmake/BareosCheckStructHasMembers.cmake b/core/cmake/BareosCheckStructHasMembers.cmake index 0a942f8887d..55f16e7d1be 100644 --- a/core/cmake/BareosCheckStructHasMembers.cmake +++ b/core/cmake/BareosCheckStructHasMembers.cmake @@ -17,16 +17,22 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -INCLUDE (CheckStructHasMember) +include(CheckStructHasMember) -check_struct_has_member("struct stat" st_blksize sys/stat.h HAVE_STRUCT_STAT_ST_BLKSIZE ) +check_struct_has_member( + "struct stat" st_blksize sys/stat.h HAVE_STRUCT_STAT_ST_BLKSIZE +) set(HAVE_ST_BLKSIZE ${HAVE_STRUCT_STAT_ST_BLKSIZE}) -check_struct_has_member("struct stat" st_blocks sys/stat.h HAVE_STRUCT_STAT_ST_BLOCKS ) +check_struct_has_member( + "struct stat" st_blocks sys/stat.h HAVE_STRUCT_STAT_ST_BLOCKS +) set(HAVE_ST_BLOCKS ${HAVE_STRUCT_STAT_ST_BLOCKS}) -check_struct_has_member("struct stat" st_rdev sys/stat.h HAVE_STRUCT_STAT_ST_RDEV ) +check_struct_has_member( + "struct stat" st_rdev sys/stat.h HAVE_STRUCT_STAT_ST_RDEV +) set(HAVE_ST_RDEV ${HAVE_STRUCT_STAT_ST_RDEV}) -check_struct_has_member("struct tm" tm_zone time.h HAVE_STRUCT_TM_TM_ZONE) +check_struct_has_member("struct tm" tm_zone time.h HAVE_STRUCT_TM_TM_ZONE) set(HAVE_TM_ZONE ${HAVE_STRUCT_TM_TM_ZONE}) diff --git a/core/cmake/BareosCheckSymbols.cmake b/core/cmake/BareosCheckSymbols.cmake index 53023a18bf7..bdc0f11408c 100644 --- a/core/cmake/BareosCheckSymbols.cmake +++ b/core/cmake/BareosCheckSymbols.cmake @@ -16,42 +16,42 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -INCLUDE (CMakePushCheckState) -INCLUDE (CheckSymbolExists) +include(CMakePushCheckState) +include(CheckSymbolExists) +check_symbol_exists(__stub_lchmod features.h LCHMOD_IS_A_STUB1) +check_symbol_exists(__stub___lchmod features_h LCHMOD_IS_A_STUB2) -CHECK_SYMBOL_EXISTS(__stub_lchmod features.h LCHMOD_IS_A_STUB1) -CHECK_SYMBOL_EXISTS(__stub___lchmod features_h LCHMOD_IS_A_STUB2) - - - -if ("${LCHMOD_IS_A_STUB1}" OR "${LCHMOD_IS_A_STUB2}") - MESSAGE(STATUS " lchmod is a stub, setting HAVE_LCHMOD to 0") - set (HAVE_LCHMOD 0) +if("${LCHMOD_IS_A_STUB1}" OR "${LCHMOD_IS_A_STUB2}") + message(STATUS " lchmod is a stub, setting HAVE_LCHMOD to 0") + set(HAVE_LCHMOD 0) endif() -CHECK_SYMBOL_EXISTS(poll poll.h HAVE_POLL) -CHECK_SYMBOL_EXISTS(alloca alloca.h HAVE_ALLOCA) +check_symbol_exists(poll poll.h HAVE_POLL) +check_symbol_exists(alloca alloca.h HAVE_ALLOCA) cmake_push_check_state() -SET(CMAKE_REQUIRED_LIBRARIES ${DL_LIBRARIES}) -CHECK_SYMBOL_EXISTS(dlerror dlfcn.h HAVE_DLERROR) +set(CMAKE_REQUIRED_LIBRARIES ${DL_LIBRARIES}) +check_symbol_exists(dlerror dlfcn.h HAVE_DLERROR) cmake_pop_check_state() -CHECK_SYMBOL_EXISTS(va_copy stdarg.h HAVE_VA_COPY) - +check_symbol_exists(va_copy stdarg.h HAVE_VA_COPY) cmake_push_check_state() -SET(CMAKE_REQUIRED_LIBRARIES ${RADOS_LIBRARIES}) -CHECK_SYMBOL_EXISTS(rados_ioctx_set_namespace rados/librados.h HAVE_RADOS_NAMESPACES) -CHECK_SYMBOL_EXISTS(rados_nobjects_list_open rados/librados.h HAVE_RADOS_NOBJECTS_LIST) +set(CMAKE_REQUIRED_LIBRARIES ${RADOS_LIBRARIES}) +check_symbol_exists( + rados_ioctx_set_namespace rados/librados.h HAVE_RADOS_NAMESPACES +) +check_symbol_exists( + rados_nobjects_list_open rados/librados.h HAVE_RADOS_NOBJECTS_LIST +) cmake_pop_check_state() - -IF(HAVE_GLUSTERFS_API_GLFS_H) -cmake_push_check_state() -set (CMAKE_REQUIRED_LIBRARIES ${GFAPI_LIBRARIES}) -check_cxx_source_compiles(" +if(HAVE_GLUSTERFS_API_GLFS_H) + cmake_push_check_state() + set(CMAKE_REQUIRED_LIBRARIES ${GFAPI_LIBRARIES}) + check_cxx_source_compiles( + " #include int main(void) { @@ -59,7 +59,8 @@ int main(void) return glfs_ftruncate(NULL, 0, NULL, NULL); } " -GLFS_FTRUNCATE_HAS_FOUR_ARGS) + GLFS_FTRUNCATE_HAS_FOUR_ARGS + ) endif() cmake_pop_check_state() diff --git a/core/cmake/BareosConfigureFile.cmake b/core/cmake/BareosConfigureFile.cmake index fe3d1acb755..511fded2917 100644 --- a/core/cmake/BareosConfigureFile.cmake +++ b/core/cmake/BareosConfigureFile.cmake @@ -21,9 +21,9 @@ # configure file all *.in files # -FILE(GLOB_RECURSE IN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.in" ) -FOREACH(in_file ${IN_FILES}) - string(REGEX REPLACE ".in\$" "" file ${in_file}) - message(STATUS "creating file ${file}") - CONFIGURE_FILE(${in_file} ${file} @ONLY) -ENDFOREACH() +file(GLOB_RECURSE IN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.in") +foreach(in_file ${IN_FILES}) + string(REGEX REPLACE ".in\$" "" file ${in_file}) + message(STATUS "creating file ${file}") + configure_file(${in_file} ${file} @ONLY) +endforeach() diff --git a/core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake b/core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake index 91fd6ac15a1..ec925d6a27f 100644 --- a/core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake +++ b/core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake @@ -17,64 +17,75 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - - - # determine value of HAVE_LOWLEVEL_SCSI_INTERFACE if(${scsi-crypto}) - # LINUX: check if HAVE_SCSI_SG_H and HAVE_SCSI_SCSI_H are true - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - if ("${HAVE_SCSI_SG_H}" AND "${HAVE_SCSI_SCSI_H}") - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 1) - else() - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 0) - MESSAGE(FATAL_ERROR "scsi crypto support selected but required headers are missing") - endif() - endif() - - # SUN: check if HAVE_SYS_SCSI_IMPL_USCSI_H - if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") - if ("${HAVE_SYS_SCSI_IMPL_USCSI_H}") - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 1) - else() - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 0) - MESSAGE(FATAL_ERROR "scsi crypto support selected but required headers are missing") - endif() - endif() - + # LINUX: check if HAVE_SCSI_SG_H and HAVE_SCSI_SCSI_H are true + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if("${HAVE_SCSI_SG_H}" AND "${HAVE_SCSI_SCSI_H}") + set(HAVE_LOWLEVEL_SCSI_INTERFACE 1) + else() + set(HAVE_LOWLEVEL_SCSI_INTERFACE 0) + message( + FATAL_ERROR + "scsi crypto support selected but required headers are missing" + ) + endif() + endif() - # FREEBSD: HAVE_CAMLIB_H and HAVE_CAM_SCSI_SCSI_MESSAGE_H also add CAM_LIBS="-lcam" - if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - if ("${HAVE_CAMLIB_H}" AND "${HAVE_CAM_SCSI_SCSI_MESSAGE_H}") - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 1) - SET(CAM_LIBRARIES cam) - else() - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 0) - MESSAGE(FATAL_ERROR "scsi crypto support selected but required headers are missing") - endif() - endif() + # SUN: check if HAVE_SYS_SCSI_IMPL_USCSI_H + if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + if("${HAVE_SYS_SCSI_IMPL_USCSI_H}") + set(HAVE_LOWLEVEL_SCSI_INTERFACE 1) + else() + set(HAVE_LOWLEVEL_SCSI_INTERFACE 0) + message( + FATAL_ERROR + "scsi crypto support selected but required headers are missing" + ) + endif() + endif() - # NETBSD: HAVE_DEV_SCSIPI_SCSIPI_ALL_H - if (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") - if ("${HAVE_DEV_SCSIPI_SCSIPI_ALL_H}") - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 1) - else() - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 0) - MESSAGE(FATAL_ERROR "scsi crypto support selected but required headers are missing") - endif() - endif() + # FREEBSD: HAVE_CAMLIB_H and HAVE_CAM_SCSI_SCSI_MESSAGE_H also add + # CAM_LIBS="-lcam" + if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + if("${HAVE_CAMLIB_H}" AND "${HAVE_CAM_SCSI_SCSI_MESSAGE_H}") + set(HAVE_LOWLEVEL_SCSI_INTERFACE 1) + set(CAM_LIBRARIES cam) + else() + set(HAVE_LOWLEVEL_SCSI_INTERFACE 0) + message( + FATAL_ERROR + "scsi crypto support selected but required headers are missing" + ) + endif() + endif() - # OPENBSD: HAVE_USCSI_ALL_H - if (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") - if ("${HAVE_USCSI_ALL_H}") - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 1) - else() - SET(HAVE_LOWLEVEL_SCSI_INTERFACE 0) - MESSAGE(FATAL_ERROR "scsi crypto support selected but required headers are missing") - endif() - endif() + # NETBSD: HAVE_DEV_SCSIPI_SCSIPI_ALL_H + if(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") + if("${HAVE_DEV_SCSIPI_SCSIPI_ALL_H}") + set(HAVE_LOWLEVEL_SCSI_INTERFACE 1) + else() + set(HAVE_LOWLEVEL_SCSI_INTERFACE 0) + message( + FATAL_ERROR + "scsi crypto support selected but required headers are missing" + ) + endif() + endif() + # OPENBSD: HAVE_USCSI_ALL_H + if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") + if("${HAVE_USCSI_ALL_H}") + set(HAVE_LOWLEVEL_SCSI_INTERFACE 1) + else() + set(HAVE_LOWLEVEL_SCSI_INTERFACE 0) + message( + FATAL_ERROR + "scsi crypto support selected but required headers are missing" + ) + endif() + endif() endif() diff --git a/core/cmake/BareosExtractVersionInfo.cmake b/core/cmake/BareosExtractVersionInfo.cmake index 69687c220c3..efd601fc7c5 100644 --- a/core/cmake/BareosExtractVersionInfo.cmake +++ b/core/cmake/BareosExtractVersionInfo.cmake @@ -21,7 +21,10 @@ if(BareosVersionFile STREQUAL "NOTFOUND") if(GIT_DESCRIBE_VERSION) message(STATUS "Using version information from Git") if(DEFINED VERSION_STRING) - message(STATUS "VERSION_STRING already set to ${VERSION_STRING}. Will not overwrite") + message( + STATUS + "VERSION_STRING already set to ${VERSION_STRING}. Will not overwrite" + ) else() set(VERSION_STRING "${GIT_DESCRIBE_VERSION}") endif() @@ -30,30 +33,32 @@ if(BareosVersionFile STREQUAL "NOTFOUND") message( FATAL_ERROR "VERSION_STRING not set, BareosVersion.cmake not found and no version data from git available." - ) + ) endif() else() message(STATUS "Using version information from ${BareosVersionFile}") endif() -string(REGEX MATCH - [0-9.a-zA-Z~]+ - BAREOS_FULL_VERSION - ${VERSION_STRING}) +string(REGEX MATCH [0-9.a-zA-Z~]+ BAREOS_FULL_VERSION ${VERSION_STRING}) if(BAREOS_FULL_VERSION STREQUAL "") message(FATAL_ERROR "BAREOS_FULL_VERSION is not set") endif() -string(REGEX MATCH - [0-9]+.[0-9]+.[0-9]+ - BAREOS_NUMERIC_VERSION - ${VERSION_STRING}) +# set BAREOS_FULL_VERSION in parent scope if there is a parent scope +get_directory_property(hasParent PARENT_DIRECTORY) +if(hasParent) + set(BAREOS_FULL_VERSION + ${BAREOS_FULL_VERSION} + PARENT_SCOPE + ) +endif() + +string(REGEX MATCH [0-9]+.[0-9]+.[0-9]+ BAREOS_NUMERIC_VERSION + ${VERSION_STRING} +) -string(REPLACE "." - ";" - VERSION_LIST - ${BAREOS_NUMERIC_VERSION}) +string(REPLACE "." ";" VERSION_LIST ${BAREOS_NUMERIC_VERSION}) list(GET VERSION_LIST 0 BAREOS_VERSION_MAJOR) list(GET VERSION_LIST 1 BAREOS_VERSION_MINOR) list(GET VERSION_LIST 2 BAREOS_VERSION_PATCH) @@ -72,9 +77,7 @@ else() endif() # extract db version from cats.h -file(STRINGS ${PROJECT_SOURCE_DIR}/src/cats/cats.h DB_VERSION_STRING - REGEX .*BDB_VERSION.*) -string(REGEX MATCH - [0-9]+ - BDB_VERSION - ${DB_VERSION_STRING}) +file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/../src/cats/cats.h DB_VERSION_STRING + REGEX .*BDB_VERSION.* +) +string(REGEX MATCH [0-9]+ BDB_VERSION ${DB_VERSION_STRING}) diff --git a/core/cmake/BareosFindAllLibraries.cmake b/core/cmake/BareosFindAllLibraries.cmake index 1f41545987c..17518642b93 100644 --- a/core/cmake/BareosFindAllLibraries.cmake +++ b/core/cmake/BareosFindAllLibraries.cmake @@ -17,80 +17,78 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - -INCLUDE(systemdservice) -if (${SYSTEMD_FOUND}) - SET(HAVE_SYSTEMD 1) +include(systemdservice) +if(${SYSTEMD_FOUND}) + set(HAVE_SYSTEMD 1) endif() +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") + # make sure we get python 2 not 3 + set(Python_ADDITIONAL_VERSIONS 2.5 2.6 2.7 2.8 2.9) + find_package(PythonInterp) + include(FindPythonLibs) -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") - # make sure we get python 2 not 3 - set(Python_ADDITIONAL_VERSIONS 2.5 2.6 2.7 2.8 2.9) - find_package(PythonInterp) - INCLUDE(FindPythonLibs) - - if (${PYTHONLIBS_FOUND}) - SET(HAVE_PYTHON 1) - endif() + if(${PYTHONLIBS_FOUND}) + set(HAVE_PYTHON 1) + endif() - INCLUDE(FindPostgreSQL) + include(FindPostgreSQL) endif() -INCLUDE(CMakeUserFindMySQL) +include(CMakeUserFindMySQL) -IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - SET(OPENSSL_USE_STATIC_LIBS 1) -ENDIF() -INCLUDE(FindOpenSSL) +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(OPENSSL_USE_STATIC_LIBS 1) +endif() +include(FindOpenSSL) -if (${OPENSSL_FOUND}) - SET(HAVE_OPENSSL 1) +if(${OPENSSL_FOUND}) + set(HAVE_OPENSSL 1) endif() -INCLUDE(BareosFindLibraryAndHeaders) - -BareosFindLibraryAndHeaders("jansson" "jansson.h") -BareosFindLibraryAndHeaders("rados" "rados/librados.h") -BareosFindLibraryAndHeaders("radosstriper" "radosstriper/libradosstriper.h") -BareosFindLibraryAndHeaders("cephfs" "cephfs/libcephfs.h") -BareosFindLibraryAndHeaders("pthread" "pthread.h") -BareosFindLibraryAndHeaders("cap" "sys/capability.h") -BareosFindLibraryAndHeaders("gfapi" "glusterfs/api/glfs.h") -BareosFindLibraryAndHeaders("droplet" "droplet.h") - -BareosFindLibraryAndHeaders("pam" "security/pam_appl.h") - -BareosFindLibraryAndHeaders("lzo2" "lzo/lzoconf.h") -if (${LZO2_FOUND}) - SET(HAVE_LZO 1) - if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(LZO2_LIBRARIES "/usr/local/opt/lzo/lib/liblzo2.a") - endif() +include(BareosFindLibraryAndHeaders) + +bareosfindlibraryandheaders("jansson" "jansson.h") +bareosfindlibraryandheaders("rados" "rados/librados.h") +bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h") +bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h") +bareosfindlibraryandheaders("pthread" "pthread.h") +bareosfindlibraryandheaders("cap" "sys/capability.h") +bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h") +bareosfindlibraryandheaders("droplet" "droplet.h") + +bareosfindlibraryandheaders("pam" "security/pam_appl.h") + +bareosfindlibraryandheaders("lzo2" "lzo/lzoconf.h") +if(${LZO2_FOUND}) + set(HAVE_LZO 1) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(LZO2_LIBRARIES "/usr/local/opt/lzo/lib/liblzo2.a") + endif() endif() -#MESSAGE(FATAL_ERROR "exit") -INCLUDE(BareosFindLibrary) +# MESSAGE(FATAL_ERROR "exit") +include(BareosFindLibrary) -BareosFindLibrary("tirpc") -BareosFindLibrary("util") -BareosFindLibrary("dl") -BareosFindLibrary("acl") -#BareosFindLibrary("wrap") -BareosFindLibrary("gtest") -BareosFindLibrary("gtest_main") -BareosFindLibrary("gmock") +bareosfindlibrary("tirpc") +bareosfindlibrary("util") +bareosfindlibrary("dl") +bareosfindlibrary("acl") +# BareosFindLibrary("wrap") +bareosfindlibrary("gtest") +bareosfindlibrary("gtest_main") +bareosfindlibrary("gmock") -BareosFindLibrary("pam_wrapper") +bareosfindlibrary("pam_wrapper") -if (${HAVE_CAP}) - SET(HAVE_LIBCAP 1) +if(${HAVE_CAP}) + set(HAVE_LIBCAP 1) endif() find_package(ZLIB) -if (${ZLIB_FOUND}) - SET(HAVE_LIBZ 1) +if(${ZLIB_FOUND}) + set(HAVE_LIBZ 1) endif() find_package(Readline) -INCLUDE(thread) +include(thread) diff --git a/core/cmake/BareosFindLibrary.cmake b/core/cmake/BareosFindLibrary.cmake index c1e4e1cf28b..c5a696e8d14 100644 --- a/core/cmake/BareosFindLibrary.cmake +++ b/core/cmake/BareosFindLibrary.cmake @@ -19,54 +19,47 @@ # generic macro to find libraries -MACRO(BareosFindLibrary LIBNAME) - MESSAGE(STATUS "checking for library ${LIBNAME}...") +macro(BareosFindLibrary LIBNAME) + message(STATUS "checking for library ${LIBNAME}...") - STRING(TOUPPER ${LIBNAME} LIBNAME_UPCASE) - SET(INCLUDE_VAR_NAME ${LIBNAME_UPCASE}_INCLUDE_DIRS) - SET(LIB_VAR_NAME ${LIBNAME_UPCASE}_LIBRARIES) - SET(FOUND_VAR_NAME ${LIBNAME_UPCASE}_FOUND) - SET(HAVE_VAR_NAME HAVE_LIB${LIBNAME_UPCASE}) + string(TOUPPER ${LIBNAME} LIBNAME_UPCASE) + set(INCLUDE_VAR_NAME ${LIBNAME_UPCASE}_INCLUDE_DIRS) + set(LIB_VAR_NAME ${LIBNAME_UPCASE}_LIBRARIES) + set(FOUND_VAR_NAME ${LIBNAME_UPCASE}_FOUND) + set(HAVE_VAR_NAME HAVE_LIB${LIBNAME_UPCASE}) + find_library(${LIB_VAR_NAME} NAMES ${LIBNAME}) - find_library(${LIB_VAR_NAME} NAMES ${LIBNAME}) + set(LIBFOUND ${${LIB_VAR_NAME}}) + string(REGEX MATCH "-NOTFOUND" LIBNOTFOUND ${LIBFOUND}) + # MESSAGE(STATUS "LIB REGEX MATCH: ${LIBNOTFOUND}") + string(LENGTH "${LIBNOTFOUND}" LIBNOTFOUND) - SET(LIBFOUND ${${LIB_VAR_NAME}}) + if(NOT ${LIBNOTFOUND}) + set(${FOUND_VAR_NAME} TRUE) + set(${HAVE_VAR_NAME} 1) + else() + set(${FOUND_VAR_NAME} FALSE) + set(${HAVE_VAR_NAME} 0) + endif() - STRING(REGEX MATCH "-NOTFOUND" LIBNOTFOUND ${LIBFOUND}) - #MESSAGE(STATUS "LIB REGEX MATCH: ${LIBNOTFOUND}") - STRING(LENGTH "${LIBNOTFOUND}" LIBNOTFOUND ) + set(QUIETVALUE ${${QUIET_VAR_NAME}}) + set(FOUNDVALUE ${${FOUND_VAR_NAME}}) + if(${FOUNDVALUE}) + message(STATUS " ${FOUND_VAR_NAME}=${${FOUND_VAR_NAME}}") + message(STATUS " ${LIB_VAR_NAME}=${${LIB_VAR_NAME}}") + message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") + else() + message(STATUS " ERROR: ${LIBNAME} libraries NOT found. ") - if (NOT ${LIBNOTFOUND}) - set(${FOUND_VAR_NAME} TRUE) - set(${HAVE_VAR_NAME} 1) - else() - set(${FOUND_VAR_NAME} FALSE) - set(${HAVE_VAR_NAME} 0) - endif () + set("${LIB_VAR_NAME}" "") + set("${INCLUDE_VAR_NAME}" "") + message(STATUS " ${FOUND_VAR_NAME}=${${FOUND_VAR_NAME}}") + message(STATUS " ${LIB_VAR_NAME}=${${LIB_VAR_NAME}}") + message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") + endif() - - SET(QUIETVALUE ${${QUIET_VAR_NAME}}) - SET(FOUNDVALUE ${${FOUND_VAR_NAME}}) - if (${FOUNDVALUE}) - message(STATUS " ${FOUND_VAR_NAME}=${${FOUND_VAR_NAME}}") - message(STATUS " ${LIB_VAR_NAME}=${${LIB_VAR_NAME}}") - message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") - else () - message(STATUS " ERROR: ${LIBNAME} libraries NOT found. ") - - set("${LIB_VAR_NAME}" "") - set("${INCLUDE_VAR_NAME}" "") - - message(STATUS " ${FOUND_VAR_NAME}=${${FOUND_VAR_NAME}}") - message(STATUS " ${LIB_VAR_NAME}=${${LIB_VAR_NAME}}") - message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") - endif () - - mark_as_advanced( - ${LIB_VAR_NAME} - ${FOUND_VAR_NAME} - ) -ENDMACRO() + mark_as_advanced(${LIB_VAR_NAME} ${FOUND_VAR_NAME}) +endmacro() diff --git a/core/cmake/BareosFindLibraryAndHeaders.cmake b/core/cmake/BareosFindLibraryAndHeaders.cmake index d5b4ac54ee4..09a3374e387 100644 --- a/core/cmake/BareosFindLibraryAndHeaders.cmake +++ b/core/cmake/BareosFindLibraryAndHeaders.cmake @@ -19,84 +19,77 @@ # generic macro to find libraries and headers -MACRO(BareosFindLibraryAndHeaders LIBNAME HEADERFILE) - MESSAGE(STATUS "checking for library ${LIBNAME} and ${HEADERFILE} header ...") - - STRING(TOUPPER ${LIBNAME} LIBNAME_UPCASE) - SET(INCLUDE_VAR_NAME ${LIBNAME_UPCASE}_INCLUDE_DIRS) - SET(LIB_VAR_NAME ${LIBNAME_UPCASE}_LIBRARIES) - SET(FOUND_VAR_NAME ${LIBNAME_UPCASE}_FOUND) - SET(HAVE_VAR_NAME HAVE_${LIBNAME_UPCASE}) - - - find_path(${INCLUDE_VAR_NAME} NAMES ${HEADERFILE}) - find_library(${LIB_VAR_NAME} NAMES ${LIBNAME}) - - #MESSAGE(STATUS "find path result for ${INCLUDE_VAR_NAME} is ${${INCLUDE_VAR_NAME}}") - #MESSAGE(STATUS "find library result for ${LIB_VAR_NAME} is ${${LIB_VAR_NAME}}") - - #STRING(LENGTH ${${LIB_VAR_NAME}} LIBFOUND ) - #STRING(LENGTH ${${INCLUDE_VAR_NAME}} INCLUDEFOUND ) - - SET(LIBFOUND ${${LIB_VAR_NAME}}) - #MESSAGE(STATUS "LIBFOUND: ${LIBFOUND}") - SET(INCLUDEFOUND ${${INCLUDE_VAR_NAME}}) - #MESSAGE(STATUS "INCLUDEFOUND: ${INCLUDEFOUND}") - - STRING(REGEX MATCH "-NOTFOUND" LIBNOTFOUND ${LIBFOUND}) - #MESSAGE(STATUS "LIB REGEX MATCH: ${LIBNOTFOUND}") - STRING(LENGTH "${LIBNOTFOUND}" LIBNOTFOUND ) - - STRING(REGEX MATCH "-NOTFOUND" INCLUDENOTFOUND ${INCLUDEFOUND}) - #MESSAGE(STATUS "INC REGEX MATCH: ${INCLUDENOTFOUND}") - STRING(LENGTH "${INCLUDENOTFOUND}" INCLUDENOTFOUND ) - - - if (NOT ${LIBNOTFOUND}) - #MESSAGE(STATUS "LIBFOUND is true: ${LIBFOUND}") - if (NOT ${INCLUDENOTFOUND}) - #MESSAGE(STATUS "INCLUDEFOUND is true: ${INCLUDEFOUND}") - #MESSAGE(STATUS "setting ${FOUND_VAR_NAME} to true") - set(${FOUND_VAR_NAME} TRUE) - set(${HAVE_VAR_NAME} 1) - else() - #MESSAGE(STATUS "INCLUDEFOUND is true: ${INCLUDEFOUND}") - set(${FOUND_VAR_NAME} FALSE) - set(${HAVE_VAR_NAME} 0) - endif() - else() - #MESSAGE(STATUS "LIBFOUND is false: ${LIBFOUND}") +macro(BareosFindLibraryAndHeaders LIBNAME HEADERFILE) + message(STATUS "checking for library ${LIBNAME} and ${HEADERFILE} header ...") + + string(TOUPPER ${LIBNAME} LIBNAME_UPCASE) + set(INCLUDE_VAR_NAME ${LIBNAME_UPCASE}_INCLUDE_DIRS) + set(LIB_VAR_NAME ${LIBNAME_UPCASE}_LIBRARIES) + set(FOUND_VAR_NAME ${LIBNAME_UPCASE}_FOUND) + set(HAVE_VAR_NAME HAVE_${LIBNAME_UPCASE}) + + find_path(${INCLUDE_VAR_NAME} NAMES ${HEADERFILE}) + find_library(${LIB_VAR_NAME} NAMES ${LIBNAME}) + + # MESSAGE(STATUS "find path result for ${INCLUDE_VAR_NAME} is + # ${${INCLUDE_VAR_NAME}}") MESSAGE(STATUS "find library result for + # ${LIB_VAR_NAME} is ${${LIB_VAR_NAME}}") + + # STRING(LENGTH ${${LIB_VAR_NAME}} LIBFOUND ) STRING(LENGTH + # ${${INCLUDE_VAR_NAME}} INCLUDEFOUND ) + + set(LIBFOUND ${${LIB_VAR_NAME}}) + # MESSAGE(STATUS "LIBFOUND: ${LIBFOUND}") + set(INCLUDEFOUND ${${INCLUDE_VAR_NAME}}) + # MESSAGE(STATUS "INCLUDEFOUND: ${INCLUDEFOUND}") + + string(REGEX MATCH "-NOTFOUND" LIBNOTFOUND ${LIBFOUND}) + # MESSAGE(STATUS "LIB REGEX MATCH: ${LIBNOTFOUND}") + string(LENGTH "${LIBNOTFOUND}" LIBNOTFOUND) + + string(REGEX MATCH "-NOTFOUND" INCLUDENOTFOUND ${INCLUDEFOUND}) + # MESSAGE(STATUS "INC REGEX MATCH: ${INCLUDENOTFOUND}") + string(LENGTH "${INCLUDENOTFOUND}" INCLUDENOTFOUND) + + if(NOT ${LIBNOTFOUND}) + # MESSAGE(STATUS "LIBFOUND is true: ${LIBFOUND}") + if(NOT ${INCLUDENOTFOUND}) + # MESSAGE(STATUS "INCLUDEFOUND is true: ${INCLUDEFOUND}") MESSAGE(STATUS + # "setting ${FOUND_VAR_NAME} to true") + set(${FOUND_VAR_NAME} TRUE) + set(${HAVE_VAR_NAME} 1) + else() + # MESSAGE(STATUS "INCLUDEFOUND is true: ${INCLUDEFOUND}") set(${FOUND_VAR_NAME} FALSE) set(${HAVE_VAR_NAME} 0) - endif () - - - - SET(FOUNDVALUE ${${FOUND_VAR_NAME}}) - if (${FOUNDVALUE}) - message(STATUS " ${FOUND_VAR_NAME}=${${FOUND_VAR_NAME}}") - message(STATUS " ${LIB_VAR_NAME}=${${LIB_VAR_NAME}}") - message(STATUS " ${INCLUDE_VAR_NAME}=${${INCLUDE_VAR_NAME}}") - message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") - else () - message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") - if (${LIBNOTFOUND}) - message(STATUS " ERROR: ${LIBNAME} libraries NOT found. ") - set("${LIB_VAR_NAME}" "") - endif() - if (${INCLUDENOTFOUND}) - message(STATUS " ERROR: ${LIBNAME} includes NOT found. ") - set("${INCLUDE_VAR_NAME}" "") - endif() - message(STATUS " ${FOUND_VAR_NAME}=${${FOUND_VAR_NAME}}") - message(STATUS " ${LIB_VAR_NAME}=${${LIB_VAR_NAME}}") - message(STATUS " ${INCLUDE_VAR_NAME}=${${INCLUDE_VAR_NAME}}") - message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") - endif () - - mark_as_advanced( - ${INCLUDE_VAR_NAME} - ${LIB_VAR_NAME} - ${FOUND_VAR_NAME} - ) -ENDMACRO() + endif() + else() + # MESSAGE(STATUS "LIBFOUND is false: ${LIBFOUND}") + set(${FOUND_VAR_NAME} FALSE) + set(${HAVE_VAR_NAME} 0) + endif() + + set(FOUNDVALUE ${${FOUND_VAR_NAME}}) + if(${FOUNDVALUE}) + message(STATUS " ${FOUND_VAR_NAME}=${${FOUND_VAR_NAME}}") + message(STATUS " ${LIB_VAR_NAME}=${${LIB_VAR_NAME}}") + message(STATUS " ${INCLUDE_VAR_NAME}=${${INCLUDE_VAR_NAME}}") + message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") + else() + message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") + if(${LIBNOTFOUND}) + message(STATUS " ERROR: ${LIBNAME} libraries NOT found. ") + set("${LIB_VAR_NAME}" "") + endif() + if(${INCLUDENOTFOUND}) + message(STATUS " ERROR: ${LIBNAME} includes NOT found. ") + set("${INCLUDE_VAR_NAME}" "") + endif() + message(STATUS " ${FOUND_VAR_NAME}=${${FOUND_VAR_NAME}}") + message(STATUS " ${LIB_VAR_NAME}=${${LIB_VAR_NAME}}") + message(STATUS " ${INCLUDE_VAR_NAME}=${${INCLUDE_VAR_NAME}}") + message(STATUS " ${HAVE_VAR_NAME}=${${HAVE_VAR_NAME}}") + endif() + + mark_as_advanced(${INCLUDE_VAR_NAME} ${LIB_VAR_NAME} ${FOUND_VAR_NAME}) +endmacro() diff --git a/core/cmake/BareosFindPrograms.cmake b/core/cmake/BareosFindPrograms.cmake index 67cc9666f4a..ce17e1f75eb 100644 --- a/core/cmake/BareosFindPrograms.cmake +++ b/core/cmake/BareosFindPrograms.cmake @@ -20,14 +20,14 @@ # find programs find_program(AWK awk) find_program(GAWK gawk) -IF(HAVE_SUN_OS) - SET(AWK ${GAWK}) -ENDIF() +if(HAVE_SUN_OS) + set(AWK ${GAWK}) +endif() find_program(PIDOF pidof) -IF(NOT PIDOF) - SET(PIDOF "") -ENDIF() +if(NOT PIDOF) + set(PIDOF "") +endif() find_program(PS ps) find_program(PGREP pgrep) diff --git a/core/cmake/BareosFindStaticCodeAnalysisTools.cmake b/core/cmake/BareosFindStaticCodeAnalysisTools.cmake index 0805816c585..718ad7d142e 100644 --- a/core/cmake/BareosFindStaticCodeAnalysisTools.cmake +++ b/core/cmake/BareosFindStaticCodeAnalysisTools.cmake @@ -17,24 +17,21 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +if(DO_STATIC_CODE_CHECKS) + # analyse the code with clang-tidy, cppcheck, cpplint and iwyu + find_program(IWYU iwyu) + set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${IWYU}) + set(CMAKE_C_INCLUDE_WHAT_YOU_USE ${IWYU}) -IF(DO_STATIC_CODE_CHECKS) -# analyse the code with clang-tidy, cppcheck, cpplint and iwyu -find_program(IWYU iwyu) -set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${IWYU}) -set(CMAKE_C_INCLUDE_WHAT_YOU_USE ${IWYU}) + set(CMAKE_LINK_WHAT_YOU_USE true) -set(CMAKE_LINK_WHAT_YOU_USE true) + find_program(CLANGTIDY clang-tidy) + set(CMAKE_CXX_CLANG_TIDY "${CLANGTIDY};-checks=*") -find_program(CLANGTIDY clang-tidy) -set(CMAKE_CXX_CLANG_TIDY "${CLANGTIDY};-checks=*") - -find_program(CPPCHECK cppcheck) -set(CMAKE_CXX_CPPCHECK "${CPPCHECK};--std=c++11") - -find_program(CPPLINT cpplint.py) -set(CMAKE_CXX_CPPLINT "${CPPLINT};--linelength=80") - -ENDIF() + find_program(CPPCHECK cppcheck) + set(CMAKE_CXX_CPPCHECK "${CPPCHECK};--std=c++11") + find_program(CPPLINT cpplint.py) + set(CMAKE_CXX_CPPLINT "${CPPLINT};--linelength=80") +endif() diff --git a/core/cmake/BareosGenerateDebianInfo.cmake b/core/cmake/BareosGenerateDebianInfo.cmake index da241a77616..57d5be5269e 100644 --- a/core/cmake/BareosGenerateDebianInfo.cmake +++ b/core/cmake/BareosGenerateDebianInfo.cmake @@ -17,32 +17,45 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - -IF(GENERATE_DEBIAN_CONTROL) - - IF(HAVE_TRAYMONITOR) - FILE(READ ./debian/control.bareos-traymonitor DEBIAN_CONTROL_TRAYMONITOR) - ENDIF() - - IF(HAVE_GLUSTERFS) - FILE(READ ./debian/control.bareos-filedaemon-glusterfs-plugin DEBIAN_CONTROL_FILEDAEMON_GLUSTERFS_PLUGIN) - FILE(READ ./debian/control.bareos-storage-glusterfs DEBIAN_CONTROL_STORAGE_GLUSTERFS) - ENDIF() - - IF(HAVE_CEPHFS) - FILE(READ ./debian/control.bareos-filedaemon-ceph-plugin DEBIAN_CONTROL_FILEDAEMON_CEPH_PLUGIN) - FILE(READ ./debian/control.bareos-storage-ceph DEBIAN_CONTROL_STORAGE_CEPH) - ENDIF() - - IF(HAVE_PYTHON) - FILE(READ ./debian/control.bareos-filedaemon-python-plugin DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN) - FILE(READ ./debian/control.bareos-storage-python-plugin DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN) - FILE(READ ./debian/control.bareos-director-python-plugin DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN) - ENDIF() - - IF (${DISTNAME} MATCHES "univention") - # only required for univention - FILE(READ ./debian/control.univention-bareos DEBIAN_CONTROL_UNIVENTION_BAREOS) - ENDIF() - -ENDIF() +if(GENERATE_DEBIAN_CONTROL) + + if(HAVE_TRAYMONITOR) + file(READ ./debian/control.bareos-traymonitor DEBIAN_CONTROL_TRAYMONITOR) + endif() + + if(HAVE_GLUSTERFS) + file(READ ./debian/control.bareos-filedaemon-glusterfs-plugin + DEBIAN_CONTROL_FILEDAEMON_GLUSTERFS_PLUGIN + ) + file(READ ./debian/control.bareos-storage-glusterfs + DEBIAN_CONTROL_STORAGE_GLUSTERFS + ) + endif() + + if(HAVE_CEPHFS) + file(READ ./debian/control.bareos-filedaemon-ceph-plugin + DEBIAN_CONTROL_FILEDAEMON_CEPH_PLUGIN + ) + file(READ ./debian/control.bareos-storage-ceph DEBIAN_CONTROL_STORAGE_CEPH) + endif() + + if(HAVE_PYTHON) + file(READ ./debian/control.bareos-filedaemon-python-plugin + DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN + ) + file(READ ./debian/control.bareos-storage-python-plugin + DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN + ) + file(READ ./debian/control.bareos-director-python-plugin + DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN + ) + endif() + + if(${DISTNAME} MATCHES "univention") + # only required for univention + file(READ ./debian/control.univention-bareos + DEBIAN_CONTROL_UNIVENTION_BAREOS + ) + endif() + +endif() diff --git a/core/cmake/BareosGetDistInfo.cmake b/core/cmake/BareosGetDistInfo.cmake index 746e2224132..ebd2cf6894b 100644 --- a/core/cmake/BareosGetDistInfo.cmake +++ b/core/cmake/BareosGetDistInfo.cmake @@ -17,42 +17,40 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +# get DIST info in format +# "$DISTNAME;$DISTVER;$OBS_PROJECT;$OBS_DISTRIBUTION;$OBS_ARCH;$OBS_SRCMD5" -#get DIST info in format "$DISTNAME;$DISTVER;$OBS_PROJECT;$OBS_DISTRIBUTION;$OBS_ARCH;$OBS_SRCMD5" - -execute_process(COMMAND ${PROJECT_SOURCE_DIR}/cmake/distname.sh - OUTPUT_VARIABLE DISTINFOTXT - OUTPUT_STRIP_TRAILING_WHITESPACE) +execute_process( + COMMAND ${PROJECT_SOURCE_DIR}/cmake/distname.sh + OUTPUT_VARIABLE DISTINFOTXT + OUTPUT_STRIP_TRAILING_WHITESPACE +) set(DISTINFO ${DISTINFOTXT}) - list(LENGTH DISTINFO DISTINFO_LENGTH) - list(GET DISTINFO 0 DISTNAME) -set( ENV{DISTNAME} ${DISTNAME} ) +set(ENV{DISTNAME} ${DISTNAME}) list(GET DISTINFO 1 DISTVER) -set( ENV{DISTVER} "${DISTVER}" ) +set(ENV{DISTVER} "${DISTVER}") +if(${DISTINFO_LENGTH} GREATER 2) + set(IS_BUILD_ON_OBS 1) -if (${DISTINFO_LENGTH} GREATER 2) - SET(IS_BUILD_ON_OBS 1) + list(GET DISTINFO 2 OBS_PROJECT) + set(ENV{OBS_PROJECT} "${OBS_PROJECT}") - list(GET DISTINFO 2 OBS_PROJECT) - set( ENV{OBS_PROJECT} "${OBS_PROJECT}" ) + list(GET DISTINFO 3 OBS_DISTRIBUTION) + set(ENV{OBS_DISTRIBUTION} "${OBS_DISTRIBUTION}") - list(GET DISTINFO 3 OBS_DISTRIBUTION) - set( ENV{OBS_DISTRIBUTION} "${OBS_DISTRIBUTION}" ) + list(GET DISTINFO 4 OBS_ARCH) + set(ENV{OBS_ARCH} "${OBS_ARCH}") - list(GET DISTINFO 4 OBS_ARCH) - set( ENV{OBS_ARCH} "${OBS_ARCH}" ) - - list(GET DISTINFO 5 OBS_SRCMD5) - set( ENV{OBS_SRCMD5} "${OBS_SRCMD5}" ) + list(GET DISTINFO 5 OBS_SRCMD5) + set(ENV{OBS_SRCMD5} "${OBS_SRCMD5}") endif() - set(Host "${CMAKE_SYSTEM} ${LSB_RELEASE_DESCRIPTION}") set(Distribution ${LSB_RELEASE_ID_SHORT}) diff --git a/core/cmake/BareosInstallConfigFiles.cmake b/core/cmake/BareosInstallConfigFiles.cmake index 25c44cdf643..d07ad00b216 100644 --- a/core/cmake/BareosInstallConfigFiles.cmake +++ b/core/cmake/BareosInstallConfigFiles.cmake @@ -17,126 +17,168 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - - -MACRO(BareosInstallConfigFiles CONFDIR CONFIGBASEDIRECTORY PLUGINS BACKENDS SRC_DIR) - -MESSAGE(STATUS "BareosInstallConfigFiles called with CONFDIR:${CONFDIR} CONFIGBASEDIRECTORY:${CONFIGBASEDIRECTORY} PLUGINS:${PLUGINS} BACKENDS:${BACKENDS} SRC_DIR:${SRC_DIR}") -MESSAGE(STATUS "CPACK_PACKAGING_INSTALL_PREFIX: ${CPACK_PACKAGING_INSTALL_PREFIX}") -MESSAGE(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") -MESSAGE(STATUS "DESTDIR: $ENV{DESTDIR}") - -IF (IS_ABSOLUTE ${CONFDIR}) - set (DESTCONFDIR "$ENV{DESTDIR}${CONFDIR}/${CONFIGBASEDIRECTORY}/") -ELSE() - set (DESTCONFDIR "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CONFDIR}/${CONFIGBASEDIRECTORY}/") -ENDIF() - - - -MESSAGE(STATUS "installing configuration ${CONFIGBASEDIRECTORY} resource files to ${DESTCONFDIR}") - -MESSAGE(STATUS "globbing ${SRC_DIR}/src/defaultconfigs/${CONFIGBASEDIRECTORY}/*") -file(GLOB resourcedirs "${SRC_DIR}/src/defaultconfigs/${CONFIGBASEDIRECTORY}/*") -foreach(resdir ${resourcedirs}) - file(GLOB configfiles "${resdir}/*.conf") - get_filename_component(resname ${resdir} NAME) - foreach(configfile ${configfiles}) +macro(BareosInstallConfigFiles CONFDIR CONFIGBASEDIRECTORY PLUGINS BACKENDS + SRC_DIR +) + + message( + STATUS + "BareosInstallConfigFiles called with CONFDIR:${CONFDIR} CONFIGBASEDIRECTORY:${CONFIGBASEDIRECTORY} PLUGINS:${PLUGINS} BACKENDS:${BACKENDS} SRC_DIR:${SRC_DIR}" + ) + message( + STATUS "CPACK_PACKAGING_INSTALL_PREFIX: ${CPACK_PACKAGING_INSTALL_PREFIX}" + ) + message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") + message(STATUS "DESTDIR: $ENV{DESTDIR}") + + if(IS_ABSOLUTE ${CONFDIR}) + set(DESTCONFDIR "$ENV{DESTDIR}${CONFDIR}/${CONFIGBASEDIRECTORY}/") + else() + set(DESTCONFDIR + "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CONFDIR}/${CONFIGBASEDIRECTORY}/" + ) + endif() + + message( + STATUS + "installing configuration ${CONFIGBASEDIRECTORY} resource files to ${DESTCONFDIR}" + ) + + message( + STATUS "globbing ${SRC_DIR}/src/defaultconfigs/${CONFIGBASEDIRECTORY}/*" + ) + file(GLOB resourcedirs + "${SRC_DIR}/src/defaultconfigs/${CONFIGBASEDIRECTORY}/*" + ) + foreach(resdir ${resourcedirs}) + file(GLOB configfiles "${resdir}/*.conf") + get_filename_component(resname ${resdir} NAME) + foreach(configfile ${configfiles}) get_filename_component(fname ${configfile} NAME) - if (EXISTS ${DESTCONFDIR}/${resname}/${fname}) - MESSAGE(STATUS "${DESTCONFDIR}/${resname}/${fname} exists") - MESSAGE(STATUS "rename ${configfile} to ${configfile}.new") - FILE (RENAME "${configfile}" "${configfile}.new") - - MESSAGE(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}") - FILE (INSTALL "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}") - FILE (RENAME "${configfile}.new" "${configfile}") + if(EXISTS ${DESTCONFDIR}/${resname}/${fname}) + message(STATUS "${DESTCONFDIR}/${resname}/${fname} exists") + message(STATUS "rename ${configfile} to ${configfile}.new") + file(RENAME "${configfile}" "${configfile}.new") + + message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}") + file(INSTALL "${configfile}.new" + DESTINATION "${DESTCONFDIR}/${resname}" + ) + file(RENAME "${configfile}.new" "${configfile}") else() - MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)") - FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") + message( + STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)" + ) + file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") endif() - endforeach() -endforeach() - -# add bareos-dir-export for bareos-dir -if (${CONFIGBASEDIRECTORY} STREQUAL "bareos-dir.d") - file(MAKE_DIRECTORY "${DESTCONFDIR}/../bareos-dir-export/client/") - file(MAKE_DIRECTORY "${DESTCONFDIR}/counter") - file(MAKE_DIRECTORY "${DESTCONFDIR}/user") -endif() - -# add ndmp resource directory for bareos-sd -if (${CONFIGBASEDIRECTORY} STREQUAL "bareos-sd.d") - file(MAKE_DIRECTORY "${DESTCONFDIR}/ndmp") -endif() - - - -# install configs from sd backends -FOREACH (BACKEND ${BACKENDS}) - - MESSAGE(STATUS "install ${CONFIGBASEDIRECTORY} config files for BACKEND ${BACKEND}") - set(BackendConfigSrcDir "${SRC_DIR}/src/stored/backends/${BACKEND}/${CONFIGBASEDIRECTORY}") - - file(GLOB_RECURSE configfiles RELATIVE "${BackendConfigSrcDir}" "${BackendConfigSrcDir}/*.conf") - foreach(configfile ${configfiles}) - get_filename_component(dir ${configfile} DIRECTORY) + endforeach() + endforeach() + + # add bareos-dir-export for bareos-dir + if(${CONFIGBASEDIRECTORY} STREQUAL "bareos-dir.d") + file(MAKE_DIRECTORY "${DESTCONFDIR}/../bareos-dir-export/client/") + file(MAKE_DIRECTORY "${DESTCONFDIR}/counter") + file(MAKE_DIRECTORY "${DESTCONFDIR}/user") + endif() + + # add ndmp resource directory for bareos-sd + if(${CONFIGBASEDIRECTORY} STREQUAL "bareos-sd.d") + file(MAKE_DIRECTORY "${DESTCONFDIR}/ndmp") + endif() + + # install configs from sd backends + foreach(BACKEND ${BACKENDS}) + + message( + STATUS + "install ${CONFIGBASEDIRECTORY} config files for BACKEND ${BACKEND}" + ) + set(BackendConfigSrcDir + "${SRC_DIR}/src/stored/backends/${BACKEND}/${CONFIGBASEDIRECTORY}" + ) + + file( + GLOB_RECURSE configfiles + RELATIVE "${BackendConfigSrcDir}" + "${BackendConfigSrcDir}/*.conf" + ) + foreach(configfile ${configfiles}) + get_filename_component(dir ${configfile} DIRECTORY) get_filename_component(fname ${configfile} NAME) - if (EXISTS ${DESTCONFDIR}/${configfile}) - MESSAGE(STATUS "${configfile} as ${configfile}.new (keep existing)") - FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.new") - FILE(COPY "${BackendConfigSrcDir}/${configfile}.new" DESTINATION "${DESTCONFDIR}/${dir}") - FILE(RENAME "${BackendConfigSrcDir}/${configfile}.new" "${BackendConfigSrcDir}/${configfile}") + if(EXISTS ${DESTCONFDIR}/${configfile}) + message(STATUS "${configfile} as ${configfile}.new (keep existing)") + file(RENAME "${BackendConfigSrcDir}/${configfile}" + "${BackendConfigSrcDir}/${configfile}.new" + ) + file(COPY "${BackendConfigSrcDir}/${configfile}.new" + DESTINATION "${DESTCONFDIR}/${dir}" + ) + file(RENAME "${BackendConfigSrcDir}/${configfile}.new" + "${BackendConfigSrcDir}/${configfile}" + ) else() - MESSAGE(STATUS "${configfile} as ${configfile}") - FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}") + message(STATUS "${configfile} as ${configfile}") + file(COPY "${BackendConfigSrcDir}/${configfile}" + DESTINATION "${DESTCONFDIR}/${dir}" + ) endif() - endforeach() - - file(GLOB_RECURSE configfiles RELATIVE "${BackendConfigSrcDir}" "${BackendConfigSrcDir}/*.example") - foreach(configfile ${configfiles}) - get_filename_component(dir ${configfile} DIRECTORY) - #get_filename_component(fname ${configfile} NAME) - - if (EXISTS ${DESTCONFDIR}/${configfile}) - MESSAGE(STATUS "overwriting ${configfile}") + endforeach() + + file( + GLOB_RECURSE configfiles + RELATIVE "${BackendConfigSrcDir}" + "${BackendConfigSrcDir}/*.example" + ) + foreach(configfile ${configfiles}) + get_filename_component(dir ${configfile} DIRECTORY) + # get_filename_component(fname ${configfile} NAME) + + if(EXISTS ${DESTCONFDIR}/${configfile}) + message(STATUS "overwriting ${configfile}") else() - MESSAGE(STATUS "${configfile} as ${configfile}") + message(STATUS "${configfile} as ${configfile}") endif() - FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}") - endforeach() - -ENDFOREACH() - + file(COPY "${BackendConfigSrcDir}/${configfile}" + DESTINATION "${DESTCONFDIR}/${dir}" + ) + endforeach() + endforeach() -# install configs from fd plugins -FOREACH (PLUGIN ${PLUGINS}) - MESSAGE(STATUS "install config files for PLUGIN ${PLUGIN}") - file(GLOB resourcedirs "${SRC_DIR}/src/plugins/filed/${PLUGIN}/${CONFIGBASEDIRECTORY}/*") - foreach(resdir ${resourcedirs}) + # install configs from fd plugins + foreach(PLUGIN ${PLUGINS}) + message(STATUS "install config files for PLUGIN ${PLUGIN}") + file(GLOB resourcedirs + "${SRC_DIR}/src/plugins/filed/${PLUGIN}/${CONFIGBASEDIRECTORY}/*" + ) + foreach(resdir ${resourcedirs}) file(GLOB configfiles "${resdir}/*.conf*") get_filename_component(resname ${resdir} NAME) foreach(configfile ${configfiles}) - STRING(REGEX MATCH "\\.in\$" IS_INFILE ${configfile}) - if (NOT "${IS_INFILE}" STREQUAL ".in") - get_filename_component(fname ${configfile} NAME) - if (EXISTS ${DESTCONFDIR}/${resname}/${fname}) - MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.new (keep existing)") - FILE (RENAME "${configfile}" "${configfile}.new") - FILE (COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}") - FILE (RENAME "${configfile}.new" "${configfile}") - else() - MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}") - FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") - endif() - else() - MESSAGE(STATUS "skipping .in file ${configfile}:${IS_INFILE}") - endif() + string(REGEX MATCH "\\.in\$" IS_INFILE ${configfile}) + if(NOT "${IS_INFILE}" STREQUAL ".in") + get_filename_component(fname ${configfile} NAME) + if(EXISTS ${DESTCONFDIR}/${resname}/${fname}) + message( + STATUS + "${resname}/${fname} as ${resname}/${fname}.new (keep existing)" + ) + file(RENAME "${configfile}" "${configfile}.new") + file(COPY "${configfile}.new" + DESTINATION "${DESTCONFDIR}/${resname}" + ) + file(RENAME "${configfile}.new" "${configfile}") + else() + message(STATUS "${resname}/${fname} as ${resname}/${fname}") + file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") + endif() + else() + message(STATUS "skipping .in file ${configfile}:${IS_INFILE}") + endif() endforeach() - endforeach() -ENDFOREACH() + endforeach() + endforeach() -ENDMACRO(BareosInstallConfigFiles) +endmacro(BareosInstallConfigFiles) diff --git a/core/cmake/BareosSetVariableDefaults.cmake b/core/cmake/BareosSetVariableDefaults.cmake index 328ed113c6f..2f51a61c6de 100644 --- a/core/cmake/BareosSetVariableDefaults.cmake +++ b/core/cmake/BareosSetVariableDefaults.cmake @@ -17,490 +17,487 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - # check if variables are set via cmdline else set them to default values -## configure variables -## -## strings - directories +# configure variables +# +# strings - directories # prefix -IF(NOT DEFINED prefix) - set (prefix ${CMAKE_DEFAULT_PREFIX}) -ENDIF() - +if(NOT DEFINED prefix) + set(prefix ${CMAKE_DEFAULT_PREFIX}) +endif() -IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # libdir - IF(NOT DEFINED libdir) + if(NOT DEFINED libdir) set(libdir ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) - ENDIF() + endif() # includedir - IF(NOT DEFINED includedir) + if(NOT DEFINED includedir) set(includedir ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}) - ENDIF() + endif() # bindir - IF(NOT DEFINED bindir) + if(NOT DEFINED bindir) set(bindir ${CMAKE_INSTALL_BINDIR}) - MESSAGE(STATUS "set bindir to default ${bindir}") - ENDIF() - + message(STATUS "set bindir to default ${bindir}") + endif() # sbindir - IF(NOT DEFINED sbindir) + if(NOT DEFINED sbindir) set(sbindir ${CMAKE_INSTALL_SBINDIR}) - MESSAGE(STATUS "set sbindir to default ${sbindir}") - ENDIF() + message(STATUS "set sbindir to default ${sbindir}") + endif() # sysconfdir - IF(NOT DEFINED sysconfdir) + if(NOT DEFINED sysconfdir) set(sysconfdir ${CMAKE_INSTALL_SYSCONFDIR}) - ENDIF() + endif() set(SYSCONFDIR "\"${sysconfdir}\"") # confdir - IF(NOT DEFINED confdir) + if(NOT DEFINED confdir) set(confdir "${sysconfdir}/${CMAKE_PROJECT_NAME}") - ENDIF() + endif() # configtemplatedir - IF(NOT DEFINED configtemplatedir) + if(NOT DEFINED configtemplatedir) set(configtemplatedir "lib/${CMAKE_PROJECT_NAME}/defaultconfigs") - ENDIF() + endif() # mandir - IF(NOT DEFINED mandir) + if(NOT DEFINED mandir) set(mandir ${CMAKE_INSTALL_MANDIR}) - ENDIF() + endif() # docdir - IF(NOT DEFINED docdir) - SET(docdir default_for_docdir) - ENDIF() + if(NOT DEFINED docdir) + set(docdir default_for_docdir) + endif() # htmldir - IF(NOT DEFINED htmldir) - SET(htmldir default_for_htmldir) - ENDIF() + if(NOT DEFINED htmldir) + set(htmldir default_for_htmldir) + endif() # archivedir - IF(NOT DEFINED archivedir) - set(archivedir "/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${CMAKE_PROJECT_NAME}/storage") - ENDIF() + if(NOT DEFINED archivedir) + set(archivedir + "/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${CMAKE_PROJECT_NAME}/storage" + ) + endif() # backenddir - IF(NOT DEFINED backenddir) + if(NOT DEFINED backenddir) set(backenddir ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}/backends) - ENDIF() + endif() # scriptdir - IF(NOT DEFINED scriptdir) + if(NOT DEFINED scriptdir) set(scriptdir "lib/${CMAKE_PROJECT_NAME}/scripts") - ENDIF() + endif() # workingdir - IF(NOT DEFINED workingdir) + if(NOT DEFINED workingdir) set(workingdir "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${CMAKE_PROJECT_NAME}") - ENDIF() + endif() set(working_dir "${workingdir}") # plugindir - IF(NOT DEFINED plugindir) + if(NOT DEFINED plugindir) set(plugindir ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}/plugins) - ENDIF() + endif() # piddir - IF(NOT DEFINED piddir) - SET(piddir ${workingdir}) - ENDIF() + if(NOT DEFINED piddir) + set(piddir ${workingdir}) + endif() # bsrdir - IF(NOT DEFINED bsrdir) - SET(bsrdir ${workingdir}) - ENDIF() + if(NOT DEFINED bsrdir) + set(bsrdir ${workingdir}) + endif() # logdir - IF(NOT DEFINED logdir) + if(NOT DEFINED logdir) set(logdir "${CMAKE_INSTALL_LOCALSTATEDIR}/log/${CMAKE_PROJECT_NAME}") - ENDIF() + endif() # datarootdir - IF(NOT DEFINED datarootdir) + if(NOT DEFINED datarootdir) set(datarootdir "${CMAKE_INSTALL_DATAROOTDIR}") - ENDIF() + endif() # subsysdir - IF(NOT DEFINED subsysdir) + if(NOT DEFINED subsysdir) set(subsysdir "${workingdir}") - ENDIF() + endif() -ELSE() # IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +else() # IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # libdir - IF(NOT DEFINED libdir) + if(NOT DEFINED libdir) set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}) - ENDIF() + endif() # includedir - IF(NOT DEFINED includedir) + if(NOT DEFINED includedir) set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}) - ENDIF() + endif() # bindir - IF(NOT DEFINED bindir) + if(NOT DEFINED bindir) set(bindir ${CMAKE_INSTALL_FULL_BINDIR}) - MESSAGE(STATUS "set bindir to default ${bindir}") - ENDIF() - + message(STATUS "set bindir to default ${bindir}") + endif() # sbindir - IF(NOT DEFINED sbindir) + if(NOT DEFINED sbindir) set(sbindir ${CMAKE_INSTALL_FULL_SBINDIR}) - MESSAGE(STATUS "set sbindir to default ${sbindir}") - ENDIF() + message(STATUS "set sbindir to default ${sbindir}") + endif() # sysconfdir - IF(NOT DEFINED sysconfdir) + if(NOT DEFINED sysconfdir) set(sysconfdir ${CMAKE_INSTALL_FULL_SYSCONFDIR}) - ENDIF() + endif() set(SYSCONFDIR "\"${sysconfdir}\"") # confdir - IF(NOT DEFINED confdir) + if(NOT DEFINED confdir) set(confdir "${sysconfdir}/${CMAKE_PROJECT_NAME}") - ENDIF() + endif() # configtemplatedir - IF(NOT DEFINED configtemplatedir) + if(NOT DEFINED configtemplatedir) set(configtemplatedir "${confdir}") - ENDIF() + endif() # mandir - IF(NOT DEFINED mandir) + if(NOT DEFINED mandir) set(mandir ${CMAKE_INSTALL_FULL_MANDIR}) - ENDIF() + endif() # docdir - IF(NOT DEFINED docdir) - SET(docdir default_for_docdir) - ENDIF() + if(NOT DEFINED docdir) + set(docdir default_for_docdir) + endif() # htmldir - IF(NOT DEFINED htmldir) - SET(htmldir default_for_htmldir) - ENDIF() + if(NOT DEFINED htmldir) + set(htmldir default_for_htmldir) + endif() # archivedir - IF(NOT DEFINED archivedir) - set(archivedir "/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${CMAKE_PROJECT_NAME}/storage") - ENDIF() + if(NOT DEFINED archivedir) + set(archivedir + "/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${CMAKE_PROJECT_NAME}/storage" + ) + endif() # backenddir - IF(NOT DEFINED backenddir) + if(NOT DEFINED backenddir) set(backenddir ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}/backends) - ENDIF() + endif() # scriptdir - IF(NOT DEFINED scriptdir) + if(NOT DEFINED scriptdir) set(scriptdir "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/scripts") - ENDIF() + endif() # workingdir - IF(NOT DEFINED workingdir) + if(NOT DEFINED workingdir) set(workingdir "/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${CMAKE_PROJECT_NAME}") - ENDIF() + endif() set(working_dir "${workingdir}") # plugindir - IF(NOT DEFINED plugindir) + if(NOT DEFINED plugindir) set(plugindir ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}/plugins) - ENDIF() + endif() # piddir - IF(NOT DEFINED piddir) - SET(piddir ${workingdir}) - ENDIF() + if(NOT DEFINED piddir) + set(piddir ${workingdir}) + endif() # bsrdir - IF(NOT DEFINED bsrdir) - SET(bsrdir ${workingdir}) - ENDIF() + if(NOT DEFINED bsrdir) + set(bsrdir ${workingdir}) + endif() # logdir - IF(NOT DEFINED logdir) + if(NOT DEFINED logdir) set(logdir "${CMAKE_INSTALL_LOCALSTATEDIR}/log/${CMAKE_PROJECT_NAME}") - ENDIF() + endif() # datarootdir - IF(NOT DEFINED datarootdir) + if(NOT DEFINED datarootdir) set(datarootdir "${CMAKE_INSTALL_FULL_DATAROOTDIR}") - ENDIF() + endif() # subsysdir - IF(NOT DEFINED subsysdir) + if(NOT DEFINED subsysdir) set(subsysdir "${workingdir}") - ENDIF() - -ENDIF() # IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + endif() +endif() # IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # db_name -IF(NOT DEFINED db_name) - SET(db_name "bareos") -ENDIF() +if(NOT DEFINED db_name) + set(db_name "bareos") +endif() # db_user -IF(NOT DEFINED db_user) - SET(db_user "bareos") -ENDIF() +if(NOT DEFINED db_user) + set(db_user "bareos") +endif() # db_password -IF(NOT DEFINED db_password) - SET(db_password "") -ENDIF() +if(NOT DEFINED db_password) + set(db_password "") +endif() # dir-user -IF(NOT DEFINED dir-user) - SET(dir-user "") -ENDIF() -SET(dir_user "${dir-user}") +if(NOT DEFINED dir-user) + set(dir-user "") +endif() +set(dir_user "${dir-user}") # dir-group -IF(NOT DEFINED dir-group) - SET(dir-group "") -ENDIF() +if(NOT DEFINED dir-group) + set(dir-group "") +endif() set(dir_group ${dir-group}) # sd-user -IF(NOT DEFINED sd-user) - SET(sd-user "") -ENDIF() -SET(sd_user ${sd-user}) +if(NOT DEFINED sd-user) + set(sd-user "") +endif() +set(sd_user ${sd-user}) # sd-group -IF(NOT DEFINED sd-group) - SET(sd-group "") -ENDIF() -SET(sd_group ${sd-group}) +if(NOT DEFINED sd-group) + set(sd-group "") +endif() +set(sd_group ${sd-group}) # fd-user -IF(NOT DEFINED fd-user) - SET(fd-user "") -ENDIF() -SET(fd_user ${fd-user}) +if(NOT DEFINED fd-user) + set(fd-user "") +endif() +set(fd_user ${fd-user}) # fd-group -IF(NOT DEFINED fd-group) - SET(fd-group "") -ENDIF() -SET(fd_group ${fd-group}) - +if(NOT DEFINED fd-group) + set(fd-group "") +endif() +set(fd_group ${fd-group}) # dir-password -IF(NOT DEFINED dir-password) - SET(dir-password "bareos") -ENDIF() -SET(dir_password ${dir-password}) +if(NOT DEFINED dir-password) + set(dir-password "bareos") +endif() +set(dir_password ${dir-password}) # fd-password -IF(NOT DEFINED fd-password) - SET(fd-password "") -ENDIF() -SET(fd_password ${fd-password}) +if(NOT DEFINED fd-password) + set(fd-password "") +endif() +set(fd_password ${fd-password}) # sd-password -IF(NOT DEFINED sd-password) - SET(sd-password "") -ENDIF() -SET(sd_password ${sd-password}) +if(NOT DEFINED sd-password) + set(sd-password "") +endif() +set(sd_password ${sd-password}) # mon-dir-password -IF(NOT DEFINED mon-dir-password) - SET(mon-dir-password "") -ENDIF() -SET(mon_dir_password ${mon-dir-password}) +if(NOT DEFINED mon-dir-password) + set(mon-dir-password "") +endif() +set(mon_dir_password ${mon-dir-password}) # mon-fd-password -IF(NOT DEFINED mon-fd-password) - SET(mon-fd-password "") -ENDIF() -SET(mon_fd_password ${mon-fd-password}) +if(NOT DEFINED mon-fd-password) + set(mon-fd-password "") +endif() +set(mon_fd_password ${mon-fd-password}) # mon-sd-password -IF(NOT DEFINED mon-sd-password) - SET(mon-sd-password "") -ENDIF() -SET(mon_sd_password ${mon-sd-password} ) +if(NOT DEFINED mon-sd-password) + set(mon-sd-password "") +endif() +set(mon_sd_password ${mon-sd-password}) # basename -IF(NOT DEFINED basename) - SET(basename localhost) -ENDIF() +if(NOT DEFINED basename) + set(basename localhost) +endif() # hostname -IF(NOT DEFINED hostname) - SET(hostname localhost) -ENDIF() +if(NOT DEFINED hostname) + set(hostname localhost) +endif() -########## -## rights -########## +# ############################################################################## +# rights +# ############################################################################## # sbin-perm -IF(NOT DEFINED sbin-perm) - SET(sbin-perm 755) -ENDIF() - - +if(NOT DEFINED sbin-perm) + set(sbin-perm 755) +endif() -########### -## bool -########### +# ############################################################################## +# bool +# ############################################################################## # python -IF(NOT DEFINED python) - SET(python ON) -ENDIF() +if(NOT DEFINED python) + set(python ON) +endif() # lockmgr -IF(NOT DEFINED lockmgr) - SET(lockmgr OFF) - set(LOCKMGR 0) -ENDIF() +if(NOT DEFINED lockmgr) + set(lockmgr OFF) + set(LOCKMGR 0) +endif() # readline -IF(NOT DEFINED readline) - SET(readline ON) -ENDIF() +if(NOT DEFINED readline) + set(readline ON) +endif() # batch-insert -IF((NOT DEFINED batch-insert) OR (${batch-insert})) - SET(batch-insert ON) - SET(HAVE_POSTGRESQL_BATCH_FILE_INSERT 1) - SET(USE_BATCH_FILE_INSERT 1) -ENDIF() +if((NOT DEFINED batch-insert) OR (${batch-insert})) + set(batch-insert ON) + set(HAVE_POSTGRESQL_BATCH_FILE_INSERT 1) + set(USE_BATCH_FILE_INSERT 1) +endif() # dynamic-cats-backends -IF(NOT DEFINED dynamic-cats-backends) - SET(dynamic-cats-backends ON) - SET(HAVE_DYNAMIC_CATS_BACKENDS 1) -ELSE() - IF (${dynamic-cats-backends}) - SET(HAVE_DYNAMIC_CATS_BACKENDS 1) - ELSE() - SET(HAVE_DYNAMIC_CATS_BACKENDS 0) - ENDIF() -ENDIF() +if(NOT DEFINED dynamic-cats-backends) + set(dynamic-cats-backends ON) + set(HAVE_DYNAMIC_CATS_BACKENDS 1) +else() + if(${dynamic-cats-backends}) + set(HAVE_DYNAMIC_CATS_BACKENDS 1) + else() + set(HAVE_DYNAMIC_CATS_BACKENDS 0) + endif() +endif() # dynamic-storage-backends -IF(NOT DEFINED dynamic-storage-backends) - SET(dynamic-storage-backends ON) - SET(HAVE_DYNAMIC_SD_BACKENDS 1) -ELSE() - IF (${dynamic-storage-backends}) - SET(HAVE_DYNAMIC_SD_BACKENDS 1) - ELSE() - SET(HAVE_DYNAMIC_SD_BACKENDS 0) - ENDIF() -ENDIF() +if(NOT DEFINED dynamic-storage-backends) + set(dynamic-storage-backends ON) + set(HAVE_DYNAMIC_SD_BACKENDS 1) +else() + if(${dynamic-storage-backends}) + set(HAVE_DYNAMIC_SD_BACKENDS 1) + else() + set(HAVE_DYNAMIC_SD_BACKENDS 0) + endif() +endif() # scsi-crypto -IF(NOT DEFINED scsi-crypto) - SET(scsi-crypto OFF) -ENDIF() +if(NOT DEFINED scsi-crypto) + set(scsi-crypto OFF) +endif() # lmdb -IF(NOT DEFINED lmdb) - SET(lmdb ON) -ENDIF() +if(NOT DEFINED lmdb) + set(lmdb ON) +endif() # ndmp -IF(NOT DEFINED ndmp) - SET(ndmp ON) -ENDIF() +if(NOT DEFINED ndmp) + set(ndmp ON) +endif() # ipv6 -IF((NOT DEFINED ipv6) OR (${ipv6})) - SET(ipv6 ON) - SET(HAVE_IPV6 1) -ENDIF() +if((NOT DEFINED ipv6) OR (${ipv6})) + set(ipv6 ON) + set(HAVE_IPV6 1) +endif() # acl -IF(NOT DEFINED acl) - SET(acl ON) -ENDIF() +if(NOT DEFINED acl) + set(acl ON) +endif() # xattr -IF(NOT DEFINED xattr) - SET(xattr ON) -ENDIF() +if(NOT DEFINED xattr) + set(xattr ON) +endif() # build_ndmjob -IF(NOT DEFINED build_ndmjob) - SET(build_ndmjob OFF) -ENDIF() +if(NOT DEFINED build_ndmjob) + set(build_ndmjob OFF) +endif() # bat -IF(NOT DEFINED bat) - SET(bat OFF) -ENDIF() +if(NOT DEFINED bat) + set(bat OFF) +endif() # traymonitor -IF(NOT DEFINED traymonitor) - SET(HAVE_TRAYMONITOR 0) -ENDIF() +if(NOT DEFINED traymonitor) + set(HAVE_TRAYMONITOR 0) +endif() # client-only -IF(NOT DEFINED client-only) - SET(client-only OFF) - SET(build_client_only OFF) -ELSE() - SET(client-only ON) - SET(build_client_only ON) -ENDIF() +if(NOT DEFINED client-only) + set(client-only OFF) + set(build_client_only OFF) +else() + set(client-only ON) + set(build_client_only ON) +endif() # postgresql -IF(NOT DEFINED postgresql) - SET(postgresql OFF) -ENDIF() +if(NOT DEFINED postgresql) + set(postgresql OFF) +endif() # mysql -IF(NOT DEFINED mysql) - SET(mysql OFF) -ENDIF() +if(NOT DEFINED mysql) + set(mysql OFF) +endif() # sqlite3 -IF(NOT DEFINED sqlite3) - SET(sqlite3 OFF) -ENDIF() - +if(NOT DEFINED sqlite3) + set(sqlite3 OFF) +endif() -IF(NOT sqlite3) - IF(NOT mysql) - IF(NOT postgresql) - IF(NOT client-only) - MESSAGE(FATAL_ERROR "No database backend was chosen, please choose at least one from \n" - " - postgresql (-Dpostgresql=yes)\n" - " - mysqli (-Dmysql=yes) \n" - " - sqlite3 (-Dsqlite3=yes) \n" - " or select client only build (-Dclient-only=yes) \n" - ) - ENDIF() - ENDIF() - ENDIF() -ENDIF() +if(NOT sqlite3) + if(NOT mysql) + if(NOT postgresql) + if(NOT client-only) + message( + FATAL_ERROR + "No database backend was chosen, please choose at least one from \n" + " - postgresql (-Dpostgresql=yes)\n" + " - mysqli (-Dmysql=yes) \n" + " - sqlite3 (-Dsqlite3=yes) \n" + " or select client only build (-Dclient-only=yes) \n" + ) + endif() + endif() + endif() +endif() -IF(NOT mysql) - set(MYSQL_INCLUDE_DIR "") +if(NOT mysql) + set(MYSQL_INCLUDE_DIR "") endif() -IF(NOT postgresql) - set(PostgreSQL_INCLUDE_DIR "") +if(NOT postgresql) + set(PostgreSQL_INCLUDE_DIR "") endif() if(NOT Readline_LIBRARY) - set(Readline_LIBRARY "") + set(Readline_LIBRARY "") endif() if(NOT LIBZ_FOUND) @@ -509,165 +506,162 @@ endif() set(db_backends "") -IF(NOT client-only) - if(${sqlite3}) - set(HAVE_SQLITE3 1) - list(APPEND db_backends sqlite3) - endif() - - if(${postgresql}) - set(HAVE_POSTGRESQL 1) - list(APPEND db_backends postgresql) - endif() - - if(${mysql}) - set(HAVE_MYSQL 1) - list(APPEND db_backends mysql) - endif() - - # set first entry as default db backend - LIST(GET db_backends 0 default_db_backend) - set (DEFAULT_DB_TYPE ${default_db_backend} PARENT_SCOPE) - set (DEFAULT_DB_TYPE ${default_db_backend}) +if(NOT client-only) + if(${sqlite3}) + set(HAVE_SQLITE3 1) + list(APPEND db_backends sqlite3) + endif() + + if(${postgresql}) + set(HAVE_POSTGRESQL 1) + list(APPEND db_backends postgresql) + endif() + + if(${mysql}) + set(HAVE_MYSQL 1) + list(APPEND db_backends mysql) + endif() + + # set first entry as default db backend + list(GET db_backends 0 default_db_backend) + get_directory_property(hasParent PARENT_DIRECTORY) + if(hasParent) + set(DEFAULT_DB_TYPE + ${default_db_backend} + PARENT_SCOPE + ) + endif() + set(DEFAULT_DB_TYPE ${default_db_backend}) endif() # tcp-wrappers -IF(NOT DEFINED tcp-wrappers) - SET(tcp-wrappers OFF) -ENDIF() +if(NOT DEFINED tcp-wrappers) + set(tcp-wrappers OFF) +endif() # systemd -IF(NOT DEFINED systemd) - SET(systemd OFF) -ENDIF() +if(NOT DEFINED systemd) + set(systemd OFF) +endif() # includes -IF(NOT DEFINED includes) - SET(includes ON) -ENDIF() +if(NOT DEFINED includes) + set(includes ON) +endif() # openssl -IF(NOT DEFINED openssl) - SET(openssl ON) -ENDIF() - - +if(NOT DEFINED openssl) + set(openssl ON) +endif() # ports -IF(NOT DEFINED dir_port) - SET(dir_port "9101") -ENDIF() - -IF(NOT DEFINED fd_port) - SET(fd_port "9102") -ENDIF() +if(NOT DEFINED dir_port) + set(dir_port "9101") +endif() -IF(NOT DEFINED sd_port) - SET(sd_port "9103") -ENDIF() +if(NOT DEFINED fd_port) + set(fd_port "9102") +endif() -IF(DEFINED baseport) - MATH(EXPR dir_port "${baseport}+0") - MATH(EXPR fd_port "${baseport}+1") - MATH(EXPR sd_port "${baseport}+2") -ENDIF() +if(NOT DEFINED sd_port) + set(sd_port "9103") +endif() +if(DEFINED baseport) + math(EXPR dir_port "${baseport}+0") + math(EXPR fd_port "${baseport}+1") + math(EXPR sd_port "${baseport}+2") +endif() -IF(NOT DEFINED job_email) - SET(job_email "root") -ENDIF() +if(NOT DEFINED job_email) + set(job_email "root") +endif() -IF(NOT DEFINED dump_email) - SET(dump_email "root") -ENDIF() +if(NOT DEFINED dump_email) + set(dump_email "root") +endif() -IF(NOT DEFINED smtp_host) - SET(smtp_host "localhost") -ENDIF() +if(NOT DEFINED smtp_host) + set(smtp_host "localhost") +endif() -IF(DEFINED traymonitor) - SET(HAVE_TRAYMONITOR 1) -ENDIF() +if(DEFINED traymonitor) + set(HAVE_TRAYMONITOR 1) +endif() -IF(DEFINED test-plugin) - SET(HAVE_TEST_PLUGIN 1) -ENDIF() +if(DEFINED test-plugin) + set(HAVE_TEST_PLUGIN 1) +endif() -IF(NOT DEFINED developer) - SET(developer OFF) -ENDIF() +if(NOT DEFINED developer) + set(developer OFF) +endif() -IF(DEFINED dynamic-debian-package-list) - SET(GENERATE_DEBIAN_CONTROL ON) -ELSE() - SET(GENERATE_DEBIAN_CONTROL OFF) -ENDIF() +if(DEFINED dynamic-debian-package-list) + set(GENERATE_DEBIAN_CONTROL ON) +else() + set(GENERATE_DEBIAN_CONTROL OFF) +endif() -IF(NOT DEFINED coverage) - set (coverage OFF) -ENDIF() +if(NOT DEFINED coverage) + set(coverage OFF) +endif() # do not destroy bareos-config-lib.sh -SET(DB_NAME "@DB_NAME@") -SET(DB_USER "@DB_USER@") -SET(DB_PASS "@DB_PASS@") -SET(DB_VERSION "@DB_VERSION@") - - -IF (${CMAKE_COMPILER_IS_GNUCC}) - SET(HAVE_GCC 1) -ENDIF() - - +set(DB_NAME "@DB_NAME@") +set(DB_USER "@DB_USER@") +set(DB_PASS "@DB_PASS@") +set(DB_VERSION "@DB_VERSION@") +if(${CMAKE_COMPILER_IS_GNUCC}) + set(HAVE_GCC 1) +endif() set(lld "\"lld\"") set(llu "\"llu\"") -SET(HAVE_MYSQL_THREAD_SAFE 1) -SET(HAVE_POSIX_SIGNALS 1) -SET(HAVE_SHA2 1) -SET(HAVE_PQISTHREADSAFE 1) -SET(HAVE_PQ_COPY 1) - -SET(PROTOTYPES 1) -SET(RETSIGTYPE void) -SET(SETPGRP_VOID 1) -SET(SSTDC_HEADERS 1) - - -SET(_LARGEFILE_SOURCE 1) -SET(_LARGE_FILES 1) -SET(_FILE_OFFSET_BITS 64) -SET(HAVE_COMPRESS_BOUND 1) -SET(STDC_HEADERS 1) -SET(HAVE_SQLITE3_THREADSAFE 1) -SET(FSTYPE_MNTENT 1) - -SET(PACKAGE_BUGREPORT "\"\"") -SET(PACKAGE_NAME "\"${CMAKE_PROJECT_NAME}\"") -SET(PACKAGE_STRING "\"${CMAKE_PROJECT_NAME} ${BAREOS_NUMERIC_VERSION}\"") -SET(PACKAGE_TARNAME "\"\"" ) -SET(PACKAGE_URL "\"\"") -SET(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"") +set(HAVE_MYSQL_THREAD_SAFE 1) +set(HAVE_POSIX_SIGNALS 1) +set(HAVE_SHA2 1) +set(HAVE_PQISTHREADSAFE 1) +set(HAVE_PQ_COPY 1) + +set(PROTOTYPES 1) +set(RETSIGTYPE void) +set(SETPGRP_VOID 1) +set(SSTDC_HEADERS 1) + +set(_LARGEFILE_SOURCE 1) +set(_LARGE_FILES 1) +set(_FILE_OFFSET_BITS 64) +set(HAVE_COMPRESS_BOUND 1) +set(STDC_HEADERS 1) +set(HAVE_SQLITE3_THREADSAFE 1) +set(FSTYPE_MNTENT 1) + +set(PACKAGE_BUGREPORT "\"\"") +set(PACKAGE_NAME "\"${CMAKE_PROJECT_NAME}\"") +set(PACKAGE_STRING "\"${CMAKE_PROJECT_NAME} ${BAREOS_NUMERIC_VERSION}\"") +set(PACKAGE_TARNAME "\"\"") +set(PACKAGE_URL "\"\"") +set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"") set(ENABLE_NLS 1) +if(HAVE_WIN32) -IF(HAVE_WIN32) - - IF(NOT DEFINED WINDOWS_VERSION) - SET(WINDOWS_VERSION 0x600) - ENDIF() + if(NOT DEFINED WINDOWS_VERSION) + set(WINDOWS_VERSION 0x600) + endif() - IF(NOT DEFINED WINDOWS_BITS) - SET(WINDOWS_BITS 64) - ENDIF() + if(NOT DEFINED WINDOWS_BITS) + set(WINDOWS_BITS 64) + endif() -ENDIF() +endif() -IF(DEFINED do-static-code-checks) - SET(DO_STATIC_CODE_CHECKS ${do-static-code-checks}) -ELSE() - SET(DO_STATIC_CODE_CHECKS OFF) -ENDIF() +if(DEFINED do-static-code-checks) + set(DO_STATIC_CODE_CHECKS ${do-static-code-checks}) +else() + set(DO_STATIC_CODE_CHECKS OFF) +endif() diff --git a/core/cmake/BareosTimeFunctions.cmake b/core/cmake/BareosTimeFunctions.cmake index 6f9af37f34e..0b05b695bcd 100644 --- a/core/cmake/BareosTimeFunctions.cmake +++ b/core/cmake/BareosTimeFunctions.cmake @@ -15,10 +15,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -function(timestamp_at - at - result - format) +function(timestamp_at at result format) if(CMAKE_VERSION VERSION_GREATER 3.8.0) set(old_epoch "$ENV{SOURCE_DATE_EPOCH}") set(ENV{SOURCE_DATE_EPOCH} "${at}") @@ -27,16 +24,21 @@ function(timestamp_at else() set(old_lang "$ENV{LC_ALL}") set(ENV{LC_ALL} "C") - execute_process(COMMAND date - --utc - "--date=@${at}" - "+${format}" - OUTPUT_VARIABLE out - OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process( + COMMAND date --utc "--date=@${at}" "+${format}" + OUTPUT_VARIABLE out + OUTPUT_STRIP_TRAILING_WHITESPACE + ) set(ENV{LC_ALL} "${old_lang}") if(out STREQUAL "") - message(FATAL_ERROR "Cannot use SOURCE_DATE_EPOCH (cmake < 3.8) and your 'date' command is not compatible with Bareos' timestamp_at().") + message( + FATAL_ERROR + "Cannot use SOURCE_DATE_EPOCH (cmake < 3.8) and your 'date' command is not compatible with Bareos' timestamp_at()." + ) endif() endif() - set("${result}" "${out}" PARENT_SCOPE) + set("${result}" + "${out}" + PARENT_SCOPE + ) endfunction() diff --git a/core/cmake/BareosTypeSizes.cmake b/core/cmake/BareosTypeSizes.cmake index 74db1a87060..97c2af99be0 100644 --- a/core/cmake/BareosTypeSizes.cmake +++ b/core/cmake/BareosTypeSizes.cmake @@ -18,75 +18,76 @@ # 02110-1301, USA. # type size checks -INCLUDE(CheckTypeSize) -CHECK_TYPE_SIZE("short int" SIZEOF_SHORT_INT) -CHECK_TYPE_SIZE("char" SIZEOF_CHAR) -CHECK_TYPE_SIZE("int" SIZEOF_INT) -CHECK_TYPE_SIZE("int *" SIZEOF_INT_P) -CHECK_TYPE_SIZE("long int" SIZEOF_LONG_INT) -CHECK_TYPE_SIZE("long long int" SIZEOF_LONG_LONG_INT) +include(CheckTypeSize) +check_type_size("short int" SIZEOF_SHORT_INT) +check_type_size("char" SIZEOF_CHAR) +check_type_size("int" SIZEOF_INT) +check_type_size("int *" SIZEOF_INT_P) +check_type_size("long int" SIZEOF_LONG_INT) +check_type_size("long long int" SIZEOF_LONG_LONG_INT) -CHECK_TYPE_SIZE(int8_t INT8_T) -CHECK_TYPE_SIZE(int16_t INT16_T) -CHECK_TYPE_SIZE(int32_t INT32_T) -CHECK_TYPE_SIZE(int64_t INT64_T) -CHECK_TYPE_SIZE(intmax_t INTMAX_T) +check_type_size(int8_t INT8_T) +check_type_size(int16_t INT16_T) +check_type_size(int32_t INT32_T) +check_type_size(int64_t INT64_T) +check_type_size(intmax_t INTMAX_T) -CHECK_TYPE_SIZE(u_int8_t U_INT8_T) -CHECK_TYPE_SIZE(u_int16_t U_INT16_T) -CHECK_TYPE_SIZE(u_int32_t U_INT32_T) -CHECK_TYPE_SIZE(u_int64_t U_INT64_T) +check_type_size(u_int8_t U_INT8_T) +check_type_size(u_int16_t U_INT16_T) +check_type_size(u_int32_t U_INT32_T) +check_type_size(u_int64_t U_INT64_T) -CHECK_TYPE_SIZE(intptr_t INTPTR_T) -CHECK_TYPE_SIZE(uintptr_t UINTPTR_T) -CHECK_TYPE_SIZE(u_int HAVE_U_INT) +check_type_size(intptr_t INTPTR_T) +check_type_size(uintptr_t UINTPTR_T) +check_type_size(u_int HAVE_U_INT) -CHECK_TYPE_SIZE(major_t MAJOR_T) -CHECK_TYPE_SIZE(minor_t MINOR_T) +check_type_size(major_t MAJOR_T) +check_type_size(minor_t MINOR_T) -IF (NOT ${MAJOR_T}) - set(major_t int) -ENDIF() -IF (NOT ${MINOR_T}) - set(minor_t int) -ENDIF() +if(NOT ${MAJOR_T}) + set(major_t int) +endif() +if(NOT ${MINOR_T}) + set(minor_t int) +endif() # config.h requires 1 instead of TRUE -IF(${HAVE_U_INT}) - SET(HAVE_U_INT 1) -ENDIF() - -IF(${HAVE_INT64_T}) - SET(HAVE_INT64_T 1) -ENDIF() +if(${HAVE_U_INT}) + set(HAVE_U_INT 1) +endif() -IF(${HAVE_U_INT64_T}) - SET(HAVE_U_INT64_T 1) -ENDIF() +if(${HAVE_INT64_T}) + set(HAVE_INT64_T 1) +endif() -IF(${HAVE_INTMAX_T}) - SET(HAVE_INTMAX_T 1) -ENDIF() +if(${HAVE_U_INT64_T}) + set(HAVE_U_INT64_T 1) +endif() -IF(${HAVE_INTPTR_T}) - SET(HAVE_INTPTR_T 1) -ENDIF() +if(${HAVE_INTMAX_T}) + set(HAVE_INTMAX_T 1) +endif() -IF(${HAVE_UINTPTR_T}) - SET(HAVE_UINTPTR_T 1) -ENDIF() +if(${HAVE_INTPTR_T}) + set(HAVE_INTPTR_T 1) +endif() +if(${HAVE_UINTPTR_T}) + set(HAVE_UINTPTR_T 1) +endif() -if (${HAVE_INT8_T} AND - ${HAVE_INT16_T} AND - ${HAVE_INT32_T} AND - ${HAVE_INT32_T}) - set(HAVE_INTXX_T 1) +if(${HAVE_INT8_T} + AND ${HAVE_INT16_T} + AND ${HAVE_INT32_T} + AND ${HAVE_INT32_T} +) + set(HAVE_INTXX_T 1) endif() -if (${HAVE_U_INT8_T} AND - ${HAVE_U_INT16_T} AND - ${HAVE_U_INT32_T} AND - ${HAVE_U_INT32_T}) - set(HAVE_U_INTXX_T 1) +if(${HAVE_U_INT8_T} + AND ${HAVE_U_INT16_T} + AND ${HAVE_U_INT32_T} + AND ${HAVE_U_INT32_T} +) + set(HAVE_U_INTXX_T 1) endif() diff --git a/core/cmake/CMakeUserFindMySQL.cmake b/core/cmake/CMakeUserFindMySQL.cmake index 738f5881d6e..5671d36fcb5 100644 --- a/core/cmake/CMakeUserFindMySQL.cmake +++ b/core/cmake/CMakeUserFindMySQL.cmake @@ -5,43 +5,38 @@ # MYSQL_LIBRARIES - List of libraries when using MySQL. # MYSQL_FOUND - True if MySQL found. -IF (MYSQL_INCLUDE_DIR) +if(MYSQL_INCLUDE_DIR) # Already in cache, be silent - SET(MYSQL_FIND_QUIETLY TRUE) -ENDIF (MYSQL_INCLUDE_DIR) + set(MYSQL_FIND_QUIETLY TRUE) +endif(MYSQL_INCLUDE_DIR) -FIND_PATH(MYSQL_INCLUDE_DIR mysql.h - /usr/local/include/mysql - /usr/include/mysql -) +find_path(MYSQL_INCLUDE_DIR mysql.h /usr/local/include/mysql /usr/include/mysql) -SET(MYSQL_NAMES mysqlclient mysqlclient_r) -FIND_LIBRARY(MYSQL_LIBRARY +set(MYSQL_NAMES mysqlclient mysqlclient_r) +find_library( + MYSQL_LIBRARY NAMES ${MYSQL_NAMES} PATHS /usr/lib /usr/local/lib PATH_SUFFIXES mysql ) -IF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) - SET(MYSQL_FOUND TRUE) - SET( MYSQL_LIBRARIES ${MYSQL_LIBRARY} ) -ELSE (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) - SET(MYSQL_FOUND FALSE) - SET( MYSQL_LIBRARIES ) -ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) +if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) + set(MYSQL_FOUND TRUE) + set(MYSQL_LIBRARIES ${MYSQL_LIBRARY}) +else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) + set(MYSQL_FOUND FALSE) + set(MYSQL_LIBRARIES) +endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY) -IF (MYSQL_FOUND) - IF (NOT MYSQL_FIND_QUIETLY) - MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARY}") - ENDIF (NOT MYSQL_FIND_QUIETLY) -ELSE (MYSQL_FOUND) - IF (MYSQL_FIND_REQUIRED) - MESSAGE(STATUS "Looked for MySQL libraries named ${MYSQL_NAMES}.") - MESSAGE(FATAL_ERROR "Could NOT find MySQL library") - ENDIF (MYSQL_FIND_REQUIRED) -ENDIF (MYSQL_FOUND) +if(MYSQL_FOUND) + if(NOT MYSQL_FIND_QUIETLY) + message(STATUS "Found MySQL: ${MYSQL_LIBRARY}") + endif(NOT MYSQL_FIND_QUIETLY) +else(MYSQL_FOUND) + if(MYSQL_FIND_REQUIRED) + message(STATUS "Looked for MySQL libraries named ${MYSQL_NAMES}.") + message(FATAL_ERROR "Could NOT find MySQL library") + endif(MYSQL_FIND_REQUIRED) +endif(MYSQL_FOUND) -MARK_AS_ADVANCED( - MYSQL_LIBRARY - MYSQL_INCLUDE_DIR - ) +mark_as_advanced(MYSQL_LIBRARY MYSQL_INCLUDE_DIR) diff --git a/core/cmake/CodeCoverage.cmake b/core/cmake/CodeCoverage.cmake index 38ac972242b..118e872c398 100644 --- a/core/cmake/CodeCoverage.cmake +++ b/core/cmake/CodeCoverage.cmake @@ -69,170 +69,197 @@ include(CMakeParseArguments) # Check prereqs -find_program( GCOV_PATH gcov ) -find_program( LCOV_PATH NAMES lcov lcov.bat lcov.exe lcov.perl) -find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat ) -find_program( GCOVR_PATH gcovr PATHS ${PROJECT_SOURCE_DIR}/scripts/test) -find_program( SIMPLE_PYTHON_EXECUTABLE python ) +find_program(GCOV_PATH gcov) +find_program(LCOV_PATH NAMES lcov lcov.bat lcov.exe lcov.perl) +find_program(GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat) +find_program(GCOVR_PATH gcovr PATHS ${PROJECT_SOURCE_DIR}/scripts/test) +find_program(SIMPLE_PYTHON_EXECUTABLE python) if(NOT GCOV_PATH) - message(FATAL_ERROR "gcov not found! Aborting...") + message(FATAL_ERROR "gcov not found! Aborting...") endif() # NOT GCOV_PATH if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") - if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3) - message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...") - endif() + if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3) + message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...") + endif() elseif(NOT CMAKE_COMPILER_IS_GNUCXX) - message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...") + message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...") endif() -set(COVERAGE_COMPILER_FLAGS "-g -O0 --coverage -fprofile-arcs -ftest-coverage" - CACHE INTERNAL "") +set(COVERAGE_COMPILER_FLAGS + "-g -O0 --coverage -fprofile-arcs -ftest-coverage" + CACHE INTERNAL "" +) set(CMAKE_CXX_FLAGS_COVERAGE ${COVERAGE_COMPILER_FLAGS} - CACHE STRING "Flags used by the C++ compiler during coverage builds." - FORCE ) + CACHE STRING "Flags used by the C++ compiler during coverage builds." FORCE +) set(CMAKE_C_FLAGS_COVERAGE ${COVERAGE_COMPILER_FLAGS} - CACHE STRING "Flags used by the C compiler during coverage builds." - FORCE ) + CACHE STRING "Flags used by the C compiler during coverage builds." FORCE +) set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "" CACHE STRING "Flags used for linking binaries during coverage builds." - FORCE ) + FORCE +) set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "" - CACHE STRING "Flags used by the shared libraries linker during coverage builds." - FORCE ) + CACHE STRING + "Flags used by the shared libraries linker during coverage builds." + FORCE +) mark_as_advanced( - CMAKE_CXX_FLAGS_COVERAGE - CMAKE_C_FLAGS_COVERAGE - CMAKE_EXE_LINKER_FLAGS_COVERAGE - CMAKE_SHARED_LINKER_FLAGS_COVERAGE ) + CMAKE_CXX_FLAGS_COVERAGE CMAKE_C_FLAGS_COVERAGE + CMAKE_EXE_LINKER_FLAGS_COVERAGE CMAKE_SHARED_LINKER_FLAGS_COVERAGE +) if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading") + message( + WARNING + "Code coverage results with an optimised (non-Debug) build may be misleading" + ) endif() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug" if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - link_libraries(gcov) + link_libraries(gcov) else() - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") endif() -# Defines a target for running and collection code coverage information -# Builds dependencies, runs the given executable and outputs reports. -# NOTE! The executable should always have a ZERO as exit code otherwise -# the coverage generation will not complete. +# Defines a target for running and collection code coverage information Builds +# dependencies, runs the given executable and outputs reports. NOTE! The +# executable should always have a ZERO as exit code otherwise the coverage +# generation will not complete. # -# SETUP_TARGET_FOR_COVERAGE( -# NAME testrunner_coverage # New target name -# EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR -# DEPENDENCIES testrunner # Dependencies to build first -# ) +# SETUP_TARGET_FOR_COVERAGE( NAME testrunner_coverage # New +# target name EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in +# PROJECT_BINARY_DIR DEPENDENCIES testrunner # Dependencies +# to build first ) function(SETUP_TARGET_FOR_COVERAGE) - set(options NONE) - set(oneValueArgs NAME) - set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES) - cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - if(NOT LCOV_PATH) - message(FATAL_ERROR "lcov not found! Aborting...") - endif() # NOT LCOV_PATH - - if(NOT GENHTML_PATH) - message(FATAL_ERROR "genhtml not found! Aborting...") - endif() # NOT GENHTML_PATH - - # Setup target - add_custom_target(${Coverage_NAME} - - # Cleanup lcov - COMMAND ${LCOV_PATH} --directory . --zerocounters - # Create baseline to make sure untouched files show up in the report - COMMAND ${LCOV_PATH} -c -i -d . -o ${Coverage_NAME}.base - - # Run tests - COMMAND ${Coverage_EXECUTABLE} - - # Capturing lcov counters and generating report - COMMAND ${LCOV_PATH} --directory . --capture --output-file ${Coverage_NAME}.info - # add baseline counters - COMMAND ${LCOV_PATH} -a ${Coverage_NAME}.base -a ${Coverage_NAME}.info --output-file ${Coverage_NAME}.total - COMMAND ${LCOV_PATH} --remove ${Coverage_NAME}.total ${COVERAGE_EXCLUDES} --output-file ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned - COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned - COMMAND ${CMAKE_COMMAND} -E remove ${Coverage_NAME}.base ${Coverage_NAME}.info ${Coverage_NAME}.total ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned - - WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - DEPENDS ${Coverage_DEPENDENCIES} - COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report." - ) - - # Show info where to find the report - add_custom_command(TARGET ${Coverage_NAME} POST_BUILD - COMMAND ; - COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report." - ) + set(options NONE) + set(oneValueArgs NAME) + set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES) + cmake_parse_arguments( + Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} + ) + + if(NOT LCOV_PATH) + message(FATAL_ERROR "lcov not found! Aborting...") + endif() # NOT LCOV_PATH + + if(NOT GENHTML_PATH) + message(FATAL_ERROR "genhtml not found! Aborting...") + endif() # NOT GENHTML_PATH + + # Setup target + add_custom_target( + ${Coverage_NAME} + # Cleanup lcov + COMMAND + ${LCOV_PATH} --directory . --zerocounters + + + # Create baseline to make sure untouched files show up in the report + COMMAND ${LCOV_PATH} -c -i -d . -o ${Coverage_NAME}.base + # Run tests + COMMAND ${Coverage_EXECUTABLE} + + # Capturing lcov counters and generating report + COMMAND ${LCOV_PATH} --directory . --capture --output-file + ${Coverage_NAME}.info + # add baseline counters + COMMAND ${LCOV_PATH} -a ${Coverage_NAME}.base -a ${Coverage_NAME}.info + --output-file ${Coverage_NAME}.total + COMMAND ${LCOV_PATH} --remove ${Coverage_NAME}.total ${COVERAGE_EXCLUDES} + --output-file ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned + COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} + ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned + COMMAND ${CMAKE_COMMAND} -E remove ${Coverage_NAME}.base + ${Coverage_NAME}.info ${Coverage_NAME}.total + ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info.cleaned + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} + DEPENDS ${Coverage_DEPENDENCIES} + COMMENT + "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report." + ) + + # Show info where to find the report + add_custom_command( + TARGET ${Coverage_NAME} POST_BUILD + COMMAND ; + COMMENT + "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report." + ) endfunction() # SETUP_TARGET_FOR_COVERAGE -# Defines a target for running and collection code coverage information -# Builds dependencies, runs the given executable and outputs reports. -# NOTE! The executable should always have a ZERO as exit code otherwise -# the coverage generation will not complete. +# Defines a target for running and collection code coverage information Builds +# dependencies, runs the given executable and outputs reports. NOTE! The +# executable should always have a ZERO as exit code otherwise the coverage +# generation will not complete. # -# SETUP_TARGET_FOR_COVERAGE_COBERTURA( -# NAME ctest_coverage # New target name -# EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR -# DEPENDENCIES executable_target # Dependencies to build first -# ) +# SETUP_TARGET_FOR_COVERAGE_COBERTURA( NAME ctest_coverage # +# New target name EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in +# PROJECT_BINARY_DIR DEPENDENCIES executable_target # Dependencies to +# build first ) function(SETUP_TARGET_FOR_COVERAGE_COBERTURA) - set(options NONE) - set(oneValueArgs NAME) - set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES) - cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - if(NOT SIMPLE_PYTHON_EXECUTABLE) - message(FATAL_ERROR "python not found! Aborting...") - endif() # NOT SIMPLE_PYTHON_EXECUTABLE - - if(NOT GCOVR_PATH) - message(FATAL_ERROR "gcovr not found! Aborting...") - endif() # NOT GCOVR_PATH + set(options NONE) + set(oneValueArgs NAME) + set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES) + cmake_parse_arguments( + Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} + ) - # Combine excludes to several -e arguments - set(COBERTURA_EXCLUDES "") - foreach(EXCLUDE ${COVERAGE_EXCLUDES}) - set(COBERTURA_EXCLUDES "-e ${EXCLUDE} ${COBERTURA_EXCLUDES}") - endforeach() + if(NOT SIMPLE_PYTHON_EXECUTABLE) + message(FATAL_ERROR "python not found! Aborting...") + endif() # NOT SIMPLE_PYTHON_EXECUTABLE - add_custom_target(${Coverage_NAME} + if(NOT GCOVR_PATH) + message(FATAL_ERROR "gcovr not found! Aborting...") + endif() # NOT GCOVR_PATH - # Run tests - ${Coverage_EXECUTABLE} + # Combine excludes to several -e arguments + set(COBERTURA_EXCLUDES "") + foreach(EXCLUDE ${COVERAGE_EXCLUDES}) + set(COBERTURA_EXCLUDES "-e ${EXCLUDE} ${COBERTURA_EXCLUDES}") + endforeach() - # Running gcovr - COMMAND ${GCOVR_PATH} -x -r ${PROJECT_SOURCE_DIR} ${COBERTURA_EXCLUDES} - -o ${Coverage_NAME}.xml - WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - DEPENDS ${Coverage_DEPENDENCIES} - COMMENT "Running gcovr to produce Cobertura code coverage report." - ) + add_custom_target( + ${Coverage_NAME} + # Run tests + ${Coverage_EXECUTABLE} + # Running gcovr + COMMAND ${GCOVR_PATH} -x -r ${PROJECT_SOURCE_DIR} ${COBERTURA_EXCLUDES} -o + ${Coverage_NAME}.xml + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} + DEPENDS ${Coverage_DEPENDENCIES} + COMMENT "Running gcovr to produce Cobertura code coverage report." + ) - # Show info where to find the report - add_custom_command(TARGET ${Coverage_NAME} POST_BUILD - COMMAND ; - COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml." - ) + # Show info where to find the report + add_custom_command( + TARGET ${Coverage_NAME} POST_BUILD + COMMAND ; + COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml." + ) endfunction() # SETUP_TARGET_FOR_COVERAGE_COBERTURA function(APPEND_COVERAGE_COMPILER_FLAGS) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE) - message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}") + set(CMAKE_C_FLAGS + "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" + PARENT_SCOPE + ) + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" + PARENT_SCOPE + ) + message( + STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}" + ) endfunction() # APPEND_COVERAGE_COMPILER_FLAGS diff --git a/core/cmake/FindReadline.cmake b/core/cmake/FindReadline.cmake index 81668e1354d..b85dd39480b 100644 --- a/core/cmake/FindReadline.cmake +++ b/core/cmake/FindReadline.cmake @@ -1,40 +1,45 @@ # Search for the path containing library's headers -find_path(Readline_ROOT_DIR - NAMES include/readline/readline.h -) +find_path(Readline_ROOT_DIR NAMES include/readline/readline.h) # Search for include directory -find_path(Readline_INCLUDE_DIR - NAMES readline/readline.h - HINTS ${Readline_ROOT_DIR}/include +find_path( + Readline_INCLUDE_DIR + NAMES readline/readline.h + HINTS ${Readline_ROOT_DIR}/include ) # Search for library -if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(Readline_LIBRARY /usr/local/opt/readline/lib/libreadline.a ncurses) else() - find_library(Readline_LIBRARY - NAMES readline - HINTS ${Readline_ROOT_DIR}/lib + find_library( + Readline_LIBRARY + NAMES readline + HINTS ${Readline_ROOT_DIR}/lib ) endif() # Conditionally set READLINE_FOUND value -if(Readline_INCLUDE_DIR AND Readline_LIBRARY - AND Ncurses_LIBRARY) +if(Readline_INCLUDE_DIR + AND Readline_LIBRARY + AND Ncurses_LIBRARY +) set(READLINE_FOUND TRUE) -else(Readline_INCLUDE_DIR AND Readline_LIBRARY - AND Ncurses_LIBRARY) - FIND_LIBRARY(Readline_LIBRARY NAMES readline) +else( + Readline_INCLUDE_DIR + AND Readline_LIBRARY + AND Ncurses_LIBRARY +) + find_library(Readline_LIBRARY NAMES readline) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG - Readline_INCLUDE_DIR Readline_LIBRARY ) - MARK_AS_ADVANCED(Readline_INCLUDE_DIR Readline_LIBRARY) -endif(Readline_INCLUDE_DIR AND Readline_LIBRARY - AND Ncurses_LIBRARY) + find_package_handle_standard_args( + Readline DEFAULT_MSG Readline_INCLUDE_DIR Readline_LIBRARY + ) + mark_as_advanced(Readline_INCLUDE_DIR Readline_LIBRARY) +endif( + Readline_INCLUDE_DIR + AND Readline_LIBRARY + AND Ncurses_LIBRARY +) # Hide these variables in cmake GUIs -mark_as_advanced( - Readline_ROOT_DIR - Readline_INCLUDE_DIR - Readline_LIBRARY -) +mark_as_advanced(Readline_ROOT_DIR Readline_INCLUDE_DIR Readline_LIBRARY) diff --git a/core/cmake/acltypes.cmake b/core/cmake/acltypes.cmake index f3caeeda833..5e6cc2d4d24 100644 --- a/core/cmake/acltypes.cmake +++ b/core/cmake/acltypes.cmake @@ -1,17 +1,17 @@ -CHECK_C_SOURCE_COMPILES( +check_c_source_compiles( "#include #include - int main(void) { return ACL_TYPE_DEFAULT_DIR; }" - HAVE_ACL_TYPE_DEFAULT_DIR) + int main(void) { return ACL_TYPE_DEFAULT_DIR; }" HAVE_ACL_TYPE_DEFAULT_DIR +) -CHECK_C_SOURCE_COMPILES( +check_c_source_compiles( "#include #include - int main(void) { return ACL_TYPE_EXTENDED; }" - HAVE_ACL_TYPE_EXTENDED) + int main(void) { return ACL_TYPE_EXTENDED; }" HAVE_ACL_TYPE_EXTENDED +) -CHECK_C_SOURCE_COMPILES( +check_c_source_compiles( "#include #include - int main(void) { return ACL_TYPE_NFS4; }" - HAVE_ACL_TYPE_NFS4) + int main(void) { return ACL_TYPE_NFS4; }" HAVE_ACL_TYPE_NFS4 +) diff --git a/core/cmake/bareos-symlink-default-db-backend.cmake b/core/cmake/bareos-symlink-default-db-backend.cmake index 41e3988388d..1d44a6939c0 100644 --- a/core/cmake/bareos-symlink-default-db-backend.cmake +++ b/core/cmake/bareos-symlink-default-db-backend.cmake @@ -16,8 +16,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -MESSAGE(STATUS "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}") -execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink - ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX} - ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION} - ) +message( + STATUS + "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}" +) +execute_process( + COMMAND + ${CMAKE_COMMAND} -E create_symlink + ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX} + ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION} +) diff --git a/core/cmake/install-dird-configfiles.cmake b/core/cmake/install-dird-configfiles.cmake index 1b801178200..0a2cb6a7be8 100644 --- a/core/cmake/install-dird-configfiles.cmake +++ b/core/cmake/install-dird-configfiles.cmake @@ -18,4 +18,6 @@ # 02110-1301, USA. include(${CMAKE_CURRENT_LIST_DIR}/BareosInstallConfigFiles.cmake) -BareosInstallConfigFiles("${configtemplatedir}" "bareos-dir.d" "${PLUGINS}" "${BACKENDS}" "${SRC_DIR}") +bareosinstallconfigfiles( + "${configtemplatedir}" "bareos-dir.d" "${PLUGINS}" "${BACKENDS}" "${SRC_DIR}" +) diff --git a/core/cmake/install-filed-configfiles.cmake b/core/cmake/install-filed-configfiles.cmake index 8aa26d37b0b..4d5b98d645d 100644 --- a/core/cmake/install-filed-configfiles.cmake +++ b/core/cmake/install-filed-configfiles.cmake @@ -18,4 +18,6 @@ # 02110-1301, USA. include(${CMAKE_CURRENT_LIST_DIR}/BareosInstallConfigFiles.cmake) -BareosInstallConfigFiles("${configtemplatedir}" "bareos-fd.d" "${PLUGINS}" "${BACKENDS}" "${SRC_DIR}") +bareosinstallconfigfiles( + "${configtemplatedir}" "bareos-fd.d" "${PLUGINS}" "${BACKENDS}" "${SRC_DIR}" +) diff --git a/core/cmake/install-stored-configfiles.cmake b/core/cmake/install-stored-configfiles.cmake index 82ae83a64c7..8e88ac47942 100644 --- a/core/cmake/install-stored-configfiles.cmake +++ b/core/cmake/install-stored-configfiles.cmake @@ -18,4 +18,6 @@ # 02110-1301, USA. include(${CMAKE_CURRENT_LIST_DIR}/BareosInstallConfigFiles.cmake) -BareosInstallConfigFiles("${configtemplatedir}" "bareos-sd.d" "${PLUGINS}" "${BACKENDS}" "${SRC_DIR}") +bareosinstallconfigfiles( + "${configtemplatedir}" "bareos-sd.d" "${PLUGINS}" "${BACKENDS}" "${SRC_DIR}" +) diff --git a/core/cmake/install-tray-monitor-configfiles.cmake b/core/cmake/install-tray-monitor-configfiles.cmake index 4ea50cb7179..6244b748109 100644 --- a/core/cmake/install-tray-monitor-configfiles.cmake +++ b/core/cmake/install-tray-monitor-configfiles.cmake @@ -18,4 +18,6 @@ # 02110-1301, USA. include(${CMAKE_CURRENT_LIST_DIR}/BareosInstallConfigFiles.cmake) -BareosInstallConfigFiles("${configtemplatedir}" "tray-monitor.d" "" "" "${SRC_DIR}") +bareosinstallconfigfiles( + "${configtemplatedir}" "tray-monitor.d" "" "" "${SRC_DIR}" +) diff --git a/core/cmake/install-univention-extra-configuration.cmake b/core/cmake/install-univention-extra-configuration.cmake index 05fa47de257..29c8aadb4ed 100644 --- a/core/cmake/install-univention-extra-configuration.cmake +++ b/core/cmake/install-univention-extra-configuration.cmake @@ -17,8 +17,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -MESSAGE( STATUS "${PROJECT_SOURCE_DIR}/platform/univention/create_ucs_template_scripts.sh ${PROJECT_SOURCE_DIR} $ENV{DESTDIR}/etc/univention/templates/scripts/" ) +message( + STATUS + "${PROJECT_SOURCE_DIR}/platform/univention/create_ucs_template_scripts.sh ${PROJECT_SOURCE_DIR} $ENV{DESTDIR}/etc/univention/templates/scripts/" +) execute_process( - COMMAND ${PROJECT_SOURCE_DIR}/platforms/univention/create_ucs_template_scripts.sh ${PROJECT_SOURCE_DIR} $ENV{DESTDIR}/etc/univention/templates/scripts/ + COMMAND + ${PROJECT_SOURCE_DIR}/platforms/univention/create_ucs_template_scripts.sh + ${PROJECT_SOURCE_DIR} $ENV{DESTDIR}/etc/univention/templates/scripts/ ) diff --git a/core/cmake/systemdservice.cmake b/core/cmake/systemdservice.cmake index 736c5833faa..9d1ce2fe7a6 100644 --- a/core/cmake/systemdservice.cmake +++ b/core/cmake/systemdservice.cmake @@ -1,24 +1,25 @@ # taken from https://raw.githubusercontent.com/ximion/limba/master/data/cmake/systemdservice.cmake -######## +# # Find systemd service dir -INCLUDE(FindPkgConfig) +include(FindPkgConfig) pkg_check_modules(SYSTEMD "systemd") -if (SYSTEMD_FOUND AND "${SYSTEMD_UNITDIR}" STREQUAL "") - execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} - --variable=systemdsystemunitdir systemd - OUTPUT_VARIABLE SYSTEMD_UNITDIR) - string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_UNITDIR - "${SYSTEMD_UNITDIR}") -elseif (NOT SYSTEMD_FOUND AND SYSTEMD_UNITDIR) - message (FATAL_ERROR "Variable SYSTEMD_UNITDIR is\ - defined, but we can't find systemd using pkg-config") +if(SYSTEMD_FOUND AND "${SYSTEMD_UNITDIR}" STREQUAL "") + execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd + OUTPUT_VARIABLE SYSTEMD_UNITDIR + ) + string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_UNITDIR "${SYSTEMD_UNITDIR}") +elseif(NOT SYSTEMD_FOUND AND SYSTEMD_UNITDIR) + message(FATAL_ERROR "Variable SYSTEMD_UNITDIR is\ + defined, but we can't find systemd using pkg-config" + ) endif() -if (SYSTEMD_FOUND) - set(WITH_SYSTEMD "ON") - message(STATUS "systemd services install dir: ${SYSTEMD_UNITDIR}") +if(SYSTEMD_FOUND) + set(WITH_SYSTEMD "ON") + message(STATUS "systemd services install dir: ${SYSTEMD_UNITDIR}") else() - set(WITH_SYSTEMD "OFF") -endif (SYSTEMD_FOUND) + set(WITH_SYSTEMD "OFF") +endif(SYSTEMD_FOUND) diff --git a/core/cmake/thread.cmake b/core/cmake/thread.cmake index a3fa27c9788..864c31e7bee 100644 --- a/core/cmake/thread.cmake +++ b/core/cmake/thread.cmake @@ -1,23 +1,29 @@ -INCLUDE(CheckIncludeFiles) -INCLUDE(CheckCSourceCompiles) -INCLUDE(CMakePushCheckState) +include(CheckIncludeFiles) +include(CheckCSourceCompiles) +include(CMakePushCheckState) # check for extra non-portable header-file -CHECK_INCLUDE_FILES("pthread.h;pthread_np.h" HAVE_PTHREAD_NP_H) +check_include_files("pthread.h;pthread_np.h" HAVE_PTHREAD_NP_H) # pthread_attr_get_np - e.g. on FreeBSD -CMAKE_PUSH_CHECK_STATE() -SET(CMAKE_REQUIRED_LIBRARIES ${PTHREAD_LIBRARIES}) -IF(HAVE_PTHREAD_NP_H) - CHECK_C_SOURCE_COMPILES(" +cmake_push_check_state() +set(CMAKE_REQUIRED_LIBRARIES ${PTHREAD_LIBRARIES}) +if(HAVE_PTHREAD_NP_H) + check_c_source_compiles( + " #include #include int main() { pthread_attr_t a; pthread_attr_get_np(pthread_self(), &a); } - " HAVE_PTHREAD_ATTR_GET_NP) -ELSE() - CHECK_C_SOURCE_COMPILES(" + " + HAVE_PTHREAD_ATTR_GET_NP + ) +else() + check_c_source_compiles( + " #include int main() { pthread_attr_t a; pthread_attr_get_np(pthread_self(), &a); } - " HAVE_PTHREAD_ATTR_GET_NP) -ENDIF() -CMAKE_POP_CHECK_STATE() + " + HAVE_PTHREAD_ATTR_GET_NP + ) +endif() +cmake_pop_check_state() diff --git a/core/debian/control b/core/debian/control index 27471cae4b1..7e398efd05b 100644 --- a/core/debian/control +++ b/core/debian/control @@ -36,7 +36,8 @@ Build-Depends: acl-dev, pkg-config, po-debconf (>= 0.8.2), python-dev, - zlib1g-dev + zlib1g-dev, + libgtest-dev # dh-systemd: # Debian >= 8, Ubuntu >= 15.04 # libfastlz-dev: diff --git a/core/debian/control.in b/core/debian/control.in index b9ff397c8e3..cf050347f05 100644 --- a/core/debian/control.in +++ b/core/debian/control.in @@ -36,7 +36,8 @@ Build-Depends: acl-dev, pkg-config, po-debconf (>= 0.8.2), python-dev, - zlib1g-dev + zlib1g-dev, + libgtest-dev # dh-systemd: # Debian >= 8, Ubuntu >= 15.04 # libfastlz-dev: diff --git a/core/debian/rules b/core/debian/rules index b7baaac4cc4..59e0a8df71a 100755 --- a/core/debian/rules +++ b/core/debian/rules @@ -90,7 +90,6 @@ endif ifeq ($(DEB_HOST_ARCH_OS),hurd) CONFIGURE_COMMON += -Dscsi-crypto=no -Dndmp=no endif - CONFIGURE_CLIENT_ONLY = $(CONFIGURE_COMMON) -Dclient-only=yes CONFIGURE_FULL = $(CONFIGURE_COMMON) -Dpython=yes -Dtraymonitor=yes @@ -127,7 +126,8 @@ override_dh_installinit: override_dh_makeshlibs: dh_makeshlibs -n - +override_dh_auto_test: + cd obj-x86_64-linux-gnu && make clean && make -j4 Continuous || echo "ctest failed" override_dh_shlibdeps: dh_shlibdeps -l$(shell pwd)/debian/tmp/usr/lib/bareos diff --git a/core/manpages/CMakeLists.txt b/core/manpages/CMakeLists.txt index 18c35a40e91..70393de7fd7 100644 --- a/core/manpages/CMakeLists.txt +++ b/core/manpages/CMakeLists.txt @@ -17,44 +17,35 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -set (MAN1 - bconsole.1 - ) - -set (MAN8 - bareos-fd.8 - bareos.8 - ) - - -IF(NOT client-only) -set ( MAN1-server - bareos-tray-monitor.1 - #bat.1 - bsmtp.1 - bwild.1 - bregex.1 - ) - -set ( MAN8-server - bareos-dir.8 - bareos-sd.8 - bcopy.8 - bareos-dbcheck.8 - bextract.8 - bls.8 - bscan.8 - btape.8 - btraceback.8 - bpluginfo.8 - bscrypto.8 - ) - -set(MAN1 "${MAN1};${MAN1-server}") -set(MAN8 "${MAN8};${MAN8-server}") - -ENDIF() - - -INSTALL(FILES ${MAN1} DESTINATION "${mandir}/man1") -INSTALL(FILES ${MAN8} DESTINATION "${mandir}/man8") +set(MAN1 bconsole.1) + +set(MAN8 bareos-fd.8 bareos.8) + +if(NOT client-only) + set(MAN1-server + bareos-tray-monitor.1 + # bat.1 + bsmtp.1 bwild.1 bregex.1 + ) + + set(MAN8-server + bareos-dir.8 + bareos-sd.8 + bcopy.8 + bareos-dbcheck.8 + bextract.8 + bls.8 + bscan.8 + btape.8 + btraceback.8 + bpluginfo.8 + bscrypto.8 + ) + + set(MAN1 "${MAN1};${MAN1-server}") + set(MAN8 "${MAN8};${MAN8-server}") + +endif() + +install(FILES ${MAN1} DESTINATION "${mandir}/man1") +install(FILES ${MAN8} DESTINATION "${mandir}/man8") diff --git a/core/platforms/CMakeLists.txt b/core/platforms/CMakeLists.txt index d2410359a0a..5393d90dc7d 100644 --- a/core/platforms/CMakeLists.txt +++ b/core/platforms/CMakeLists.txt @@ -17,26 +17,26 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -IF(NOT HAVE_WIN32) +if(NOT HAVE_WIN32) - MESSAGE( STATUS "UNITDIR: " ${UNITDIR} ) - MESSAGE( STATUS "DISTNAME: " ${DISTNAME} ) + message(STATUS "UNITDIR: " ${UNITDIR}) + message(STATUS "DISTNAME: " ${DISTNAME}) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake) - if (${DISTNAME} STREQUAL ubuntu) - add_subdirectory(debian) - elseif (${DISTNAME} STREQUAL univention) - MESSAGE( STATUS "adding subdirectories debian and univention" ) - add_subdirectory(debian) - add_subdirectory(univention) - elseif (${DISTNAME} STREQUAL hpux) - MESSAGE( STATUS "DISTNAME: " ${DISTNAME} ) - else() - add_subdirectory(${DISTNAME}) - endif() + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake) + if(${DISTNAME} STREQUAL ubuntu) + add_subdirectory(debian) + elseif(${DISTNAME} STREQUAL univention) + message(STATUS "adding subdirectories debian and univention") + add_subdirectory(debian) + add_subdirectory(univention) + elseif(${DISTNAME} STREQUAL hpux) + message(STATUS "DISTNAME: " ${DISTNAME}) + else() + add_subdirectory(${DISTNAME}) + endif() - if (${systemd}) - add_subdirectory(systemd) - endif() + if(${systemd}) + add_subdirectory(systemd) + endif() -ENDIF() +endif() diff --git a/core/platforms/darwin/CMakeLists.txt b/core/platforms/darwin/CMakeLists.txt index 96785060c75..12d2808017b 100644 --- a/core/platforms/darwin/CMakeLists.txt +++ b/core/platforms/darwin/CMakeLists.txt @@ -17,46 +17,58 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -INSTALL(FILES resources/com.bareos.bareos-fd.plist - DESTINATION "${scriptdir}" - COMPONENT filedaemon) +install( + FILES resources/com.bareos.bareos-fd.plist + DESTINATION "${scriptdir}" + COMPONENT filedaemon +) -INSTALL(FILES resources/uninstall-bareos - DESTINATION "${scriptdir}" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - COMPONENT common) +install( + FILES resources/uninstall-bareos + DESTINATION "${scriptdir}" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + COMPONENT common +) # cpack settings -SET(CPACK_PACKAGE_VENDOR "bareos") -SET(CPACK_PACKAGE_NAME "bareos") -SET(CPACK_PACKAGE_HOMEPAGE_URL "https://www.bareos.com/") -SET(CPACK_PACKAGE_VERSION_MAJOR "${BAREOS_VERSION_MAJOR}") -SET(CPACK_PACKAGE_VERSION_MINOR "${BAREOS_VERSION_MINOR}") -SET(CPACK_PACKAGE_VERSION_PATCH "${BAREOS_VERSION_PATCH}") -SET(CPACK_MONOLITHIC_INSTALL FALSE) -SET(CPACK_COMPONENTS_ALL common filedaemon bconsole) +set(CPACK_PACKAGE_VENDOR "bareos") +set(CPACK_PACKAGE_NAME "bareos") +set(CPACK_PACKAGE_HOMEPAGE_URL "https://www.bareos.com/") +set(CPACK_PACKAGE_VERSION_MAJOR "${BAREOS_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${BAREOS_VERSION_MINOR}") +set(CPACK_PACKAGE_VERSION_PATCH "${BAREOS_VERSION_PATCH}") +set(CPACK_MONOLITHIC_INSTALL FALSE) +set(CPACK_COMPONENTS_ALL common filedaemon bconsole) -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Bareos File Daemon") -SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/description.txt") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Bareos File Daemon") +set(CPACK_PACKAGE_DESCRIPTION_FILE + "${CMAKE_CURRENT_SOURCE_DIR}/description.txt" +) -SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/bareos-logo.png") +set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/bareos-logo.png") +set(CPACK_PRODUCTBUILD_RESOURCES_DIR "${CMAKE_CURRENT_LIST_DIR}/resources") -SET(CPACK_PRODUCTBUILD_RESOURCES_DIR "${CMAKE_CURRENT_LIST_DIR}/resources") +set(CPACK_RESOURCE_FILE_WELCOME + "${CMAKE_CURRENT_LIST_DIR}/resources/welcome.txt" +) +set(CPACK_RESOURCE_FILE_README + "${CMAKE_CURRENT_LIST_DIR}/resources/ReadMe.html" +) +set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/AGPL-3.0.txt") -SET(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_LIST_DIR}/resources/welcome.txt") -SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_LIST_DIR}/resources/ReadMe.html") -SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/AGPL-3.0.txt") - -SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${BAREOS_FULL_VERSION}") -SET(CPACK_GENERATOR "productbuild") +set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${BAREOS_FULL_VERSION}") +set(CPACK_GENERATOR "productbuild") # if unset, next points to goes to /Application -SET(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) +set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) -SET(CPACK_PREFLIGHT_FILEDAEMON_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/resources/preinstall") -SET(CPACK_POSTFLIGHT_FILEDAEMON_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/resources/postinstall") +set(CPACK_PREFLIGHT_FILEDAEMON_SCRIPT + "${CMAKE_CURRENT_LIST_DIR}/resources/preinstall" +) +set(CPACK_POSTFLIGHT_FILEDAEMON_SCRIPT + "${CMAKE_CURRENT_LIST_DIR}/resources/postinstall" +) -INCLUDE(CPack) +include(CPack) diff --git a/core/platforms/debian/CMakeLists.txt b/core/platforms/debian/CMakeLists.txt index fe1fcfedc3c..2cbcfb1a5b7 100644 --- a/core/platforms/debian/CMakeLists.txt +++ b/core/platforms/debian/CMakeLists.txt @@ -17,103 +17,174 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +set(DESTSTARTDIR "${sysconfdir}/init.d/") - -set (DESTSTARTDIR "${sysconfdir}/init.d/") - -MESSAGE(STATUS "installing startfiles to ${DESTSTARTDIR}") +message(STATUS "installing startfiles to ${DESTSTARTDIR}") # Install autostart fd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/../../debian/bareos-filedaemon.bareos-fd.init" DESTINATION "${DESTSTARTDIR}/bareos-fd" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES + "${CMAKE_CURRENT_LIST_DIR}/../../debian/bareos-filedaemon.bareos-fd.init" + DESTINATION "${DESTSTARTDIR}/bareos-fd" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart sd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/../../debian/bareos-storage.bareos-sd.init" DESTINATION "${DESTSTARTDIR}/bareos-sd" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/../../debian/bareos-storage.bareos-sd.init" + DESTINATION "${DESTSTARTDIR}/bareos-sd" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart dir -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/../../debian/bareos-director.bareos-dir.init" DESTINATION "${DESTSTARTDIR}/bareos-dir" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) - +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/../../debian/bareos-director.bareos-dir.init" + DESTINATION "${DESTSTARTDIR}/bareos-dir" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # logrotate - - # dbconfig -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/../debian/set_dbconfig_vars.sh" DESTINATION "${scriptdir}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) - -INSTALL (DIRECTORY DESTINATION "${datarootdir}/dbconfig-common/data/bareos-database-common/install/") - +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/../debian/set_dbconfig_vars.sh" + DESTINATION "${scriptdir}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) + +install( + DIRECTORY + DESTINATION + "${datarootdir}/dbconfig-common/data/bareos-database-common/install/" +) # # mysql # -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/creates/mysql.sql" DESTINATION "${datarootdir}/dbconfig-common/data/bareos-database-common/install" RENAME "mysql") -INSTALL (DIRECTORY DESTINATION "${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/mysql") - -FILE(GLOB SQLFILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/updates/mysql.*.sql") -FOREACH(SQLFILE ${SQLFILES}) - GET_FILENAME_COMPONENT(BASENAME ${SQLFILE} NAME) - STRING(REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we only are interested in submatch in parentheses - SET(VERSION ${CMAKE_MATCH_1}) - INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/mysql RENAME ${BAREOS_NUMERIC_VERSION}) -ENDFOREACH() - +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/creates/mysql.sql" + DESTINATION + "${datarootdir}/dbconfig-common/data/bareos-database-common/install" + RENAME "mysql" +) +install( + DIRECTORY + DESTINATION + "${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/mysql" +) + +file(GLOB SQLFILES + "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/updates/mysql.*.sql" +) +foreach(SQLFILE ${SQLFILES}) + get_filename_component(BASENAME ${SQLFILE} NAME) + string( + REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE} + ) # match the regex, we only are interested in submatch in parentheses + set(VERSION ${CMAKE_MATCH_1}) + install( + FILES ${SQLFILE} + DESTINATION + ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/mysql + RENAME ${BAREOS_NUMERIC_VERSION} + ) +endforeach() # # postgresql # -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/creates/postgresql.sql" DESTINATION "${datarootdir}/dbconfig-common/data/bareos-database-common/install" RENAME "pgsql") -INSTALL (DIRECTORY DESTINATION "${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/pgsql/") -INSTALL (DIRECTORY DESTINATION "${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/") - -SET(UPGRADE_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/upgrade/pgsql/) -SET(UPGRADE_DBADMIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/upgrade-dbadmin/pgsql/) -FILE (MAKE_DIRECTORY ${UPGRADE_DIR}) -FILE (MAKE_DIRECTORY ${UPGRADE_DBADMIN_DIR}) - -FILE(GLOB SQLFILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/updates/postgresql.*.sql") -FOREACH(SQLFILE ${SQLFILES}) - GET_FILENAME_COMPONENT(BASENAME ${SQLFILE} NAME) - STRING(REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we only are interested in submatch in parentheses - SET(VERSION ${CMAKE_MATCH_1}) - - FILE(STRINGS ${SQLFILE} SQLFILE_LINE) - FOREACH(LINE ${SQLFILE_LINE}) - STRING(REGEX MATCH "^ALTER|^DROP|^--|^$" IS_UPGRADE_LINE ${LINE}) - IF (NOT ${IS_UPGRADE_LINE} STREQUAL "") - FILE(APPEND ${UPGRADE_DBADMIN_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n") - SET(LINE "-- upgrade-dbadmin: ${LINE}") - FILE(APPEND ${UPGRADE_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n") - ELSE() - FILE(APPEND ${UPGRADE_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n") - ENDIF() - ENDFOREACH() -ENDFOREACH() - -INSTALL (DIRECTORY ${UPGRADE_DBADMIN_DIR} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/pgsql) -INSTALL (DIRECTORY ${UPGRADE_DIR} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/creates/postgresql.sql" + DESTINATION + "${datarootdir}/dbconfig-common/data/bareos-database-common/install" + RENAME "pgsql" +) +install( + DIRECTORY + DESTINATION + "${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/pgsql/" +) +install( + DIRECTORY + DESTINATION + "${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/" +) + +set(UPGRADE_DIR + ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/upgrade/pgsql/ +) +set(UPGRADE_DBADMIN_DIR + ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/upgrade-dbadmin/pgsql/ +) +file(MAKE_DIRECTORY ${UPGRADE_DIR}) +file(MAKE_DIRECTORY ${UPGRADE_DBADMIN_DIR}) + +file(GLOB SQLFILES + "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/updates/postgresql.*.sql" +) +foreach(SQLFILE ${SQLFILES}) + get_filename_component(BASENAME ${SQLFILE} NAME) + string( + REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE} + ) # match the regex, we only are interested in submatch in parentheses + set(VERSION ${CMAKE_MATCH_1}) + + file(STRINGS ${SQLFILE} SQLFILE_LINE) + foreach(LINE ${SQLFILE_LINE}) + string(REGEX MATCH "^ALTER|^DROP|^--|^$" IS_UPGRADE_LINE ${LINE}) + if(NOT ${IS_UPGRADE_LINE} STREQUAL "") + file(APPEND ${UPGRADE_DBADMIN_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n") + set(LINE "-- upgrade-dbadmin: ${LINE}") + file(APPEND ${UPGRADE_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n") + else() + file(APPEND ${UPGRADE_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n") + endif() + endforeach() +endforeach() + +install( + DIRECTORY ${UPGRADE_DBADMIN_DIR} + DESTINATION + ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/pgsql +) +install( + DIRECTORY ${UPGRADE_DIR} + DESTINATION + ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql +) # # sqlite3 # -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/creates/sqlite3.sql" DESTINATION "${datarootdir}/dbconfig-common/data/bareos-database-common/install" RENAME "sqlite3") -INSTALL (DIRECTORY DESTINATION "${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/sqlite/") - -FILE(GLOB SQLFILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/updates/sqlite3.*.sql") -FOREACH(SQLFILE ${SQLFILES}) - GET_FILENAME_COMPONENT(BASENAME ${SQLFILE} NAME) - STRING(REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we only are interested in submatch in parentheses - SET(VERSION ${CMAKE_MATCH_1}) - INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/sqlite3 RENAME ${BAREOS_NUMERIC_VERSION}) -ENDFOREACH() +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/creates/sqlite3.sql" + DESTINATION + "${datarootdir}/dbconfig-common/data/bareos-database-common/install" + RENAME "sqlite3" +) +install( + DIRECTORY + DESTINATION + "${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/sqlite/" +) + +file(GLOB SQLFILES + "${CMAKE_CURRENT_LIST_DIR}/../../src/cats/ddl/updates/sqlite3.*.sql" +) +foreach(SQLFILE ${SQLFILES}) + get_filename_component(BASENAME ${SQLFILE} NAME) + string( + REGEX MATCH "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE} + ) # match the regex, we only are interested in submatch in parentheses + set(VERSION ${CMAKE_MATCH_1}) + install( + FILES ${SQLFILE} + DESTINATION + ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/sqlite3 + RENAME ${BAREOS_NUMERIC_VERSION} + ) +endforeach() diff --git a/core/platforms/freebsd/CMakeLists.txt b/core/platforms/freebsd/CMakeLists.txt index b2e2f1f7d69..8828dbc24ba 100644 --- a/core/platforms/freebsd/CMakeLists.txt +++ b/core/platforms/freebsd/CMakeLists.txt @@ -17,26 +17,30 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +set(DESTSTARTDIR "${sysconfdir}/rc.d/") - -set (DESTSTARTDIR "${sysconfdir}/rc.d/") - -MESSAGE(STATUS "installing startfiles to ${DESTSTARTDIR}") +message(STATUS "installing startfiles to ${DESTSTARTDIR}") # Install autostart fd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart sd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart dir -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) diff --git a/core/platforms/packaging/bareos.dsc b/core/platforms/packaging/bareos.dsc index 15bfc7ec666..66fd3ee4fce 100644 --- a/core/platforms/packaging/bareos.dsc +++ b/core/platforms/packaging/bareos.dsc @@ -6,7 +6,7 @@ Version: 0.0.0 Maintainer: Joerg Steffens Homepage: http://www.bareos.org/ Standards-Version: 3.9.4 -Build-Depends: acl-dev, bc, chrpath, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, qtbase5-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, zlib1g-dev, postgresql-server-dev-all, cmake, libpam-dev +Build-Depends: acl-dev, bc, chrpath, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, qtbase5-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, zlib1g-dev, postgresql-server-dev-all, cmake, libpam-dev, libgtest-dev # optional (via OBS project config): # 0%{?debian_version} >= 800 || 0%{?ubuntu_version} >= 1404 # libcephfs-dev diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index 800adc39b06..23ec59d3fdf 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -855,8 +855,18 @@ cmake .. \ %check # run unit tests -# pushd %{CMAKE_BUILDDIR} -# make check +pushd %{CMAKE_BUILDDIR} +make clean +ctest -R gtest: -D Continuous || result=$? +result=$? +if [ $result -eq 1 ]; then + echo "ctest result $result is expected and OK" + exit 0 +else + echo "ctest result $result is not 1, ERROR" +fi + + %install ##if 0#{?suse_version} diff --git a/core/platforms/redhat/CMakeLists.txt b/core/platforms/redhat/CMakeLists.txt index b7fd140b144..c5237dbe711 100644 --- a/core/platforms/redhat/CMakeLists.txt +++ b/core/platforms/redhat/CMakeLists.txt @@ -17,26 +17,30 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +set(DESTSTARTDIR "${sysconfdir}/rc.d/init.d/") - -set (DESTSTARTDIR "${sysconfdir}/rc.d/init.d/") - -MESSAGE(STATUS "installing startfiles to ${DESTSTARTDIR}") +message(STATUS "installing startfiles to ${DESTSTARTDIR}") # Install autostart fd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart sd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart dir -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) diff --git a/core/platforms/solaris/CMakeLists.txt b/core/platforms/solaris/CMakeLists.txt index b7fd140b144..c5237dbe711 100644 --- a/core/platforms/solaris/CMakeLists.txt +++ b/core/platforms/solaris/CMakeLists.txt @@ -17,26 +17,30 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +set(DESTSTARTDIR "${sysconfdir}/rc.d/init.d/") - -set (DESTSTARTDIR "${sysconfdir}/rc.d/init.d/") - -MESSAGE(STATUS "installing startfiles to ${DESTSTARTDIR}") +message(STATUS "installing startfiles to ${DESTSTARTDIR}") # Install autostart fd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart sd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart dir -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir" DESTINATION "${DESTSTARTDIR}/" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir" + DESTINATION "${DESTSTARTDIR}/" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) diff --git a/core/platforms/suse/CMakeLists.txt b/core/platforms/suse/CMakeLists.txt index f18ea150f57..71e070bb795 100644 --- a/core/platforms/suse/CMakeLists.txt +++ b/core/platforms/suse/CMakeLists.txt @@ -17,49 +17,63 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +set(FIREWALL_DIR ${sysconfdir}/sysconfig/SuSEfirewall2.d/services/) +set(DESTSTARTDIR ${sysconfdir}/init.d/) -set (FIREWALL_DIR ${sysconfdir}/sysconfig/SuSEfirewall2.d/services/) -set (DESTSTARTDIR ${sysconfdir}/init.d/) +message(STATUS "installing startfiles to ${DESTSTARTDIR}") -MESSAGE(STATUS "installing startfiles to ${DESTSTARTDIR}") - -INSTALL(DIRECTORY DESTINATION ${DESTSTARTDIR}) +install(DIRECTORY DESTINATION ${DESTSTARTDIR}) # Install autostart fd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd" DESTINATION "${DESTSTARTDIR}" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd" + DESTINATION "${DESTSTARTDIR}" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart sd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd" DESTINATION "${DESTSTARTDIR}" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd" + DESTINATION "${DESTSTARTDIR}" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) # Install autostart dir -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir" DESTINATION "${DESTSTARTDIR}" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) - +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir" + DESTINATION "${DESTSTARTDIR}" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +) -MESSAGE(STATUS "installing firewall files to ${DESTSTARTDIR}") +message(STATUS "installing firewall files to ${DESTSTARTDIR}") # Install firewall fd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd.fw" DESTINATION "${FIREWALL_DIR}" RENAME bareos-fd) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-fd.fw" + DESTINATION "${FIREWALL_DIR}" + RENAME bareos-fd +) # Install firewall sd -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd.fw" DESTINATION "${FIREWALL_DIR}" RENAME bareos-sd) +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-sd.fw" + DESTINATION "${FIREWALL_DIR}" + RENAME bareos-sd +) # Install firewall dir -INSTALL (FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir.fw" DESTINATION "${FIREWALL_DIR}" RENAME bareos-dir) - -INSTALL(DIRECTORY DESTINATION ${sbindir}) - -INSTALL( - CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-fd $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-fd )" - CODE "MESSAGE(STATUS ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-fd $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-fd )" +install( + FILES "${CMAKE_CURRENT_LIST_DIR}/bareos-dir.fw" + DESTINATION "${FIREWALL_DIR}" + RENAME bareos-dir +) - CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-sd $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-sd )" - CODE "MESSAGE(STATUS ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-sd $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-sd )" +install(DIRECTORY DESTINATION ${sbindir}) - CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-dir $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-dir )" - CODE "MESSAGE(STATUS ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-dir $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-dir )" +install( + CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-fd $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-fd )" + CODE "MESSAGE(STATUS ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-fd $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-fd )" + CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-sd $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-sd )" + CODE "MESSAGE(STATUS ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-sd $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-sd )" + CODE "execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-dir $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-dir )" + CODE "MESSAGE(STATUS ${CMAKE_COMMAND} -E create_symlink ${DESTSTARTDIR}/bareos-dir $ENV{RPM_BUILD_ROOT}/${sbindir}/rcbareos-dir )" ) diff --git a/core/platforms/systemd/CMakeLists.txt b/core/platforms/systemd/CMakeLists.txt index d223a7022d5..0ad80559e8c 100644 --- a/core/platforms/systemd/CMakeLists.txt +++ b/core/platforms/systemd/CMakeLists.txt @@ -17,13 +17,10 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - -MESSAGE( STATUS "CMAKE_CURRENT_LIST_FILE: " ${CMAKE_CURRENT_LIST_FILE} ) -MESSAGE(STATUS "installing systemd files to ${SYSTEMD_UNITDIR}") +message(STATUS "CMAKE_CURRENT_LIST_FILE: " ${CMAKE_CURRENT_LIST_FILE}) +message(STATUS "installing systemd files to ${SYSTEMD_UNITDIR}") set(SYSTEMD_TMPFILES ${sysconfdir}/tmpfiles.d) - - -INSTALL(FILES "bareos-sd.service" DESTINATION ${SYSTEMD_UNITDIR}) -INSTALL(FILES "bareos-fd.service" DESTINATION ${SYSTEMD_UNITDIR}) -INSTALL(FILES "bareos-dir.service" DESTINATION ${SYSTEMD_UNITDIR}) +install(FILES "bareos-sd.service" DESTINATION ${SYSTEMD_UNITDIR}) +install(FILES "bareos-fd.service" DESTINATION ${SYSTEMD_UNITDIR}) +install(FILES "bareos-dir.service" DESTINATION ${SYSTEMD_UNITDIR}) diff --git a/core/platforms/univention/CMakeLists.txt b/core/platforms/univention/CMakeLists.txt index a00aa3c640a..eac483990ae 100644 --- a/core/platforms/univention/CMakeLists.txt +++ b/core/platforms/univention/CMakeLists.txt @@ -17,43 +17,43 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - file(MAKE_DIRECTORY "${PROJECT_SOURCE_DIR}/AppCenter/") file( - COPY - "AppCenter/LICENSE_AGREEMENT" - "AppCenter/README" - "AppCenter/README_DE" - "AppCenter/bareos-webui_screenshot.png" - "../../src/images/bareos-logo.svg" - "../../src/images/bareos-logo-full.svg" + COPY "AppCenter/LICENSE_AGREEMENT" + "AppCenter/README" + "AppCenter/README_DE" + "AppCenter/bareos-webui_screenshot.png" + "../../src/images/bareos-logo.svg" + "../../src/images/bareos-logo-full.svg" DESTINATION "${PROJECT_SOURCE_DIR}/AppCenter/" ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/conffiles/" DESTINATION "${PROJECT_SOURCE_DIR}/conffiles/") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/conffiles/" + DESTINATION "${PROJECT_SOURCE_DIR}/conffiles/" +) add_custom_command( - OUTPUT univention-install-config-registry - COMMAND ${PROJECT_SOURCE_DIR}/platforms/univention/create_ucs_template_files.sh conffiles/ COMMAND univention-install-config-registry -v + OUTPUT univention-install-config-registry + COMMAND + ${PROJECT_SOURCE_DIR}/platforms/univention/create_ucs_template_files.sh + conffiles/ + COMMAND univention-install-config-registry -v WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} ) -add_custom_target( - run ALL - DEPENDS univention-install-config-registry -) +add_custom_target(run ALL DEPENDS univention-install-config-registry) install( - FILES "job-generic.template" + FILES "job-generic.template" DESTINATION "${confdir}/autogenerated/clients/" - RENAME "generic.template" + RENAME "generic.template" ) install( - FILES "job-windows.template" + FILES "job-windows.template" DESTINATION "${confdir}/autogenerated/clients/" - RENAME "windows.template" + RENAME "windows.template" ) install( @@ -71,30 +71,28 @@ install( DESTINATION "${sysconfdir}/cron.d/" ) -install( - FILES "univention-bareos.py" - DESTINATION "/usr/lib/univention-directory-listener/system/" +install(FILES "univention-bareos.py" + DESTINATION "/usr/lib/univention-directory-listener/system/" ) -install( - PROGRAMS "62univention-bareos.inst" - DESTINATION "/usr/lib/univention-install/" +install(PROGRAMS "62univention-bareos.inst" + DESTINATION "/usr/lib/univention-install/" ) -install( - PROGRAMS "63univention-bareos.uinst" - DESTINATION "/usr/lib/univention-uninstall/" +install(PROGRAMS "63univention-bareos.uinst" + DESTINATION "/usr/lib/univention-uninstall/" ) -install( - FILES "univention-bareos.schema" - DESTINATION "/usr/share/univention-bareos/" +install(FILES "univention-bareos.schema" + DESTINATION "/usr/share/univention-bareos/" ) -install( - PROGRAMS "bareos-dir-restart" "bareos-dir-restart-on-change" - DESTINATION "/usr/share/univention-bareos/" +install(PROGRAMS "bareos-dir-restart" "bareos-dir-restart-on-change" + DESTINATION "/usr/share/univention-bareos/" ) install(CODE "set(PROJECT_SOURCE_DIR \"${PROJECT_SOURCE_DIR}\")") -install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-univention-extra-configuration.cmake) +install( + SCRIPT + ${PROJECT_SOURCE_DIR}/cmake/install-univention-extra-configuration.cmake +) diff --git a/core/scripts/CMakeLists.txt b/core/scripts/CMakeLists.txt index e1890d4eda9..16c9bb0f6a3 100644 --- a/core/scripts/CMakeLists.txt +++ b/core/scripts/CMakeLists.txt @@ -17,57 +17,43 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +install( + FILES bareos btraceback + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${sbindir}" +) -INSTALL(FILES - bareos btraceback - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${sbindir}") +install( + FILES bareos-ctl-fd + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${scriptdir}" + COMPONENT filedaemon +) -INSTALL(FILES - bareos-ctl-fd - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${scriptdir}" - COMPONENT filedaemon) +install( + FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config + bareos-config-lib.sh bareos-ctl-funcs + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${scriptdir}" +) -INSTALL(FILES - bareos - btraceback.gdb - btraceback.dbx - btraceback.mdb - bareos-config - bareos-config-lib.sh - bareos-ctl-funcs - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${scriptdir}" - ) +if(NOT client-only) + install( + FILES mtx-changer disk-changer bareos-explorer bareos-glusterfind-wrapper + bareos-ctl-dir bareos-ctl-sd bareos-ctl-funcs + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${scriptdir}" + ) -IF(NOT client-only) - INSTALL(FILES - mtx-changer - disk-changer - bareos-explorer - bareos-glusterfind-wrapper - bareos-ctl-dir - bareos-ctl-sd - bareos-ctl-funcs - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${scriptdir}") + install(FILES mtx-changer.conf bareos-regress.conf DESTINATION "${confdir}") - INSTALL(FILES - mtx-changer.conf - bareos-regress.conf - DESTINATION "${confdir}") - - INSTALL(FILES - logrotate - DESTINATION "${sysconfdir}/logrotate.d" - RENAME bareos-dir) -ENDIF() + install( + FILES logrotate + DESTINATION "${sysconfdir}/logrotate.d" + RENAME bareos-dir + ) +endif() diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt index 423f86bd083..af73afffeb8 100644 --- a/core/src/CMakeLists.txt +++ b/core/src/CMakeLists.txt @@ -17,29 +17,30 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -IF(NOT client-only) - add_subdirectory(tools) - IF(NOT HAVE_WIN32 AND GTEST_FOUND) - add_subdirectory(tests) - ENDIF() - add_subdirectory(cats) - IF(NOT HAVE_WIN32 AND ndmp) - add_subdirectory(ndmp) - ENDIF() - add_subdirectory(dird) - add_subdirectory(stored) -ENDIF() +if(NOT client-only) + add_subdirectory(tools) + add_subdirectory(cats) + if(NOT HAVE_WIN32 AND ndmp) + add_subdirectory(ndmp) + endif() + add_subdirectory(dird) + add_subdirectory(stored) +endif() + +if(GTEST_FOUND) + add_subdirectory(tests) +endif() -add_subdirectory(console) -IF(${HAVE_LMDB}) - add_subdirectory(lmdb) -ENDIF() + add_subdirectory(console) +if(${HAVE_LMDB}) + add_subdirectory(lmdb) +endif() add_subdirectory(lib) add_subdirectory(findlib) add_subdirectory(filed) add_subdirectory(plugins) add_subdirectory(fastlz) -if (${traymonitor}) - add_subdirectory(qt-tray-monitor) +if(${traymonitor}) + add_subdirectory(qt-tray-monitor) endif() diff --git a/core/src/cats/CMakeLists.txt b/core/src/cats/CMakeLists.txt index 137e55911e4..54599ba23e7 100644 --- a/core/src/cats/CMakeLists.txt +++ b/core/src/cats/CMakeLists.txt @@ -17,34 +17,38 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - include_directories(${MYSQL_INCLUDE_DIR} ${PostgreSQL_INCLUDE_DIR}) - -add_definitions( -D_BDB_PRIV_INTERFACE_) +add_definitions(-D_BDB_PRIV_INTERFACE_) set(LIBBAREOSSQL_SRCS - bvfs.cc cats.cc sql.cc sql_create.cc sql_delete.cc sql_find.cc - sql_get.cc sql_list.cc sql_pooling.cc sql_query.cc sql_update.cc - ) -set(LIBBAREOSCATS_SRCS - cats_backends.cc - ) - - set(SQLITE_SRCS sqlite.cc ${LIBBAREOSCATS_SRCS}) + bvfs.cc + cats.cc + sql.cc + sql_create.cc + sql_delete.cc + sql_find.cc + sql_get.cc + sql_list.cc + sql_pooling.cc + sql_query.cc + sql_update.cc +) +set(LIBBAREOSCATS_SRCS cats_backends.cc) + +set(SQLITE_SRCS sqlite.cc ${LIBBAREOSCATS_SRCS}) set(MYSQL_SRCS mysql.cc ${LIBBAREOSCATS_SRCS}) set(POSTGRESQL_SRCS postgresql.cc ${LIBBAREOSCATS_SRCS}) - add_library(bareossql SHARED ${LIBBAREOSSQL_SRCS}) -set_target_properties(bareossql PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" - SOVERSION "${BAREOS_VERSION_MAJOR}" - ) -target_link_libraries (bareossql bareoscats bareos) - +set_target_properties( + bareossql PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION + "${BAREOS_VERSION_MAJOR}" +) +target_link_libraries(bareossql bareoscats bareos) # TODO: install default db backend @@ -53,88 +57,91 @@ target_link_libraries (bareossql bareoscats bareos) list(LENGTH db_backends nr_db_backends) - - add_library(bareoscats SHARED ${LIBBAREOSCATS_SRCS}) -target_link_libraries (bareoscats bareos) -set_target_properties(bareoscats PROPERTIES - VERSION ${BAREOS_NUMERIC_VERSION} - SOVERSION "${BAREOS_VERSION_MAJOR}" - ) -INSTALL(TARGETS bareoscats - DESTINATION ${libdir}) - - -IF (HAVE_SQLITE3) -add_library(bareoscats-sqlite3 MODULE ${SQLITE_SRCS}) -target_link_libraries (bareoscats-sqlite3 bareossql bareos sqlite3) -INSTALL(TARGETS bareoscats-sqlite3 DESTINATION ${backenddir}) - -INSTALL(DIRECTORY ddl - DESTINATION ${scriptdir} - FILES_MATCHING PATTERN *sqlite3*.sql - ) -ENDIF() - - -IF (HAVE_MYSQL) -add_library(bareoscats-mysql MODULE ${MYSQL_SRCS}) -target_link_libraries(bareoscats-mysql bareossql bareos ${MYSQL_LIBRARIES}) -INSTALL(TARGETS bareoscats-mysql DESTINATION ${backenddir}) - -INSTALL(DIRECTORY ddl - DESTINATION ${scriptdir} - FILES_MATCHING PATTERN *mysql*.sql - ) -ENDIF() - - -IF (HAVE_POSTGRESQL) -add_library(bareoscats-postgresql MODULE ${POSTGRESQL_SRCS}) -target_link_libraries(bareoscats-postgresql bareossql bareos ${PostgreSQL_LIBRARY} ) -INSTALL(TARGETS bareoscats-postgresql DESTINATION ${backenddir}) - -INSTALL(DIRECTORY ddl - DESTINATION ${scriptdir} - FILES_MATCHING PATTERN *postgresql*.sql - ) -ENDIF() - - -INSTALL(TARGETS bareossql - DESTINATION ${libdir}) - -INSTALL(FILES - create_bareos_database - update_bareos_tables - make_bareos_tables - grant_bareos_privileges - drop_bareos_tables - drop_bareos_database - make_catalog_backup.pl - make_catalog_backup - delete_catalog_backup - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION ${scriptdir}) - -INSTALL(DIRECTORY ddl - DESTINATION ${scriptdir} - PATTERN version.map - PATTERN *.in EXCLUDE - PATTERN *.sql EXCLUDE - ) - - - -IF(${nr_db_backends} EQUAL 1) - install(CODE "set(libdir \"${libdir}\")") - install(CODE "set(backenddir \"${backenddir}\")") - install(CODE "set(default_db_backend \"${default_db_backend}\")") - install(CODE "set(CMAKE_SHARED_LIBRARY_SUFFIX \"${CMAKE_SHARED_LIBRARY_SUFFIX}\")") - install(CODE "set(VERSION \"${BAREOS_NUMERIC_VERSION}\")") - install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") - - INSTALL(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/bareos-symlink-default-db-backend.cmake) -ENDIF() +target_link_libraries(bareoscats bareos) +set_target_properties( + bareoscats PROPERTIES VERSION ${BAREOS_NUMERIC_VERSION} SOVERSION + "${BAREOS_VERSION_MAJOR}" +) +install(TARGETS bareoscats DESTINATION ${libdir}) + +if(HAVE_SQLITE3) + add_library(bareoscats-sqlite3 MODULE ${SQLITE_SRCS}) + target_link_libraries(bareoscats-sqlite3 bareossql bareos sqlite3) + install(TARGETS bareoscats-sqlite3 DESTINATION ${backenddir}) + + install( + DIRECTORY ddl + DESTINATION ${scriptdir} + FILES_MATCHING + PATTERN *sqlite3*.sql + ) +endif() + +if(HAVE_MYSQL) + add_library(bareoscats-mysql MODULE ${MYSQL_SRCS}) + target_link_libraries(bareoscats-mysql bareossql bareos ${MYSQL_LIBRARIES}) + install(TARGETS bareoscats-mysql DESTINATION ${backenddir}) + + install( + DIRECTORY ddl + DESTINATION ${scriptdir} + FILES_MATCHING + PATTERN *mysql*.sql + ) +endif() + +if(HAVE_POSTGRESQL) + add_library(bareoscats-postgresql MODULE ${POSTGRESQL_SRCS}) + target_link_libraries( + bareoscats-postgresql bareossql bareos ${PostgreSQL_LIBRARY} + ) + install(TARGETS bareoscats-postgresql DESTINATION ${backenddir}) + + install( + DIRECTORY ddl + DESTINATION ${scriptdir} + FILES_MATCHING + PATTERN *postgresql*.sql + ) +endif() + +install(TARGETS bareossql DESTINATION ${libdir}) + +install( + FILES create_bareos_database + update_bareos_tables + make_bareos_tables + grant_bareos_privileges + drop_bareos_tables + drop_bareos_database + make_catalog_backup.pl + make_catalog_backup + delete_catalog_backup + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION ${scriptdir} +) + +install( + DIRECTORY ddl + DESTINATION ${scriptdir} + PATTERN version.map + PATTERN *.in EXCLUDE + PATTERN *.sql EXCLUDE +) + +if(${nr_db_backends} EQUAL 1) + install(CODE "set(libdir \"${libdir}\")") + install(CODE "set(backenddir \"${backenddir}\")") + install(CODE "set(default_db_backend \"${default_db_backend}\")") + install( + CODE "set(CMAKE_SHARED_LIBRARY_SUFFIX \"${CMAKE_SHARED_LIBRARY_SUFFIX}\")" + ) + install(CODE "set(VERSION \"${BAREOS_NUMERIC_VERSION}\")") + install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") + + install( + SCRIPT ${PROJECT_SOURCE_DIR}/cmake/bareos-symlink-default-db-backend.cmake + ) +endif() diff --git a/core/src/cats/sql_find.cc b/core/src/cats/sql_find.cc index a5e90a23f2e..532eef68fdf 100644 --- a/core/src/cats/sql_find.cc +++ b/core/src/cats/sql_find.cc @@ -53,8 +53,8 @@ * StartTime is returned in stime * Job name is returned in job (MAX_NAME_LENGTH) * - * Returns: 0 on failure - * 1 on success, jr is unchanged, but stime and job are set + * Returns: false on failure + * true on success, jr is unchanged, but stime and job are set */ bool BareosDb::FindJobStartTime(JobControlRecord* jcr, JobDbRecord* jr, diff --git a/core/src/console/CMakeLists.txt b/core/src/console/CMakeLists.txt index 1aac283db0b..bf671842dc2 100644 --- a/core/src/console/CMakeLists.txt +++ b/core/src/console/CMakeLists.txt @@ -17,31 +17,38 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - -SET (BCONSSRCS connect_to_director.cc console_conf.cc console_globals.cc console_output.cc) -IF(HAVE_WIN32) - LIST(APPEND BCONSSRCS ../win32/console/consoleres.rc) -ENDIF() +set(BCONSSRCS connect_to_director.cc console_conf.cc console_globals.cc + console_output.cc +) +if(HAVE_WIN32) + list(APPEND BCONSSRCS ../win32/console/consoleres.rc) +endif() include_directories(${Readline_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR}) -IF(HAVE_PAM) - include_directories(${PAM_INCLUDE_DIRS}) - LIST(APPEND BCONSSRCS auth_pam.cc) -ENDIF() +if(HAVE_PAM) + include_directories(${PAM_INCLUDE_DIRS}) + list(APPEND BCONSSRCS auth_pam.cc) +endif() add_executable(bconsole console.cc) add_library(console_objects STATIC ${BCONSSRCS}) -IF(HAVE_PAM) - set(CONSOLE_LINK_LIBRARIES console_objects bareos ${Readline_LIBRARY} ${PAM_LIBRARIES}) -ELSE() - set(CONSOLE_LINK_LIBRARIES console_objects bareos ${Readline_LIBRARY}) -ENDIF() +if(HAVE_PAM) + set(CONSOLE_LINK_LIBRARIES console_objects bareos ${Readline_LIBRARY} + ${PAM_LIBRARIES} + ) +else() + set(CONSOLE_LINK_LIBRARIES console_objects bareos ${Readline_LIBRARY}) +endif() target_link_libraries(bconsole ${CONSOLE_LINK_LIBRARIES}) -INSTALL(TARGETS bconsole DESTINATION "${bindir}" COMPONENT bconsole) -INSTALL(TARGETS bconsole DESTINATION "${sbindir}" COMPONENT bconsole) -INSTALL(FILES bconsole.conf DESTINATION "${configtemplatedir}" COMPONENT bconsole) +install(TARGETS bconsole DESTINATION "${bindir}" COMPONENT bconsole) +install(TARGETS bconsole DESTINATION "${sbindir}" COMPONENT bconsole) +install( + FILES bconsole.conf + DESTINATION "${configtemplatedir}" + COMPONENT bconsole +) diff --git a/core/src/dird/CMakeLists.txt b/core/src/dird/CMakeLists.txt index a2183f83bee..9568512f7e4 100644 --- a/core/src/dird/CMakeLists.txt +++ b/core/src/dird/CMakeLists.txt @@ -17,95 +17,162 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - set(DIRDSRCS dird.cc) -#DIRD_OBJECTS_SRCS also used in a separate library for unittests -set(DIRD_OBJECTS_SRCS admin.cc archive.cc authenticate.cc authenticate_console.cc - autoprune.cc backup.cc bsr.cc catreq.cc check_catalog.cc - consolidate.cc dird_globals.cc dir_plugins.cc dird_conf.cc expand.cc fd_cmds.cc - get_database_connection.cc getmsg.cc inc_conf.cc job.cc jobq.cc migrate.cc msgchan.cc - ndmp_dma_storage.cc - ndmp_dma_backup_common.cc ndmp_dma_backup_NDMP_BAREOS.cc ndmp_dma_backup_NDMP_NATIVE.cc - ndmp_dma_generic.cc - ndmp_dma_restore_common.cc ndmp_dma_restore_NDMP_BAREOS.cc ndmp_dma_restore_NDMP_NATIVE.cc - ndmp_fhdb_common.cc ndmp_fhdb_helpers.cc - ndmp_slot2elemaddr.cc - ndmp_fhdb_mem.cc ndmp_fhdb_lmdb.cc ndmp_ndmmedia_db_helpers.cc - newvol.cc next_vol.cc quota.cc run_hour_validator.cc socket_server.cc recycle.cc restore.cc - run_conf.cc run_on_incoming_connect_interval.cc - sd_cmds.cc scheduler.cc scheduler_job_item_queue.cc scheduler_private.cc - stats.cc storage.cc ua.cc ua_acl.cc ua_audit.cc - ua_cmds.cc ua_configure.cc ua_db.cc ua_dotcmds.cc ua_input.cc ua_impexp.cc - ua_label.cc ua_output.cc ua_prune.cc ua_purge.cc ua_query.cc ua_restore.cc - ua_run.cc ua_select.cc ua_server.cc ua_status.cc ua_tree.cc ua_update.cc - vbackup.cc verify.cc pthread_detach_if_not_detached.cc) -IF(HAVE_WIN32) - LIST(APPEND DIRD_OBJECTS_SRCS ../win32/dird/dirdres.rc) -ENDIF() - -IF(HAVE_PAM) - include_directories(${PAM_INCLUDE_DIRS}) - LIST(APPEND DIRD_OBJECTS_SRCS auth_pam.cc) -ENDIF() - -IF(HAVE_WIN32) - include_directories(${PROJECT_SOURCE_DIR}/src/win32/generic ${PROJECT_SOURCE_DIR}/src/win32/dird) - LIST(APPEND DIRDSRCS - ../win32/generic/main.cc - ../win32/generic/service.cc - ) -ENDIF() - -set(DBCHKSRCS dbcheck.cc dird_conf.cc dird_globals.cc ua_acl.cc ua_audit.cc run_conf.cc inc_conf.cc) -IF(HAVE_WIN32) - LIST(APPEND DBCHKSRCS ../win32/dird/dbcheckres.rc) -ENDIF() - -set(TSTFNDSRCS testfind.cc dird_conf.cc dird_globals.cc ua_acl.cc ua_audit.cc run_conf.cc inc_conf.cc) - -set(DIRD_RESTYPES catalog client console counter director fileset job jobdefs messages pool profile schedule storage) - -#dird_objects is also used as library for unittests +# DIRD_OBJECTS_SRCS also used in a separate library for unittests +set(DIRD_OBJECTS_SRCS + admin.cc + archive.cc + authenticate.cc + authenticate_console.cc + autoprune.cc + backup.cc + bsr.cc + catreq.cc + check_catalog.cc + consolidate.cc + dird_globals.cc + dir_plugins.cc + dird_conf.cc + expand.cc + fd_cmds.cc + get_database_connection.cc + getmsg.cc + inc_conf.cc + job.cc + jobq.cc + migrate.cc + msgchan.cc + ndmp_dma_storage.cc + ndmp_dma_backup_common.cc + ndmp_dma_backup_NDMP_BAREOS.cc + ndmp_dma_backup_NDMP_NATIVE.cc + ndmp_dma_generic.cc + ndmp_dma_restore_common.cc + ndmp_dma_restore_NDMP_BAREOS.cc + ndmp_dma_restore_NDMP_NATIVE.cc + ndmp_fhdb_common.cc + ndmp_fhdb_helpers.cc + ndmp_slot2elemaddr.cc + ndmp_fhdb_mem.cc + ndmp_fhdb_lmdb.cc + ndmp_ndmmedia_db_helpers.cc + newvol.cc + next_vol.cc + quota.cc + run_hour_validator.cc + socket_server.cc + recycle.cc + restore.cc + run_conf.cc + run_on_incoming_connect_interval.cc + sd_cmds.cc + scheduler.cc + scheduler_job_item_queue.cc + scheduler_private.cc + stats.cc + storage.cc + ua.cc + ua_acl.cc + ua_audit.cc + ua_cmds.cc + ua_configure.cc + ua_db.cc + ua_dotcmds.cc + ua_input.cc + ua_impexp.cc + ua_label.cc + ua_output.cc + ua_prune.cc + ua_purge.cc + ua_query.cc + ua_restore.cc + ua_run.cc + ua_select.cc + ua_server.cc + ua_status.cc + ua_tree.cc + ua_update.cc + vbackup.cc + verify.cc + pthread_detach_if_not_detached.cc +) +if(HAVE_WIN32) + list(APPEND DIRD_OBJECTS_SRCS ../win32/dird/dirdres.rc) +endif() + +if(HAVE_PAM) + include_directories(${PAM_INCLUDE_DIRS}) + list(APPEND DIRD_OBJECTS_SRCS auth_pam.cc) +endif() + +if(HAVE_WIN32) + include_directories( + ${PROJECT_SOURCE_DIR}/src/win32/generic + ${PROJECT_SOURCE_DIR}/src/win32/dird + ) + list(APPEND DIRDSRCS ../win32/generic/main.cc ../win32/generic/service.cc) +endif() + +set(DBCHKSRCS dbcheck.cc dird_conf.cc dird_globals.cc ua_acl.cc ua_audit.cc + run_conf.cc inc_conf.cc +) +if(HAVE_WIN32) + list(APPEND DBCHKSRCS ../win32/dird/dbcheckres.rc) +endif() + +set(TSTFNDSRCS testfind.cc dird_conf.cc dird_globals.cc ua_acl.cc ua_audit.cc + run_conf.cc inc_conf.cc +) + +set(DIRD_RESTYPES + catalog + client + console + counter + director + fileset + job + jobdefs + messages + pool + profile + schedule + storage +) + +# dird_objects is also used as library for unittests add_library(dird_objects STATIC ${DIRD_OBJECTS_SRCS}) target_link_libraries(dird_objects ${NDMP_LIBS}) add_executable(bareos-dir ${DIRDSRCS}) -set(BAREOS_DIR_LIBRARIES - dird_objects - bareos - bareoscats - bareossql - bareosfind - ${LMDB_LIBS} - ${NDMP_LIBS} +set(BAREOS_DIR_LIBRARIES dird_objects bareos bareoscats bareossql bareosfind + ${LMDB_LIBS} ${NDMP_LIBS} ) -IF(HAVE_WIN32) - LIST(APPEND BAREOS_DIR_LIBRARIES comctl32) -ENDIF() +if(HAVE_WIN32) + list(APPEND BAREOS_DIR_LIBRARIES comctl32) +endif() -IF(HAVE_PAM) - target_link_libraries(bareos-dir ${BAREOS_DIR_LIBRARIES} ${PAM_LIBRARIES}) -ELSE() - target_link_libraries(bareos-dir ${BAREOS_DIR_LIBRARIES}) -ENDIF() +if(HAVE_PAM) + target_link_libraries(bareos-dir ${BAREOS_DIR_LIBRARIES} ${PAM_LIBRARIES}) +else() + target_link_libraries(bareos-dir ${BAREOS_DIR_LIBRARIES}) +endif() add_executable(bareos-dbcheck ${DBCHKSRCS}) -SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats) +set(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats) target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES}) # is not built by default -#add_executable(testfind ${TSTFNDSRCS}) -#target_link_libraries(testfind bareos bareosfind -# jansson ${OPENSSL_LIBS} acl cap lzo2 -#) +# add_executable(testfind ${TSTFNDSRCS}) target_link_libraries(testfind bareos +# bareosfind jansson ${OPENSSL_LIBS} acl cap lzo2 ) -INSTALL(TARGETS bareos-dir bareos-dbcheck DESTINATION "${sbindir}") -INSTALL(FILES query.sql DESTINATION "${scriptdir}") +install(TARGETS bareos-dir bareos-dbcheck DESTINATION "${sbindir}") +install(FILES query.sql DESTINATION "${scriptdir}") install(CODE "set(PLUGINS \"${PLUGINS}\")") install(CODE "set(BACKENDS \"${BACKENDS}\")") diff --git a/core/src/fastlz/CMakeLists.txt b/core/src/fastlz/CMakeLists.txt index ffaaff72603..bd6196f1182 100644 --- a/core/src/fastlz/CMakeLists.txt +++ b/core/src/fastlz/CMakeLists.txt @@ -19,13 +19,18 @@ cmake_minimum_required(VERSION 3.0) project(bareosfastlz LANGUAGES C) -add_library(bareosfastlz SHARED src/fastlzlib.c src/fastlz.c src/lz4.c src/lz4hc.c) -target_include_directories(bareosfastlz PUBLIC - $ - $ - PRIVATE src) +add_library( + bareosfastlz SHARED src/fastlzlib.c src/fastlz.c src/lz4.c src/lz4hc.c +) +target_include_directories( + bareosfastlz + PUBLIC $ + $ + PRIVATE src +) target_compile_definitions(bareosfastlz PRIVATE "-DDLL_EXPORT") install(TARGETS bareosfastlz DESTINATION ${libdir}) -set_target_properties(bareosfastlz PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" - SOVERSION "${BAREOS_VERSION_MAJOR}" - ) +set_target_properties( + bareosfastlz PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION + "${BAREOS_VERSION_MAJOR}" +) diff --git a/core/src/filed/CMakeLists.txt b/core/src/filed/CMakeLists.txt index 1ada05a8805..4a8ce61a9ee 100644 --- a/core/src/filed/CMakeLists.txt +++ b/core/src/filed/CMakeLists.txt @@ -17,34 +17,48 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +if(HAVE_WIN32) + include_directories( + ${PROJECT_SOURCE_DIR}/src/win32/generic + ${PROJECT_SOURCE_DIR}/src/win32/filed + ${PROJECT_SOURCE_DIR}/src/win32/vss/include + ) +endif() + +set(FDSRCS + accurate.cc + authenticate.cc + crypto.cc + evaluate_job_command.cc + fd_plugins.cc + fileset.cc + sd_cmds.cc + verify.cc + accurate_htable.cc + backup.cc + dir_cmd.cc + filed_globals.cc + heartbeat.cc + socket_server.cc + verify_vol.cc + accurate_lmdb.cc + compression.cc + estimate.cc + filed_conf.cc + restore.cc + status.cc +) -IF(HAVE_WIN32) - include_directories( - ${PROJECT_SOURCE_DIR}/src/win32/generic - ${PROJECT_SOURCE_DIR}/src/win32/filed - ${PROJECT_SOURCE_DIR}/src/win32/vss/include - ) -ENDIF() - -set(FDSRCS accurate.cc authenticate.cc crypto.cc evaluate_job_command.cc fd_plugins.cc fileset.cc - sd_cmds.cc verify.cc accurate_htable.cc backup.cc dir_cmd.cc filed_globals.cc heartbeat.cc - socket_server.cc verify_vol.cc accurate_lmdb.cc compression.cc estimate.cc filed_conf.cc - restore.cc status.cc) - -IF(HAVE_WIN32) - LIST(APPEND FDSRCS - ../win32/filed/vss.cc - ../win32/filed/vss_XP.cc - ../win32/filed/vss_W2K3.cc - ../win32/filed/vss_Vista.cc - ../win32/generic/service.cc - ../win32/generic/main.cc - ) -ENDIF() +if(HAVE_WIN32) + list(APPEND FDSRCS ../win32/filed/vss.cc ../win32/filed/vss_XP.cc + ../win32/filed/vss_W2K3.cc ../win32/filed/vss_Vista.cc + ../win32/generic/service.cc ../win32/generic/main.cc + ) +endif() -IF(HAVE_WIN32) - LIST(APPEND FDSRCS ../win32/filed/filedres.rc) -ENDIF() +if(HAVE_WIN32) + list(APPEND FDSRCS ../win32/filed/filedres.rc) +endif() include_directories(${OPENSSL_INCLUDE_DIR}) @@ -53,40 +67,36 @@ target_link_libraries(fd_objects PUBLIC bareos) add_executable(bareos-fd filed.cc) -SET(BAREOS_FD_LIBRARIES - bareosfind bareos - pthread - ${LMDB_LIBS} - ) -IF(HAVE_WIN32) - LIST(APPEND BAREOS_FD_LIBRARIES - comctl32 - ) +set(BAREOS_FD_LIBRARIES bareosfind bareos pthread ${LMDB_LIBS}) +if(HAVE_WIN32) + list(APPEND BAREOS_FD_LIBRARIES comctl32) - SET (FD_COMPILE_DEFINITIONS -DWIN32_VSS) + set(FD_COMPILE_DEFINITIONS -DWIN32_VSS) - IF ("${WINDOWS_BITS}" STREQUAL "64") - LIST(APPEND FD_COMPILE_DEFINITIONS -DHAVE_VSS64) - ENDIF() + if("${WINDOWS_BITS}" STREQUAL "64") + list(APPEND FD_COMPILE_DEFINITIONS -DHAVE_VSS64) + endif() - target_compile_definitions(fd_objects PRIVATE ${FD_COMPILE_DEFINITIONS}) - target_compile_definitions(bareos-fd PRIVATE ${FD_COMPILE_DEFINITIONS}) -ENDIF() + target_compile_definitions(fd_objects PRIVATE ${FD_COMPILE_DEFINITIONS}) + target_compile_definitions(bareos-fd PRIVATE ${FD_COMPILE_DEFINITIONS}) +endif() -target_link_libraries(bareos-fd - fd_objects - ${BAREOS_FD_LIBRARIES} -) +target_link_libraries(bareos-fd fd_objects ${BAREOS_FD_LIBRARIES}) -IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set_target_properties(bareos-fd PROPERTIES INSTALL_RPATH "@loader_path/../${libdir}") -ENDIF() +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set_target_properties( + bareos-fd PROPERTIES INSTALL_RPATH "@loader_path/../${libdir}" + ) +endif() - -INSTALL(TARGETS bareos-fd DESTINATION "${sbindir}" COMPONENT filedaemon) +install(TARGETS bareos-fd DESTINATION "${sbindir}" COMPONENT filedaemon) install(CODE "set(PLUGINS \"${PLUGINS}\")" COMPONENT filedaemon) install(CODE "set(BACKENDS \"${BACKENDS}\")" COMPONENT filedaemon) -install(CODE "set(configtemplatedir \"${configtemplatedir}\")" COMPONENT filedaemon) +install(CODE "set(configtemplatedir \"${configtemplatedir}\")" + COMPONENT filedaemon +) install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")" COMPONENT filedaemon) -install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-filed-configfiles.cmake COMPONENT filedaemon) +install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-filed-configfiles.cmake + COMPONENT filedaemon +) diff --git a/core/src/findlib/CMakeLists.txt b/core/src/findlib/CMakeLists.txt index 4028ef2b95e..901d6dc4044 100644 --- a/core/src/findlib/CMakeLists.txt +++ b/core/src/findlib/CMakeLists.txt @@ -17,13 +17,26 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -SET(BAREOSFIND_SRCS acl.cc attribs.cc bfile.cc create_file.cc drivetype.cc - enable_priv.cc find_one.cc find.cc fstype.cc hardlink.cc match.cc - mkpath.cc shadowing.cc xattr.cc) - -IF(HAVE_WIN32) - LIST(APPEND BAREOSFIND_SRCS ../win32/findlib/win32.cc) -ENDIF() +set(BAREOSFIND_SRCS + acl.cc + attribs.cc + bfile.cc + create_file.cc + drivetype.cc + enable_priv.cc + find_one.cc + find.cc + fstype.cc + hardlink.cc + match.cc + mkpath.cc + shadowing.cc + xattr.cc +) + +if(HAVE_WIN32) + list(APPEND BAREOSFIND_SRCS ../win32/findlib/win32.cc) +endif() include_directories(${OPENSSL_INCLUDE_DIR}) @@ -31,16 +44,16 @@ add_library(bareosfind SHARED ${BAREOSFIND_SRCS}) target_link_libraries(bareosfind bareos ${ACL_LIBS}) -INSTALL(TARGETS bareosfind DESTINATION ${libdir} COMPONENT filedaemon) +install(TARGETS bareosfind DESTINATION ${libdir} COMPONENT filedaemon) -set_target_properties(bareosfind PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" - SOVERSION "${BAREOS_VERSION_MAJOR}" - DEFINE_SYMBOL "BUILDING_DLL" - ) -IF(HAVE_WIN32) - set_target_properties(bareosfind PROPERTIES DEFINE_SYMBOL "BUILDING_DLL") -ENDIF() +set_target_properties( + bareosfind PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION + "${BAREOS_VERSION_MAJOR}" DEFINE_SYMBOL "BUILDING_DLL" +) +if(HAVE_WIN32) + set_target_properties(bareosfind PROPERTIES DEFINE_SYMBOL "BUILDING_DLL") +endif() -IF(NOT HAVE_WIN32 AND GTEST_FOUND) - #add_subdirectory(unittests) -ENDIF() +if(NOT HAVE_WIN32 AND GTEST_FOUND) + # add_subdirectory(unittests) +endif() diff --git a/core/src/findlib/unittests/CMakeLists.txt b/core/src/findlib/unittests/CMakeLists.txt index 7c42418beff..bc3b5aa3874 100644 --- a/core/src/findlib/unittests/CMakeLists.txt +++ b/core/src/findlib/unittests/CMakeLists.txt @@ -17,27 +17,23 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -set (TEST_SRC -# drivetype_test.cc -# fstype_test.cc - ) +set(TEST_SRC # drivetype_test.cc + # fstype_test.cc +) -add_executable(test_findlib - ${TEST_SRC} - ) -target_link_libraries(test_findlib - bareosfind bareos - ${JANSSON_LIBRARIES} - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} - ) +add_executable(test_findlib ${TEST_SRC}) +target_link_libraries( + test_findlib bareosfind bareos ${JANSSON_LIBRARIES} ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} +) -add_test(NAME test_findlib - COMMAND "test_findlib" - ) -set_property(TEST test_findlib - PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/lib:${CMAKE_BINARY_DIR}/src/findlib" - PROPERTY ENVIRONMENT "GTEST_COLOR=yes" - ) +add_test(NAME test_findlib COMMAND "test_findlib") +set_property( + TEST test_findlib + PROPERTY + ENVIRONMENT + "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/lib:${CMAKE_BINARY_DIR}/src/findlib" + PROPERTY ENVIRONMENT "GTEST_COLOR=yes" +) add_dependencies(check test_findlib) diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt index 2261eb3532a..1b166b518ea 100644 --- a/core/src/lib/CMakeLists.txt +++ b/core/src/lib/CMakeLists.txt @@ -17,88 +17,221 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -IF(NOT client-only) -set(INCLUDE_FILES ../include/baconfig.h ../include/bareos.h - ../include/bc_types.h ../include/config.h - ../include/jcr.h version.h - address_conf.h alist.h attr.h base64.h berrno.h - bits.h bpipe.h breg.h bregex.h bstringlist.h bsock.h - bsock_tcp.h btime.h btimers.h cbuf.h - crypto.h crypto_cache.h devlock.h dlist.h fnmatch.h - guid_to_name.h htable.h ini.h lex.h lib.h lockmgr.h - md5.h mem_pool.h message.h messages_resource.h messages_resource_items.h - mntent_cache.h parse_conf.h - plugins.h qualified_resource_name_type_converter.h rblist.h - runscript.h rwlock.h scsi_crypto.h scsi_lli.h scsi_tapealert.h - serial.h sha1.h status.h thread_list.h tls.h tls_conf.h tree.h try_tls_handshake_as_a_server.h - var.h watchdog.h) +if(NOT client-only) + set(INCLUDE_FILES + ../include/baconfig.h + ../include/bareos.h + ../include/bc_types.h + ../include/config.h + ../include/jcr.h + version.h + address_conf.h + alist.h + attr.h + base64.h + berrno.h + bits.h + bpipe.h + breg.h + bregex.h + bstringlist.h + bsock.h + bsock_tcp.h + btime.h + btimers.h + cbuf.h + crypto.h + crypto_cache.h + devlock.h + dlist.h + fnmatch.h + guid_to_name.h + htable.h + ini.h + lex.h + lib.h + lockmgr.h + md5.h + mem_pool.h + message.h + messages_resource.h + messages_resource_items.h + mntent_cache.h + parse_conf.h + plugins.h + qualified_resource_name_type_converter.h + rblist.h + runscript.h + rwlock.h + scsi_crypto.h + scsi_lli.h + scsi_tapealert.h + serial.h + sha1.h + status.h + thread_list.h + tls.h + tls_conf.h + tree.h + try_tls_handshake_as_a_server.h + var.h + watchdog.h + ) -INSTALL(FILES ${INCLUDE_FILES} DESTINATION ${includedir}) -ENDIF() + install(FILES ${INCLUDE_FILES} DESTINATION ${includedir}) +endif() include_directories( - ${OPENSSL_INCLUDE_DIR} - ${PTHREAD_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} - ${ACL_INCLUDE_DIRS} - ${LZO2_INCLUDE_DIRS} - ${CAP_INCLUDE_DIRS} - ${WRAP_INCLUDE_DIRS}) + ${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} + ${ACL_INCLUDE_DIRS} ${LZO2_INCLUDE_DIRS} ${CAP_INCLUDE_DIRS} + ${WRAP_INCLUDE_DIRS} +) -set (BAREOS_SRCS address_conf.cc alist.cc attr.cc attribs.cc backtrace.cc base64.cc - berrno.cc bget_msg.cc binflate.cc bnet_server_tcp.cc bnet.cc bnet_network_dump.cc - bnet_network_dump_private.cc bpipe.cc breg.cc bregex.cc bsnprintf.cc bsock.cc - bsock_tcp.cc bstringlist.cc - bsys.cc btime.cc btimers.cc cbuf.cc - connection_pool.cc cram_md5.cc crypto.cc crypto_cache.cc - crypto_none.cc crypto_nss.cc crypto_openssl.cc crypto_wrap.cc daemon.cc - devlock.cc dlist.cc edit.cc fnmatch.cc guid_to_name.cc hmac.cc htable.cc - jcr.cc json.cc lockmgr.cc md5.cc mem_pool.cc message.cc messages_resource.cc - mntent_cache.cc output_formatter.cc passphrase.cc path_list.cc plugins.cc - bpoll.cc priv.cc recent_job_results_list.cc - rblist.cc runscript.cc rwlock.cc scan.cc scsi_crypto.cc scsi_lli.cc - serial.cc sha1.cc signal.cc thread_list.cc thread_specific_data.cc timer_thread.cc tls.cc - tls_conf.cc tls_openssl.cc - tls_openssl_crl.cc tls_openssl_private.cc tree.cc try_tls_handshake_as_a_server.cc - compression.cc util.cc var.cc watchdog.cc watchdog_timer.cc) +set(BAREOS_SRCS + address_conf.cc + alist.cc + attr.cc + attribs.cc + backtrace.cc + base64.cc + berrno.cc + bget_msg.cc + binflate.cc + bnet_server_tcp.cc + bnet.cc + bnet_network_dump.cc + bnet_network_dump_private.cc + bpipe.cc + breg.cc + bregex.cc + bsnprintf.cc + bsock.cc + bsock_tcp.cc + bstringlist.cc + bsys.cc + btime.cc + btimers.cc + cbuf.cc + connection_pool.cc + cram_md5.cc + crypto.cc + crypto_cache.cc + crypto_none.cc + crypto_nss.cc + crypto_openssl.cc + crypto_wrap.cc + daemon.cc + devlock.cc + dlist.cc + edit.cc + fnmatch.cc + guid_to_name.cc + hmac.cc + htable.cc + jcr.cc + json.cc + lockmgr.cc + md5.cc + mem_pool.cc + message.cc + messages_resource.cc + mntent_cache.cc + output_formatter.cc + passphrase.cc + path_list.cc + plugins.cc + bpoll.cc + priv.cc + recent_job_results_list.cc + rblist.cc + runscript.cc + rwlock.cc + scan.cc + scsi_crypto.cc + scsi_lli.cc + serial.cc + sha1.cc + signal.cc + thread_list.cc + thread_specific_data.cc + timer_thread.cc + tls.cc + tls_conf.cc + tls_openssl.cc + tls_openssl_crl.cc + tls_openssl_private.cc + tree.cc + try_tls_handshake_as_a_server.cc + compression.cc + util.cc + var.cc + watchdog.cc + watchdog_timer.cc +) -IF(HAVE_WIN32) - LIST(APPEND BAREOS_SRCS - ../win32/compat/compat.cc - ../win32/compat/glob.cc - ../win32/compat/print.cc - ../win32/compat/winapi.cc) -ELSE() - LIST(APPEND BAREOS_SRCS - scsi_tapealert.cc) -ENDIF() +if(HAVE_WIN32) + list(APPEND BAREOS_SRCS ../win32/compat/compat.cc ../win32/compat/glob.cc + ../win32/compat/print.cc ../win32/compat/winapi.cc + ) +else() + list(APPEND BAREOS_SRCS scsi_tapealert.cc) +endif() -set (BAREOSCFG_SRCS bareos_resource.cc configured_tls_policy_getter.cc ini.cc lex.cc - parse_bsr.cc res.cc parse_conf.cc parse_conf_init_resource.cc parse_conf_state_machine.cc - res.cc qualified_resource_name_type_converter.cc) -LIST(APPEND BAREOS_SRCS ${BAREOSCFG_SRCS}) +set(BAREOSCFG_SRCS + bareos_resource.cc + configured_tls_policy_getter.cc + ini.cc + lex.cc + parse_bsr.cc + res.cc + parse_conf.cc + parse_conf_init_resource.cc + parse_conf_state_machine.cc + res.cc + qualified_resource_name_type_converter.cc +) +list(APPEND BAREOS_SRCS ${BAREOSCFG_SRCS}) add_library(bareos SHARED ${BAREOS_SRCS} $) add_library(version-obj OBJECT version.c) -target_compile_definitions(version-obj PRIVATE -DBAREOS_VERSION="${BAREOS_FULL_VERSION}" -DBAREOS_DATE="${DATE}" -DBAREOS_SHORT_DATE="${BAREOS_SHORT_DATE}" -DBAREOS_PROG_DATE_TIME="${BAREOS_PROG_DATE_TIME}" -DBAREOS_YEAR="${BAREOS_YEAR}") +target_compile_definitions( + version-obj + PRIVATE + -DBAREOS_VERSION="${BAREOS_FULL_VERSION}" + -DBAREOS_DATE="${DATE}" + -DBAREOS_SHORT_DATE="${BAREOS_SHORT_DATE}" + -DBAREOS_PROG_DATE_TIME="${BAREOS_PROG_DATE_TIME}" + -DBAREOS_YEAR="${BAREOS_YEAR}" +) set_target_properties(version-obj PROPERTIES POSITION_INDEPENDENT_CODE ON) -IF(HAVE_LIBDL) +if(HAVE_LIBDL) target_link_libraries(bareos dl) -ENDIF() +endif() -target_link_libraries(bareos bareosfastlz - ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${ZLIB_LIBRARIES} - ${ACL_LIBRARIES} ${LZO2_LIBRARIES} ${CAP_LIBRARIES} ${WRAP_LIBRARIES} - ${CAM_LIBRARIES} ${WINDOWS_LIBRARIES} ${JANSSON_LIBRARIES}) +target_link_libraries( + bareos + bareosfastlz + ${OPENSSL_LIBRARIES} + ${PTHREAD_LIBRARIES} + ${ZLIB_LIBRARIES} + ${ACL_LIBRARIES} + ${LZO2_LIBRARIES} + ${CAP_LIBRARIES} + ${WRAP_LIBRARIES} + ${CAM_LIBRARIES} + ${WINDOWS_LIBRARIES} + ${JANSSON_LIBRARIES} +) -INSTALL(TARGETS bareos DESTINATION ${libdir}) +install(TARGETS bareos DESTINATION ${libdir}) -set_target_properties(bareos PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" - SOVERSION "${BAREOS_VERSION_MAJOR}") - -IF(HAVE_WIN32) - set_target_properties(bareos PROPERTIES DEFINE_SYMBOL "BUILDING_DLL") -ENDIF() +set_target_properties( + bareos PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION + "${BAREOS_VERSION_MAJOR}" +) +if(HAVE_WIN32) + set_target_properties(bareos PROPERTIES DEFINE_SYMBOL "BUILDING_DLL") +endif() diff --git a/core/src/lmdb/CMakeLists.txt b/core/src/lmdb/CMakeLists.txt index cfe38244130..faa539736cd 100644 --- a/core/src/lmdb/CMakeLists.txt +++ b/core/src/lmdb/CMakeLists.txt @@ -17,21 +17,22 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -IF(HAVE_FREEBSD_OS) +if(HAVE_FREEBSD_OS) add_definitions(-D_WANT_SEMUN=1) -ENDIF() +endif() add_library(bareoslmdb SHARED mdb.c midl.c) # empty the include_directories set_property(TARGET bareoslmdb PROPERTY INCLUDE_DIRECTORIES "") -set_target_properties(bareoslmdb PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" - SOVERSION "${BAREOS_VERSION_MAJOR}" - ) -IF(HAVE_WIN32) - set_target_properties(bareoslmdb PROPERTIES DEFINE_SYMBOL "BUILDING_DLL") - target_link_libraries(bareoslmdb -lntdll) -ENDIF() +set_target_properties( + bareoslmdb PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION + "${BAREOS_VERSION_MAJOR}" +) +if(HAVE_WIN32) + set_target_properties(bareoslmdb PROPERTIES DEFINE_SYMBOL "BUILDING_DLL") + target_link_libraries(bareoslmdb -lntdll) +endif() -INSTALL(TARGETS bareoslmdb DESTINATION ${libdir}) +install(TARGETS bareoslmdb DESTINATION ${libdir}) diff --git a/core/src/ndmp/CMakeLists.txt b/core/src/ndmp/CMakeLists.txt index a26a1e1a474..9198f4f3288 100644 --- a/core/src/ndmp/CMakeLists.txt +++ b/core/src/ndmp/CMakeLists.txt @@ -17,75 +17,164 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_OPTION_NO_TEST_AGENTS") -#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_NDMJOBLIB_REVISION=\\\"${BAREOS_FULL_VERSION}\\\"") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_VENDOR_NAME=\\\"Bareos\\ GmbH\\ \\&\\ Co.KG\\\"") +# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} +# -DNDMOS_CONST_NDMJOBLIB_REVISION=\\\"${BAREOS_FULL_VERSION}\\\"") +set(CMAKE_C_FLAGS + "${CMAKE_C_FLAGS} -DNDMOS_CONST_VENDOR_NAME=\\\"Bareos\\ GmbH\\ \\&\\ Co.KG\\\"" +) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_PRODUCT_NAME=\\\"Bareos\\\"") -#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_PRODUCT_REVISION=\\\"${BAREOS_FULL_VERSION}\\\"") +# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} +# -DNDMOS_CONST_PRODUCT_REVISION=\\\"${BAREOS_FULL_VERSION}\\\"") -if (${HAVE_LINUX_OS}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_LINUX_OS") -elseif (${HAVE_SUN_OS}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_SUN_OS") +if(${HAVE_LINUX_OS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_LINUX_OS") +elseif(${HAVE_SUN_OS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_SUN_OS") endif() -set(RPC_GEN_FILES ndmp0.h ndmp0_xdr.c - ndmp2.h ndmp2_xdr.c - ndmp3.h ndmp3_xdr.c - ndmp4.h ndmp4_xdr.c - ndmp9.h ndmp9_xdr.c +set(RPC_GEN_FILES + ndmp0.h + ndmp0_xdr.c + ndmp2.h + ndmp2_xdr.c + ndmp3.h + ndmp3_xdr.c + ndmp4.h + ndmp4_xdr.c + ndmp9.h + ndmp9_xdr.c ) -set(INCLUDE_FILES = ndmagents.h ndmlib.h ndmp_ammend.h ndmp_msg_buf.h ndmp_translate.h - ndmp0_enum_strs.h ndmp0.h ndmp2_enum_strs.h ndmp2_translate.h ndmp2.h - ndmp3_enum_strs.h ndmp3_translate.h ndmp3.h ndmp4_enum_strs.h - ndmp4_translate.h ndmp4.h ndmp9_enum_strs.h ndmp9.h ndmprotocol.h - scsiconst.h smc_priv.h smc_raw.h smc.h wraplib.h +set(INCLUDE_FILES + = + ndmagents.h + ndmlib.h + ndmp_ammend.h + ndmp_msg_buf.h + ndmp_translate.h + ndmp0_enum_strs.h + ndmp0.h + ndmp2_enum_strs.h + ndmp2_translate.h + ndmp2.h + ndmp3_enum_strs.h + ndmp3_translate.h + ndmp3.h + ndmp4_enum_strs.h + ndmp4_translate.h + ndmp4.h + ndmp9_enum_strs.h + ndmp9.h + ndmprotocol.h + scsiconst.h + smc_priv.h + smc_raw.h + smc.h + wraplib.h ) -set(NDMP_PROTO_SRCS ndmp_translate.c ndmp0_enum_strs.c ndmp0_pp.c ndmp0_xdr.c - ndmp0_xmt.c ndmp2_enum_strs.c ndmp2_pp.c ndmp2_translate.c - ndmp2_xdr.c ndmp2_xmt.c ndmp3_enum_strs.c ndmp3_pp.c ndmp3_translate.c - ndmp3_xdr.c ndmp3_xmt.c ndmp4_enum_strs.c ndmp4_pp.c ndmp4_translate.c - ndmp4_xdr.c ndmp4_xmt.c ndmp9_enum_strs.c ndmp9_xdr.c ndmp9_xmt.c ndmprotocol.c +set(NDMP_PROTO_SRCS + ndmp_translate.c + ndmp0_enum_strs.c + ndmp0_pp.c + ndmp0_xdr.c + ndmp0_xmt.c + ndmp2_enum_strs.c + ndmp2_pp.c + ndmp2_translate.c + ndmp2_xdr.c + ndmp2_xmt.c + ndmp3_enum_strs.c + ndmp3_pp.c + ndmp3_translate.c + ndmp3_xdr.c + ndmp3_xmt.c + ndmp4_enum_strs.c + ndmp4_pp.c + ndmp4_translate.c + ndmp4_xdr.c + ndmp4_xmt.c + ndmp9_enum_strs.c + ndmp9_xdr.c + ndmp9_xmt.c + ndmprotocol.c ) -set(NDMP_LIB_SRCS ndml_agent.c ndml_bstf.c ndml_chan.c ndml_config.c ndml_conn.c ndml_cstr.c - ndml_fhdb.c ndml_fhh.c ndml_log.c ndml_md5.c ndml_media.c ndml_nmb.c - ndml_scsi.c ndml_stzf.c ndml_util.c +set(NDMP_LIB_SRCS + ndml_agent.c + ndml_bstf.c + ndml_chan.c + ndml_config.c + ndml_conn.c + ndml_cstr.c + ndml_fhdb.c + ndml_fhh.c + ndml_log.c + ndml_md5.c + ndml_media.c + ndml_nmb.c + ndml_scsi.c + ndml_stzf.c + ndml_util.c ) -set(NDMP_AGENT_SRCS ndma_comm_dispatch.c ndma_comm_job.c ndma_comm_session.c ndma_comm_subr.c - ndma_control.c ndma_cops_backreco.c ndma_cops_labels.c ndma_cops_query.c - ndma_cops_robot.c ndma_ctrl_calls.c ndma_ctrl_conn.c ndma_ctrl_media.c - ndma_ctrl_robot.c ndma_ctst_data.c ndma_ctst_mover.c ndma_ctst_subr.c - ndma_ctst_tape.c ndma_data_fh.c ndma_data_pfe.c ndma_data.c - ndma_image_stream.c ndma_listmgmt.c ndma_noti_calls.c - ndma_robot.c ndma_robot_simulator.c - ndma_tape.c ndma_tape_simulator.c +set(NDMP_AGENT_SRCS + ndma_comm_dispatch.c + ndma_comm_job.c + ndma_comm_session.c + ndma_comm_subr.c + ndma_control.c + ndma_cops_backreco.c + ndma_cops_labels.c + ndma_cops_query.c + ndma_cops_robot.c + ndma_ctrl_calls.c + ndma_ctrl_conn.c + ndma_ctrl_media.c + ndma_ctrl_robot.c + ndma_ctst_data.c + ndma_ctst_mover.c + ndma_ctst_subr.c + ndma_ctst_tape.c + ndma_data_fh.c + ndma_data_pfe.c + ndma_data.c + ndma_image_stream.c + ndma_listmgmt.c + ndma_noti_calls.c + ndma_robot.c + ndma_robot_simulator.c + ndma_tape.c + ndma_tape_simulator.c ) set(NDMP_HELPER_SRCS md5c.c ndmos.c smc_api.c smc_parse.c smc_pp.c wraplib.c) -set(NDMJOB_SRCS ndmjob_args.c ndmjob_fhdb.c ndmjob_job.c ndmjob_main.c - ndmjob_main_util.c ndmjob_rules.c ndmjob_simulator.c ndmjr_none.c) - +set(NDMJOB_SRCS + ndmjob_args.c ndmjob_fhdb.c ndmjob_job.c ndmjob_main.c ndmjob_main_util.c + ndmjob_rules.c ndmjob_simulator.c ndmjr_none.c +) -set(LIBBAREOSNDMP_SRCS ${NDMP_PROTO_SRCS} ${NDMP_LIB_SRCS} ${NDMP_AGENT_SRCS} ${NDMP_HELPER_SRCS}) +set(LIBBAREOSNDMP_SRCS ${NDMP_PROTO_SRCS} ${NDMP_LIB_SRCS} ${NDMP_AGENT_SRCS} + ${NDMP_HELPER_SRCS} +) -IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(RPCGEN_PARAMS "-C") -ELSE() +else() set(RPCGEN_PARAMS "-CM") -ENDIF() +endif() # create files with rpcgen foreach(NDMP_VERSION 0 2 3 4 9) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ndmp${NDMP_VERSION}.x ${CMAKE_CURRENT_BINARY_DIR}/ndmp${NDMP_VERSION}.x COPYONLY) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/ndmp${NDMP_VERSION}.x + ${CMAKE_CURRENT_BINARY_DIR}/ndmp${NDMP_VERSION}.x COPYONLY + ) add_custom_command( OUTPUT ndmp${NDMP_VERSION}.h ndmp${NDMP_VERSION}_xdr.c - COMMAND ${RPCGEN} ${RPCGEN_PARAMS} ndmp${NDMP_VERSION}.x + COMMAND ${RPCGEN} ${RPCGEN_PARAMS} ndmp${NDMP_VERSION}.x WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${RPCGEN} ${CMAKE_CURRENT_BINARY_DIR}/ndmp${NDMP_VERSION}.x ) @@ -97,10 +186,11 @@ target_link_libraries(bareosndmp ${WRAP_LIBS} ${TIRPC_LIBRARIES}) install(TARGETS bareosndmp DESTINATION ${libdir}) -set_target_properties(bareosndmp PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" - SOVERSION "${BAREOS_VERSION_MAJOR}" - ) -IF(build_ndmjob) +set_target_properties( + bareosndmp PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION + "${BAREOS_VERSION_MAJOR}" +) +if(build_ndmjob) add_executable(ndmjob ${NDMJOB_SRCS}) target_link_libraries(ndmjob bareosndmp) -ENDIF() +endif() diff --git a/core/src/plugins/CMakeLists.txt b/core/src/plugins/CMakeLists.txt index 18288abf210..5247a723e39 100644 --- a/core/src/plugins/CMakeLists.txt +++ b/core/src/plugins/CMakeLists.txt @@ -17,9 +17,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - -IF(NOT client-only) - add_subdirectory(dird) - add_subdirectory(stored) -ENDIF() +if(NOT client-only) + add_subdirectory(dird) + add_subdirectory(stored) +endif() add_subdirectory(filed) diff --git a/core/src/plugins/dird/CMakeLists.txt b/core/src/plugins/dird/CMakeLists.txt index 7e6d4399035..eea511c0b8e 100644 --- a/core/src/plugins/dird/CMakeLists.txt +++ b/core/src/plugins/dird/CMakeLists.txt @@ -17,30 +17,29 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. +if(HAVE_WIN32) + include_directories( + ${PROJECT_SOURCE_DIR}/src/win32/generic + ${PROJECT_SOURCE_DIR}/src/win32/dird + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include + ) + link_directories( + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS} + ) + add_definitions(-DMS_WIN${WINDOWS_BITS}) +endif() -IF(HAVE_WIN32) - include_directories( - ${PROJECT_SOURCE_DIR}/src/win32/generic - ${PROJECT_SOURCE_DIR}/src/win32/dird - ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include - ) - link_directories(${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}) - add_definitions(-DMS_WIN${WINDOWS_BITS}) -ENDIF() +if(HAVE_PYTHON) + add_library(python-dir MODULE python-dir.cc) + # do not prefix with "lib" + set_target_properties(python-dir PROPERTIES PREFIX "") + install(TARGETS python-dir DESTINATION ${plugindir}) + target_link_libraries(python-dir ${PYTHON_LIBRARIES} bareos) -IF(HAVE_PYTHON) - add_library(python-dir MODULE python-dir.cc) - # do not prefix with "lib" - set_target_properties(python-dir PROPERTIES PREFIX "") - INSTALL(TARGETS python-dir DESTINATION ${plugindir}) - target_link_libraries(python-dir ${PYTHON_LIBRARIES} bareos) + set(PYFILES + bareos-dir.py.template bareos-dir-class-plugin.py bareos_dir_consts.py + BareosDirPluginBaseclass.py BareosDirWrapper.py + ) - - set (PYFILES bareos-dir.py.template - bareos-dir-class-plugin.py - bareos_dir_consts.py - BareosDirPluginBaseclass.py - BareosDirWrapper.py) - - INSTALL(FILES ${PYFILES} DESTINATION ${plugindir}) -ENDIF() + install(FILES ${PYFILES} DESTINATION ${plugindir}) +endif() diff --git a/core/src/plugins/filed/CMakeLists.txt b/core/src/plugins/filed/CMakeLists.txt index 8f02fb34551..51dc1f836c5 100644 --- a/core/src/plugins/filed/CMakeLists.txt +++ b/core/src/plugins/filed/CMakeLists.txt @@ -17,91 +17,90 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -IF(HAVE_WIN32) - include_directories( - ${PROJECT_SOURCE_DIR}/src/win32 - ${PROJECT_SOURCE_DIR}/src/win32/include - ${PROJECT_SOURCE_DIR}/src/win32/filed - ${PROJECT_SOURCE_DIR}/src/win32/plugins/filed - ${PROJECT_SOURCE_DIR}/src/win32/compat/include - ${PROJECT_SOURCE_DIR}/src/win32/vdi/include - ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include - ${PROJECT_SOURCE_DIR}/src/include - ${PROJECT_SOURCE_DIR}/src - ${PROJECT_SOURCE_DIR}/src/filed - ${PROJECT_SOURCE_DIR}/src/plugins/filed - ) - - link_directories(${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}) - add_definitions(-DMS_WIN${WINDOWS_BITS}) -ELSE() - include_directories(/usr/include/python2.7) -ENDIF() +if(HAVE_WIN32) + include_directories( + ${PROJECT_SOURCE_DIR}/src/win32 + ${PROJECT_SOURCE_DIR}/src/win32/include + ${PROJECT_SOURCE_DIR}/src/win32/filed + ${PROJECT_SOURCE_DIR}/src/win32/plugins/filed + ${PROJECT_SOURCE_DIR}/src/win32/compat/include + ${PROJECT_SOURCE_DIR}/src/win32/vdi/include + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include + ${PROJECT_SOURCE_DIR}/src/include + ${PROJECT_SOURCE_DIR}/src + ${PROJECT_SOURCE_DIR}/src/filed + ${PROJECT_SOURCE_DIR}/src/plugins/filed + ) + + link_directories( + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS} + ) + add_definitions(-DMS_WIN${WINDOWS_BITS}) +else() + include_directories(/usr/include/python2.7) +endif() include_directories(${OPENSSL_INCLUDE_DIR}) - -#set(DLLIBS dl) +# set(DLLIBS dl) add_library(bpipe-fd MODULE bpipe-fd.cc) set_target_properties(bpipe-fd PROPERTIES PREFIX "") -INSTALL(TARGETS bpipe-fd DESTINATION ${plugindir} COMPONENT filedaemon) -IF(HAVE_WIN32 OR HAVE_DARWIN_OS) - target_link_libraries(bpipe-fd bareos) -ENDIF() - - -IF(HAVE_WIN32) - add_library(mssqlvdi-fd MODULE ../../win32/plugins/filed/mssqlvdi-fd.cc) - target_compile_options(mssqlvdi-fd PUBLIC -fpermissive) - set_target_properties(mssqlvdi-fd PROPERTIES PREFIX "" - DEFINE_SYMBOL "BUILDING_DLL" - ) +install(TARGETS bpipe-fd DESTINATION ${plugindir} COMPONENT filedaemon) +if(HAVE_WIN32 OR HAVE_DARWIN_OS) + target_link_libraries(bpipe-fd bareos) +endif() - INSTALL(TARGETS mssqlvdi-fd DESTINATION ${plugindir} COMPONENT filedaemon) - target_link_libraries(mssqlvdi-fd bareos) -ENDIF() +if(HAVE_WIN32) + add_library(mssqlvdi-fd MODULE ../../win32/plugins/filed/mssqlvdi-fd.cc) + target_compile_options(mssqlvdi-fd PUBLIC -fpermissive) + set_target_properties( + mssqlvdi-fd PROPERTIES PREFIX "" DEFINE_SYMBOL "BUILDING_DLL" + ) + install(TARGETS mssqlvdi-fd DESTINATION ${plugindir} COMPONENT filedaemon) + target_link_libraries(mssqlvdi-fd bareos) +endif() if(${HAVE_CEPHFS}) - add_library(cephfs-fd MODULE cephfs-fd.cc) - set_target_properties(cephfs-fd PROPERTIES PREFIX "") - INSTALL(TARGETS cephfs-fd DESTINATION ${plugindir} COMPONENT filedaemon) + add_library(cephfs-fd MODULE cephfs-fd.cc) + set_target_properties(cephfs-fd PROPERTIES PREFIX "") + install(TARGETS cephfs-fd DESTINATION ${plugindir} COMPONENT filedaemon) endif() if(${HAVE_CEPH_RADOS}) - add_library(rados-fd MODULE rados-fd.cc) - set_target_properties(rados-fd PROPERTIES PREFIX "") - INSTALL(TARGETS rados-fd DESTINATION ${plugindir} COMPONENT filedaemon) + add_library(rados-fd MODULE rados-fd.cc) + set_target_properties(rados-fd PROPERTIES PREFIX "") + install(TARGETS rados-fd DESTINATION ${plugindir} COMPONENT filedaemon) endif() -IF(NOT HAVE_WIN32) - add_library(example-plugin-fd MODULE example-plugin-fd.cc) - set_target_properties(example-plugin-fd PROPERTIES PREFIX "") -ENDIF() +if(NOT HAVE_WIN32) + add_library(example-plugin-fd MODULE example-plugin-fd.cc) + set_target_properties(example-plugin-fd PROPERTIES PREFIX "") +endif() -IF(HAVE_PYTHON) - add_library(python-fd MODULE python-fd.cc) - set_target_properties(python-fd PROPERTIES PREFIX "") - INSTALL(TARGETS python-fd DESTINATION ${plugindir} COMPONENT filedaemon) - target_link_libraries(python-fd ${PYTHON_LIBRARIES} bareos) -ENDIF() +if(HAVE_PYTHON) + add_library(python-fd MODULE python-fd.cc) + set_target_properties(python-fd PROPERTIES PREFIX "") + install(TARGETS python-fd DESTINATION ${plugindir} COMPONENT filedaemon) + target_link_libraries(python-fd ${PYTHON_LIBRARIES} bareos) +endif() if(${HAVE_GLUSTERFS}) - add_library(gfapi-fd MODULE gfapi-fd.cc) - set_target_properties(gfapi-fd PROPERTIES PREFIX "") - INSTALL(TARGETS gfapi-fd DESTINATION ${plugindir} COMPONENT filedaemon) - target_link_libraries(gfapi-fd gfapi) + add_library(gfapi-fd MODULE gfapi-fd.cc) + set_target_properties(gfapi-fd PROPERTIES PREFIX "") + install(TARGETS gfapi-fd DESTINATION ${plugindir} COMPONENT filedaemon) + target_link_libraries(gfapi-fd gfapi) endif() -if (${HAVE_TEST_PLUGIN}) - add_library(test-plugin-fd MODULE test-plugin-fd.cc) - # do not prefix with "lib" - set_target_properties(test-plugin-fd PROPERTIES PREFIX "") - INSTALL(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon) +if(${HAVE_TEST_PLUGIN}) + add_library(test-plugin-fd MODULE test-plugin-fd.cc) + # do not prefix with "lib" + set_target_properties(test-plugin-fd PROPERTIES PREFIX "") + install(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon) endif() -set (PYFILES +set(PYFILES bareos-fd.py.template bareos-fd-local-fileset.py bareos-fd-mock-test.py @@ -111,8 +110,10 @@ set (PYFILES bareos_fd_consts.py bareos-fd-ldap.py BareosFdPluginLDAP.py - ) - -INSTALL(FILES ${PYFILES} DESTINATION ${plugindir} COMPONENT filedaemon) - +) +install( + FILES ${PYFILES} + DESTINATION ${plugindir} + COMPONENT filedaemon +) diff --git a/core/src/plugins/stored/CMakeLists.txt b/core/src/plugins/stored/CMakeLists.txt index 060bc4bfea7..0d887f698b1 100644 --- a/core/src/plugins/stored/CMakeLists.txt +++ b/core/src/plugins/stored/CMakeLists.txt @@ -17,48 +17,46 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -IF(HAVE_WIN32) - include_directories( - ${PROJECT_SOURCE_DIR}/src/win32/generic - ${PROJECT_SOURCE_DIR}/src/win32/stored - ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include - ) - link_directories(${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}) - add_definitions(-DMS_WIN${WINDOWS_BITS}) -ENDIF() - - +if(HAVE_WIN32) + include_directories( + ${PROJECT_SOURCE_DIR}/src/win32/generic + ${PROJECT_SOURCE_DIR}/src/win32/stored + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include + ) + link_directories( + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS} + ) + add_definitions(-DMS_WIN${WINDOWS_BITS}) +endif() add_library(autoxflate-sd MODULE autoxflate-sd.cc) set_target_properties(autoxflate-sd PROPERTIES PREFIX "") target_link_libraries(autoxflate-sd bareos) -INSTALL(TARGETS autoxflate-sd DESTINATION ${plugindir}) - -IF(NOT HAVE_WIN32 AND NOT HAVE_DARWIN_OS) - add_library(scsicrypto-sd MODULE scsicrypto-sd.cc) - set_target_properties(scsicrypto-sd PROPERTIES PREFIX "") - INSTALL(TARGETS scsicrypto-sd DESTINATION ${plugindir}) - - add_library(scsitapealert-sd MODULE scsitapealert-sd.cc) - set_target_properties(scsitapealert-sd PROPERTIES PREFIX "") - INSTALL(TARGETS scsitapealert-sd DESTINATION ${plugindir}) - IF(HAVE_DARWIN_OS) - target_link_libraries(scsitapealert-sd bareossd) - ENDIF() -ENDIF() - -IF(HAVE_PYTHON) - add_library(python-sd MODULE python-sd.cc) - set_target_properties(python-sd PROPERTIES PREFIX "") - INSTALL(TARGETS python-sd DESTINATION ${plugindir}) - target_link_libraries(python-sd ${PYTHON_LIBRARIES} bareos) - - - set (PYFILES bareos-sd-class-plugin.py - bareos_sd_consts.py - BareosSdPluginBaseclass.py - bareos-sd.py.template - BareosSdWrapper.py) - - INSTALL(FILES ${PYFILES} DESTINATION ${plugindir}) -ENDIF() +install(TARGETS autoxflate-sd DESTINATION ${plugindir}) + +if(NOT HAVE_WIN32 AND NOT HAVE_DARWIN_OS) + add_library(scsicrypto-sd MODULE scsicrypto-sd.cc) + set_target_properties(scsicrypto-sd PROPERTIES PREFIX "") + install(TARGETS scsicrypto-sd DESTINATION ${plugindir}) + + add_library(scsitapealert-sd MODULE scsitapealert-sd.cc) + set_target_properties(scsitapealert-sd PROPERTIES PREFIX "") + install(TARGETS scsitapealert-sd DESTINATION ${plugindir}) + if(HAVE_DARWIN_OS) + target_link_libraries(scsitapealert-sd bareossd) + endif() +endif() + +if(HAVE_PYTHON) + add_library(python-sd MODULE python-sd.cc) + set_target_properties(python-sd PROPERTIES PREFIX "") + install(TARGETS python-sd DESTINATION ${plugindir}) + target_link_libraries(python-sd ${PYTHON_LIBRARIES} bareos) + + set(PYFILES + bareos-sd-class-plugin.py bareos_sd_consts.py BareosSdPluginBaseclass.py + bareos-sd.py.template BareosSdWrapper.py + ) + + install(FILES ${PYFILES} DESTINATION ${plugindir}) +endif() diff --git a/core/src/qt-tray-monitor/CMakeLists.txt b/core/src/qt-tray-monitor/CMakeLists.txt index 39afe9866a5..33bbd62d43e 100644 --- a/core/src/qt-tray-monitor/CMakeLists.txt +++ b/core/src/qt-tray-monitor/CMakeLists.txt @@ -20,9 +20,9 @@ cmake_minimum_required(VERSION 3.0) # (for AUTOUIC) -IF(HAVE_WIN32) +if(HAVE_WIN32) add_definitions(-D_STAT_DEFINED=1) -ENDIF() +endif() set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -30,62 +30,71 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) find_package(Qt5 COMPONENTS Core Widgets) -IF(Qt5Widgets_FOUND) +if(Qt5Widgets_FOUND) message(STATUS "Found QT5Widgets") -ELSE() +else() message(STATUS "QT5Widgets NOT found, checking for Qt4 ...") find_package(Qt4) - IF (NOT Qt4_FOUND) + if(NOT Qt4_FOUND) message(FATAL_ERROR "Both Qt5 and Qt4 not found, cannot build tray-monitor") - ENDIF() -ENDIF() - - -IF(HAVE_WIN32) - include_directories( - ${PROJECT_SOURCE_DIR}/src/win32/include - ${PROJECT_SOURCE_DIR}/src/win32/lib - ) -ENDIF() + endif() +endif() +if(HAVE_WIN32) + include_directories( + ${PROJECT_SOURCE_DIR}/src/win32/include ${PROJECT_SOURCE_DIR}/src/win32/lib + ) +endif() set(SOURCES - tray-monitor.cc authenticate.cc tray_conf.cc tray-monitor.cc - traymenu.cc systemtrayicon.cc mainwindow.cc monitoritem.cc - monitoritemthread.cc - ) - -IF(HAVE_WIN32) - LIST(APPEND SOURCES ../win32/qt-tray-monitor/traymon.rc) -ENDIF() - -IF(Qt4_FOUND) + tray-monitor.cc + authenticate.cc + tray_conf.cc + tray-monitor.cc + traymenu.cc + systemtrayicon.cc + mainwindow.cc + monitoritem.cc + monitoritemthread.cc +) + +if(HAVE_WIN32) + list(APPEND SOURCES ../win32/qt-tray-monitor/traymon.rc) +endif() + +if(Qt4_FOUND) set(TRAYMON_LIBRARIES bareos-tray-monitor Qt4::QtGui bareos) -ELSE() +else() set(TRAYMON_LIBRARIES bareos-tray-monitor bareos) -ENDIF() +endif() -IF(HAVE_WIN32) - add_executable(bareos-tray-monitor WIN32 ${SOURCES} main.qrc) -ELSE() - add_executable(bareos-tray-monitor ${SOURCES} main.qrc) -ENDIF() +if(HAVE_WIN32) + add_executable(bareos-tray-monitor WIN32 ${SOURCES} main.qrc) +else() + add_executable(bareos-tray-monitor ${SOURCES} main.qrc) +endif() -IF(Qt5Widgets_FOUND) +if(Qt5Widgets_FOUND) qt5_use_modules(bareos-tray-monitor Widgets) -ENDIF() +endif() target_link_libraries(${TRAYMON_LIBRARIES}) -INSTALL(TARGETS bareos-tray-monitor DESTINATION "${bindir}") +install(TARGETS bareos-tray-monitor DESTINATION "${bindir}") install(CODE "set(PLUGINS \"${PLUGINS}\")") install(CODE "set(BACKENDS \"${BACKENDS}\")") install(CODE "set(configtemplatedir \"${configtemplatedir}\")") install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") -INSTALL(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-tray-monitor-configfiles.cmake) - -INSTALL(FILES bareos-tray-monitor.desktop DESTINATION ${datarootdir}/applications/) -INSTALL(FILES bareos-tray-monitor.desktop DESTINATION ${sysconfdir}/xdg/autostart/ ) -INSTALL(FILES bareos-tray-monitor.xpm DESTINATION ${datarootdir}/pixmaps/) +install( + SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-tray-monitor-configfiles.cmake +) + +install(FILES bareos-tray-monitor.desktop + DESTINATION ${datarootdir}/applications/ +) +install(FILES bareos-tray-monitor.desktop + DESTINATION ${sysconfdir}/xdg/autostart/ +) +install(FILES bareos-tray-monitor.xpm DESTINATION ${datarootdir}/pixmaps/) diff --git a/core/src/stored/CMakeLists.txt b/core/src/stored/CMakeLists.txt index 7c28dea7dc7..69eeddb1729 100644 --- a/core/src/stored/CMakeLists.txt +++ b/core/src/stored/CMakeLists.txt @@ -17,215 +17,225 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -IF(HAVE_WIN32) - include_directories(${PROJECT_SOURCE_DIR}/src/win32/generic ${PROJECT_SOURCE_DIR}/src/win32/stored ${PROJECT_SOURCE_DIR}/src/stored/backends) -ENDIF() +if(HAVE_WIN32) + include_directories( + ${PROJECT_SOURCE_DIR}/src/win32/generic + ${PROJECT_SOURCE_DIR}/src/win32/stored + ${PROJECT_SOURCE_DIR}/src/stored/backends + ) +endif() if(NOT ${HAVE_DYNAMIC_SD_BACKENDS}) - set (AVAILABLE_DEVICE_API_SRCS - backends/generic_tape_device.cc - ) - - IF(HAVE_WIN32) - LIST(APPEND AVAILABLE_DEVICE_API_SRCS - ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_fifo_device.cc - ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_file_device.cc - ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_tape_device.cc - ) - ELSE() - LIST(APPEND AVAILABLE_DEVICE_API_SRCS - backends/unix_fifo_device.cc - # backends/droplet_device.cc - backends/unix_tape_device.cc - backends/unix_file_device.cc - ) - ENDIF() - - if(${HAVE_CEPHFS}) - LIST(APPEND AVAILABLE_DEVICE_API_SRCS - backends/cephfs_device.cc) - endif() - - if(${HAVE_GFAPI}) - LIST(APPEND AVAILABLE_DEVICE_API_SRCS - backends/gfapi_device.cc) - endif() - - if(${HAVE_ELASTO}) - LIST(APPEND AVAILABLE_DEVICE_API_SRCS - backends/elasto_device.cc) - endif() - - if(${HAVE_RADOS}) - LIST(APPEND AVAILABLE_DEVICE_API_SRCS - backends/rados_device.cc) - endif() - if(${HAVE_DROPLET}) - LIST(APPEND AVAILABLE_DEVICE_API_SRCS - backends/droplet_device.cc) - endif() - if(${HAVE_DROPLET}) - LIST(APPEND AVAILABLE_DEVICE_API_SRCS - backends/chunked_device.cc) - endif() -ENDIF() - - - -set (LIBBAREOSSD_SRCS acquire.cc ansi_label.cc askdir.cc autochanger.cc - autochanger_resource.cc block.cc bsr.cc - butil.cc crc32/crc32.cc dev.cc device.cc device_resource.cc - ebcdic.cc label.cc lock.cc - mount.cc read_record.cc record.cc reserve.cc scan.cc - sd_backends.cc sd_plugins.cc sd_stats.cc spool.cc - stored_globals.cc stored_conf.cc vol_mgr.cc wait.cc - ${AVAILABLE_DEVICE_API_SRCS} - ) + set(AVAILABLE_DEVICE_API_SRCS backends/generic_tape_device.cc) -set(SDSRCS append.cc askdir.cc authenticate.cc dir_cmd.cc fd_cmds.cc - job.cc mac.cc ndmp_tape.cc read.cc sd_cmds.cc sd_stats.cc - socket_server.cc status.cc ) + if(HAVE_WIN32) + list( + APPEND + AVAILABLE_DEVICE_API_SRCS + ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_fifo_device.cc + ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_file_device.cc + ${PROJECT_SOURCE_DIR}/src/win32/stored/backends/win32_tape_device.cc + ) + else() + list( + APPEND AVAILABLE_DEVICE_API_SRCS + backends/unix_fifo_device.cc + # backends/droplet_device.cc + backends/unix_tape_device.cc + backends/unix_file_device.cc + ) + endif() + + if(${HAVE_CEPHFS}) + list(APPEND AVAILABLE_DEVICE_API_SRCS backends/cephfs_device.cc) + endif() + + if(${HAVE_GFAPI}) + list(APPEND AVAILABLE_DEVICE_API_SRCS backends/gfapi_device.cc) + endif() + + if(${HAVE_ELASTO}) + list(APPEND AVAILABLE_DEVICE_API_SRCS backends/elasto_device.cc) + endif() + + if(${HAVE_RADOS}) + list(APPEND AVAILABLE_DEVICE_API_SRCS backends/rados_device.cc) + endif() + if(${HAVE_DROPLET}) + list(APPEND AVAILABLE_DEVICE_API_SRCS backends/droplet_device.cc) + endif() + if(${HAVE_DROPLET}) + list(APPEND AVAILABLE_DEVICE_API_SRCS backends/chunked_device.cc) + endif() +endif() -IF(HAVE_WIN32) - LIST(APPEND SDSRCS - stored.cc - ../win32/generic/main.cc - ../win32/generic/service.cc - ../win32/stored/storedres.rc - ) -ENDIF() +set(LIBBAREOSSD_SRCS + acquire.cc + ansi_label.cc + askdir.cc + autochanger.cc + autochanger_resource.cc + block.cc + bsr.cc + butil.cc + crc32/crc32.cc + dev.cc + device.cc + device_resource.cc + ebcdic.cc + label.cc + lock.cc + mount.cc + read_record.cc + record.cc + reserve.cc + scan.cc + sd_backends.cc + sd_plugins.cc + sd_stats.cc + spool.cc + stored_globals.cc + stored_conf.cc + vol_mgr.cc + wait.cc + ${AVAILABLE_DEVICE_API_SRCS} +) + +set(SDSRCS + append.cc + askdir.cc + authenticate.cc + dir_cmd.cc + fd_cmds.cc + job.cc + mac.cc + ndmp_tape.cc + read.cc + sd_cmds.cc + sd_stats.cc + socket_server.cc + status.cc +) + +if(HAVE_WIN32) + list(APPEND SDSRCS stored.cc ../win32/generic/main.cc + ../win32/generic/service.cc ../win32/stored/storedres.rc + ) +endif() set(BTAPESRCS btape.cc) -IF(HAVE_WIN32) - LIST(APPEND BTAPESRCS ../win32/stored/btaperes.rc) -ENDIF() +if(HAVE_WIN32) + list(APPEND BTAPESRCS ../win32/stored/btaperes.rc) +endif() set(BLSSRCS bls.cc) -IF(HAVE_WIN32) - LIST(APPEND BLSSRCS ../win32/stored/blsres.rc) -ENDIF() +if(HAVE_WIN32) + list(APPEND BLSSRCS ../win32/stored/blsres.rc) +endif() set(BEXTRACTSRS bextract.cc) -IF(HAVE_WIN32) - LIST(APPEND BEXTRACTSRS ../win32/stored/bextractres.rc) -ENDIF() - +if(HAVE_WIN32) + list(APPEND BEXTRACTSRS ../win32/stored/bextractres.rc) +endif() set(BSCANSRCS bscan.cc) -IF(HAVE_WIN32) - LIST(APPEND BSCANSRCS ../win32/stored/bscanres.rc) -ENDIF() +if(HAVE_WIN32) + list(APPEND BSCANSRCS ../win32/stored/bscanres.rc) +endif() set(BCOPYSRCS bcopy.cc) set(STORED_RESTYPES autochanger device director ndmp messages storage) -SET(BACKEND_OBJECTS "") # backend shared objects +set(BACKEND_OBJECTS "") # backend shared objects if(${HAVE_DYNAMIC_SD_BACKENDS}) - if(${HAVE_RADOS}) - LIST(APPEND BACKEND_OBJECTS libbareossd-rados) - endif() - if(${HAVE_CEPHFS}) - LIST(APPEND BACKEND_OBJECTS libbareossd-cephfs) - endif() - if(GFAPI_LIBRARIES) - LIST(APPEND BACKEND_OBJECTS libbareossd-gfapi) - endif() - if(${HAVE_DROPLET}) - LIST(APPEND BACKEND_OBJECTS libbareossd-droplet) - endif() - if(${HAVE_DROPLET}) - LIST(APPEND BACKEND_OBJECTS libbareossd-chunked) - endif() - SET(LIBBAREOSSD_LIBRARIES bareos ${BACKEND_OBJECTS}) - MESSAGE(STATUS "BACKEND_OBJECTS ARE ${BACKEND_OBJECTS}") -ELSE() - if(${HAVE_DROPLET}) - LIST(APPEND LIBBAREOSSD_LIBRARIES ${DROPLET_LIBRARIES}) - endif() - if(${HAVE_RADOS}) - LIST(APPEND LIBBAREOSSD_LIBRARIES ${RADOS_LIBRARIES}) - endif() - if(${HAVE_CEPHFS}) - LIST(APPEND LIBBAREOSSD_LIBRARIES ${CEPHFS_LIBRARIES}) - endif() - if(${HAVE_GFAPI}) - LIST(APPEND LIBBAREOSSD_LIBRARIES ${GFAPI_LIBRARIES}) - endif() - if(${HAVE_DROPLET}) - LIST(APPEND LIBBAREOSSD_LIBRARIES ${DROPLET_LIBRARIES}) - endif() - SET(LIBBAREOSSD_LIBRARIES bareos ${LIBBAREOSSD_LIBRARIES}) - MESSAGE(STATUS "LIBBAREOSSD_LIBRARIES ARE ${LIBBAREOSSD_LIBRARIES}") -ENDIF() + if(${HAVE_RADOS}) + list(APPEND BACKEND_OBJECTS libbareossd-rados) + endif() + if(${HAVE_CEPHFS}) + list(APPEND BACKEND_OBJECTS libbareossd-cephfs) + endif() + if(GFAPI_LIBRARIES) + list(APPEND BACKEND_OBJECTS libbareossd-gfapi) + endif() + if(${HAVE_DROPLET}) + list(APPEND BACKEND_OBJECTS libbareossd-droplet) + endif() + if(${HAVE_DROPLET}) + list(APPEND BACKEND_OBJECTS libbareossd-chunked) + endif() + set(LIBBAREOSSD_LIBRARIES bareos ${BACKEND_OBJECTS}) + message(STATUS "BACKEND_OBJECTS ARE ${BACKEND_OBJECTS}") +else() + if(${HAVE_DROPLET}) + list(APPEND LIBBAREOSSD_LIBRARIES ${DROPLET_LIBRARIES}) + endif() + if(${HAVE_RADOS}) + list(APPEND LIBBAREOSSD_LIBRARIES ${RADOS_LIBRARIES}) + endif() + if(${HAVE_CEPHFS}) + list(APPEND LIBBAREOSSD_LIBRARIES ${CEPHFS_LIBRARIES}) + endif() + if(${HAVE_GFAPI}) + list(APPEND LIBBAREOSSD_LIBRARIES ${GFAPI_LIBRARIES}) + endif() + if(${HAVE_DROPLET}) + list(APPEND LIBBAREOSSD_LIBRARIES ${DROPLET_LIBRARIES}) + endif() + set(LIBBAREOSSD_LIBRARIES bareos ${LIBBAREOSSD_LIBRARIES}) + message(STATUS "LIBBAREOSSD_LIBRARIES ARE ${LIBBAREOSSD_LIBRARIES}") +endif() if(${HAVE_DYNAMIC_SD_BACKENDS}) - LIST(APPEND LIBBAREOSSD_SRCS backends/unix_file_device.cc) -ENDIF() + list(APPEND LIBBAREOSSD_SRCS backends/unix_file_device.cc) +endif() add_library(bareossd SHARED ${LIBBAREOSSD_SRCS}) if(NOT ${HAVE_DYNAMIC_SD_BACKENDS}) - target_link_libraries(bareossd ${LIBBAREOSSD_LIBRARIES}) + target_link_libraries(bareossd ${LIBBAREOSSD_LIBRARIES}) endif() -IF(HAVE_DARWIN_OS) +if(HAVE_DARWIN_OS) target_link_libraries(bareossd bareos) -ENDIF() +endif() add_library(stored_objects STATIC ${SDSRCS}) target_link_libraries(stored_objects ${NDMP_LIBS}) add_executable(bareos-sd stored.cc) -SET(BAREOS_SD_LIBRARIES - bareos bareossd bareosfind - ${NDMP_LIBS} - ) +set(BAREOS_SD_LIBRARIES bareos bareossd bareosfind ${NDMP_LIBS}) -IF(HAVE_WIN32) - LIST(APPEND BAREOS_SD_LIBRARIES - comctl32 - ) -ENDIF() +if(HAVE_WIN32) + list(APPEND BAREOS_SD_LIBRARIES comctl32) +endif() -target_link_libraries(bareos-sd - stored_objects - ${BAREOS_SD_LIBRARIES} - ) +target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES}) add_executable(bls ${BLSSRCS}) -target_link_libraries(bls - bareos bareossd bareosfind - ) +target_link_libraries(bls bareos bareossd bareosfind) add_executable(bextract ${BEXTRACTSRS}) -target_link_libraries(bextract - bareossd bareosfind bareos - ) +target_link_libraries(bextract bareossd bareosfind bareos) add_executable(bscan ${BSCANSRCS}) -target_link_libraries(bscan - bareos bareossd bareosfind bareossql bareoscats - ) +target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats) add_executable(btape ${BTAPESRCS}) -target_link_libraries(btape - bareossd bareos - ) +target_link_libraries(btape bareossd bareos) add_executable(bcopy ${BCOPYSRCS}) +target_link_libraries(bcopy bareossd bareos) -target_link_libraries(bcopy - bareossd bareos - ) - -INSTALL(TARGETS bareossd DESTINATION ${libdir}) +install(TARGETS bareossd DESTINATION ${libdir}) -INSTALL(TARGETS bareos-sd bls bextract bscan btape bcopy DESTINATION "${sbindir}") +install(TARGETS bareos-sd bls bextract bscan btape bcopy DESTINATION + "${sbindir}" +) install(CODE "set(PLUGINS \"${PLUGINS}\")") install(CODE "set(BACKENDS \"${BACKENDS}\")") @@ -233,8 +243,8 @@ install(CODE "set(configtemplatedir \"${configtemplatedir}\")") install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake) -INSTALL(DIRECTORY DESTINATION "../${archivedir}") +install(DIRECTORY DESTINATION "../${archivedir}") -IF(${HAVE_DYNAMIC_SD_BACKENDS}) -add_subdirectory(backends) -ENDIF() +if(${HAVE_DYNAMIC_SD_BACKENDS}) + add_subdirectory(backends) +endif() diff --git a/core/src/stored/backends/CMakeLists.txt b/core/src/stored/backends/CMakeLists.txt index cd58216cbbe..8f3a02dbcc8 100644 --- a/core/src/stored/backends/CMakeLists.txt +++ b/core/src/stored/backends/CMakeLists.txt @@ -17,58 +17,52 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. - - -LIST(APPEND CMAKE_INSTALL_RPATH ${backenddir}) +list(APPEND CMAKE_INSTALL_RPATH ${backenddir}) if(${HAVE_CEPHFS}) -add_library(bareossd-cephfs MODULE cephfs_device.cc) -INSTALL(TARGETS bareossd-cephfs DESTINATION ${backenddir}) -target_link_libraries(bareossd-cephfs ${CEPHFS_LIBRARIES}) + add_library(bareossd-cephfs MODULE cephfs_device.cc) + install(TARGETS bareossd-cephfs DESTINATION ${backenddir}) + target_link_libraries(bareossd-cephfs ${CEPHFS_LIBRARIES}) endif() if(${HAVE_CEPH_RADOS}) -add_library(bareossd-rados MODULE rados_device.cc) -INSTALL(TARGETS bareossd-rados DESTINATION ${backenddir}) -target_link_libraries(bareossd-rados ${RADOS_LIBRARIES}) + add_library(bareossd-rados MODULE rados_device.cc) + install(TARGETS bareossd-rados DESTINATION ${backenddir}) + target_link_libraries(bareossd-rados ${RADOS_LIBRARIES}) endif() - if(${HAVE_GLUSTERFS}) -add_library(bareossd-gfapi MODULE gfapi_device.cc) -INSTALL(TARGETS bareossd-gfapi DESTINATION ${backenddir}) -target_link_libraries(bareossd-gfapi ${GFAPI_LIBRARIES}) + add_library(bareossd-gfapi MODULE gfapi_device.cc) + install(TARGETS bareossd-gfapi DESTINATION ${backenddir}) + target_link_libraries(bareossd-gfapi ${GFAPI_LIBRARIES}) endif() if(${HAVE_DROPLET}) -add_library(bareossd-chunked SHARED ordered_cbuf.cc chunked_device.cc) -target_link_libraries(bareossd-chunked ${DROPLET_LIBRARIES}) -INSTALL(TARGETS bareossd-chunked DESTINATION ${backenddir}) + add_library(bareossd-chunked SHARED ordered_cbuf.cc chunked_device.cc) + target_link_libraries(bareossd-chunked ${DROPLET_LIBRARIES}) + install(TARGETS bareossd-chunked DESTINATION ${backenddir}) -add_library(bareossd-droplet MODULE droplet_device.cc) -target_link_libraries(bareossd-droplet bareossd-chunked ${DROPLET_LIBRARIES}) -INSTALL(TARGETS bareossd-droplet DESTINATION ${backenddir}) + add_library(bareossd-droplet MODULE droplet_device.cc) + target_link_libraries(bareossd-droplet bareossd-chunked ${DROPLET_LIBRARIES}) + install(TARGETS bareossd-droplet DESTINATION ${backenddir}) endif() add_library(bareossd-elasto MODULE elasto_device.cc) -#INSTALL(TARGETS bareossd-elasto DESTINATION ${backenddir}) +# INSTALL(TARGETS bareossd-elasto DESTINATION ${backenddir}) add_library(bareossd-fifo MODULE unix_fifo_device.cc) -INSTALL(TARGETS bareossd-fifo DESTINATION ${backenddir}) -IF(HAVE_DARWIN_OS) +install(TARGETS bareossd-fifo DESTINATION ${backenddir}) +if(HAVE_DARWIN_OS) target_link_libraries(bareossd-fifo bareos bareossd) -ENDIF() - - +endif() add_library(bareossd-gentape SHARED generic_tape_device.cc) -INSTALL(TARGETS bareossd-gentape DESTINATION ${backenddir}) -IF(HAVE_DARWIN_OS) +install(TARGETS bareossd-gentape DESTINATION ${backenddir}) +if(HAVE_DARWIN_OS) target_link_libraries(bareossd-gentape bareos bareossd) -ENDIF() +endif() add_library(bareossd-tape MODULE unix_tape_device.cc) -INSTALL(TARGETS bareossd-tape DESTINATION ${backenddir}) +install(TARGETS bareossd-tape DESTINATION ${backenddir}) target_link_libraries(bareossd-tape bareossd-gentape) - diff --git a/core/src/tests/CMakeLists.txt b/core/src/tests/CMakeLists.txt index eb63c206d42..afaeef8c87f 100644 --- a/core/src/tests/CMakeLists.txt +++ b/core/src/tests/CMakeLists.txt @@ -19,459 +19,325 @@ # "gtest_discover_tests" was added in cmake 3.10 cmake_minimum_required(VERSION 3.10 FATAL_ERROR) -include(GoogleTest) - -IF(HAVE_WIN32) - link_libraries(kernel32 - user32 gdi32 winspool shell32 ole32 oleaut32 uuid comdlg32 advapi32) -ENDIF() - -IF(HAVE_OPENSSL) - set(SSL_UNIT_TEST_FILES init_openssl.cc) -ENDIF() - -set(LINK_LIBRARIES - stored_objects - dird_objects - console_objects - bareossd - bareos - bareoscats - bareossql - bareosfind - ${LMDB_LIBS} - ${NDMP_LIBS} - ${JANSSON_LIBRARIES} - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES}) - -IF(HAVE_PAM) - LIST(APPEND LINK_LIBRARIES ${PAM_LIBRARIES}) -ENDIF() -# where to find the source dir -add_definitions(-DPROJECT_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\") +include_directories(${OPENSSL_INCLUDE_DIR}) -####### test_lib ############################### -add_executable(test_lib - alist_test.cc - bareos_test_sockets.cc - dlist_test.cc - htable_test.cc - qualified_resource_name_type_converter_test.cc - lib_tests.cc - ${PROJECT_SOURCE_DIR}/src/filed/evaluate_job_command.cc +macro(bareos_gtest_add_tests testname) + gtest_add_tests(TARGET ${testname} TEST_PREFIX gtest: TEST_LIST found_tests) + if(HAVE_WIN32) + set_tests_properties( + ${found_tests} PROPERTIES ENVIRONMENT "WINEPATH=${WINEPATH}" ) + endif() # HAVE_WIN32 +endmacro() + +macro(bareos_add_test BAREOS_ADD_TEST_TESTNAME) + set(options "") # no options + set(multiValueArgs ADDITIONAL_SOURCES LINK_LIBRARIES COMPILE_DEFINITIONS) + cmake_parse_arguments( + BAREOS_ADD_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} + ) -target_link_libraries(test_lib - stored_objects - bareossd - bareos - ${JANSSON_LIBRARIES} - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} - ) + add_executable( + ${BAREOS_ADD_TEST_TESTNAME} ${BAREOS_ADD_TEST_TESTNAME}.cc + ${BAREOS_ADD_TEST_ADDITIONAL_SOURCES} + ) + target_link_libraries( + ${BAREOS_ADD_TEST_TESTNAME} ${BAREOS_ADD_TEST_LINK_LIBRARIES} + ) + target_compile_definitions( + ${BAREOS_ADD_TEST_TESTNAME} PRIVATE ${BAREOS_ADD_TEST_COMPILE_DEFINITIONS} + ) + bareos_gtest_add_tests(${BAREOS_ADD_TEST_TESTNAME}) +endmacro() -target_compile_definitions(test_lib PRIVATE -DTEST_SMALL_HTABLE) -gtest_discover_tests(test_lib TEST_PREFIX gtest:) +include(GoogleTest) -####### test_fd_plugins ##################################### -add_executable(test_fd_plugins - test_fd_plugins.cc - ${PROJECT_SOURCE_DIR}/src/filed/fd_plugins.cc - ${PROJECT_SOURCE_DIR}/src/filed/fileset.cc - ) +if(HAVE_WIN32) + link_libraries( + kernel32 + user32 + gdi32 + winspool + shell32 + ole32 + oleaut32 + uuid + comdlg32 + advapi32 + ) +endif() + +if(HAVE_OPENSSL) + set(SSL_UNIT_TEST_FILES init_openssl.cc) +endif() -target_link_libraries(test_fd_plugins +set(LINK_LIBRARIES + stored_objects + dird_objects + console_objects + bareossd bareos + bareoscats + bareossql bareosfind + ${LMDB_LIBS} + ${NDMP_LIBS} + ${JANSSON_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} - ) +) - gtest_discover_tests(test_fd_plugins TEST_PREFIX gtest:) +if(HAVE_PAM) + list(APPEND LINK_LIBRARIES ${PAM_LIBRARIES}) +endif() -####### test_sd_plugins ##################################### -add_executable(test_sd_plugins - test_sd_plugins.cc - ) +# set some path variables used during test compilation +if(HAVE_WIN32) + set(RELATIVE_PROJECT_SOURCE_DIR "Z:${CMAKE_CURRENT_SOURCE_DIR}") + set(TEST_ORIGINAL_FILE_DIR + Z:${CMAKE_CURRENT_SOURCE_DIR}/recent_job_results_list + ) + set(TEST_TEMP_DIR Z:${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp) + file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp) -target_link_libraries(test_sd_plugins - bareos - bareossd - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} - ) + set(CERTDIR Z:${CMAKE_CURRENT_SOURCE_DIR}/configs/test_bsock/tls) +else() + file(RELATIVE_PATH RELATIVE_PROJECT_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ) + set(TEST_ORIGINAL_FILE_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/recent_job_results_list + ) + set(TEST_TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp) + file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/recent_job_results_list_tmp) - gtest_discover_tests(test_sd_plugins TEST_PREFIX gtest:) + set(CERTDIR ${CMAKE_CURRENT_SOURCE_DIR}/configs/test_bsock/tls) +endif() -####### test_dir_plugins ##################################### -add_executable(test_dir_plugins - test_dir_plugins.cc - ${PROJECT_SOURCE_DIR}/src/dird/dir_plugins.cc - ) +add_definitions( + -DRELATIVE_PROJECT_SOURCE_DIR=\"${RELATIVE_PROJECT_SOURCE_DIR}\" +) -target_link_libraries(test_dir_plugins +if (NOT client-only) +bareos_add_test( + run_on_incoming_connect_interval + LINK_LIBRARIES + dird_objects bareos + bareosfind bareoscats bareossql + $<$:${PAM_LIBRARIES}> + ${LMDB_LIBS} + ${NDMP_LIBS} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} - ) - - gtest_discover_tests(test_dir_plugins TEST_PREFIX gtest:) - -####### test_output_formatter ############################### -add_executable(test_output_formatter - lib_tests_output_formatter.cc - ) -target_link_libraries(test_output_formatter - bareos - ${JANSSON_LIBRARIES} - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} - ) - gtest_discover_tests(test_output_formatter TEST_PREFIX gtest:) - -####### test_bsock ############################### -add_executable(test_bsock - bsock_test.cc - bareos_test_sockets.cc - bsock_constructor_test.cc - bsock_cert_verify_common_names_test.cc - create_resource.cc - ${SSL_UNIT_TEST_FILES} - ) -target_link_libraries(test_bsock ${LINK_LIBRARIES}) -target_compile_definitions(test_bsock PRIVATE -DCERTDIR=\"${CMAKE_CURRENT_SOURCE_DIR}/configs/test_bsock/tls\") -gtest_discover_tests(test_bsock TEST_PREFIX gtest:) - -####### test_connection_setup ############################### -add_executable(test_connection_setup - bsock_test_connection_setup.cc - ${SSL_UNIT_TEST_FILES} ) - -target_link_libraries(test_connection_setup ${LINK_LIBRARIES}) - -gtest_discover_tests(test_connection_setup TEST_PREFIX gtest:) - - -####### test_stored_multiplied_device ############################### -add_executable(test_stored_multiplied_device - multiplied_device_test.cc +bareos_add_test( + scheduler + LINK_LIBRARIES + dird_objects + bareos + bareosfind + bareoscats + bareossql + $<$:${PAM_LIBRARIES}> + ${LMDB_LIBS} + ${NDMP_LIBS} + ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -target_link_libraries(test_stored_multiplied_device ${LINK_LIBRARIES}) -gtest_discover_tests(test_stored_multiplied_device TEST_PREFIX gtest:) - - -####### test_ndmp_address_translate ############################### -add_executable(test_ndmp_address_translate - ndmp_address_translate_test.cc - ../dird/ndmp_slot2elemaddr.cc +endif() +if (NOT client-only) +bareos_add_test( + scheduler_job_item_queue + LINK_LIBRARIES dird_objects bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ) - -target_link_libraries(test_ndmp_address_translate ${LINK_LIBRARIES}) -gtest_discover_tests(test_ndmp_address_translate TEST_PREFIX gtest:) - -####### test_sd_reservation ##################################### -if(GMOCK_FOUND) - add_executable(test_sd_reservation sd_reservation.cc) - - target_link_libraries(test_sd_reservation ${LINK_LIBRARIES} ${GMOCK_LIBRARIES}) - gtest_discover_tests(test_sd_reservation TEST_PREFIX gtest:) endif() - -####### test_config_parser_sd ##################################### -add_executable(test_config_parser_sd test_config_parser_sd.cc) - -target_link_libraries(test_config_parser_sd - stored_objects - bareossd - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +bareos_add_test( + test_acl_entry_syntax LINK_LIBRARIES bareos ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(test_config_parser_sd TEST_PREFIX gtest:) - -####### test_config_parser_dir ##################################### -add_executable(test_config_parser_dir test_config_parser_dir.cc) - -target_link_libraries(test_config_parser_dir - dird_objects - bareos - bareosfind - bareoscats - bareossql - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +if (NOT client-only) +bareos_add_test( + test_dir_plugins + ADDITIONAL_SOURCES ${PROJECT_SOURCE_DIR}/src/dird/dir_plugins.cc + LINK_LIBRARIES bareos bareoscats bareossql ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(test_config_parser_dir TEST_PREFIX gtest:) - - -####### test_config_parser_console ##################################### -add_executable(test_config_parser_console test_config_parser_console.cc) - -target_link_libraries(test_config_parser_console - bareos - bareosfind - console_objects - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +endif() +bareos_add_test( + test_fd_plugins + ADDITIONAL_SOURCES ${PROJECT_SOURCE_DIR}/src/filed/fd_plugins.cc + ${PROJECT_SOURCE_DIR}/src/filed/fileset.cc + LINK_LIBRARIES bareos bareosfind ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(test_config_parser_console TEST_PREFIX gtest:) - - -####### test_config_parser_fd ##################################### -add_executable(test_config_parser_fd test_config_parser_fd.cc ${FDSRCS}) - -target_link_libraries(test_config_parser_fd - bareos - bareosfind - fd_objects - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +bareos_add_test( + test_is_name_valid LINK_LIBRARIES bareos ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(test_config_parser_fd TEST_PREFIX gtest:) - -####### test_setdebug ##################################### -add_executable(test_setdebug test_setdebug.cc) - -target_link_libraries(test_setdebug - dird_objects - bareos - bareosfind - bareoscats - bareossql - $<$:${PAM_LIBRARIES}> - ${LMDB_LIBS} - ${NDMP_LIBS} - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +bareos_add_test( + test_output_formatter + LINK_LIBRARIES ${GTEST_MAIN_LIBRARIES} ${GTEST_LIBRARIES} + ${JANSSON_LIBRARIES} bareos ) - -gtest_discover_tests(test_setdebug TEST_PREFIX gtest:) - -####### test_fileindex_list ##################################### -add_executable(test_fileindex_list test_fileindex_list.cc) - -target_link_libraries(test_fileindex_list - dird_objects - bareos - bareosfind - bareoscats - bareossql - $<$:${PAM_LIBRARIES}> - ${LMDB_LIBS} - ${NDMP_LIBS} - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +if(NOT client-only) +bareos_add_test( + test_sd_plugins LINK_LIBRARIES bareos bareossd ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} +) +endif() +bareos_add_test( + version_strings LINK_LIBRARIES bareos ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) -gtest_discover_tests(test_fileindex_list TEST_PREFIX gtest:) - -####### test_backtrace ##################################### -IF(HAVE_EXECINFO_H AND HAVE_BACKTRACE AND HAVE_BACKTRACE_SYMBOLS) - add_executable(test_backtrace test_backtrace.cc) - - target_link_libraries(test_backtrace - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +bareos_add_test( + job_control_record LINK_LIBRARIES bareos ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} +) +if(NOT client-only) +bareos_add_test(multiplied_device_test LINK_LIBRARIES ${LINK_LIBRARIES}) +endif() +if(NOT client-only) + bareos_add_test( + ndmp_address_translate_test + ADDITIONAL_SOURCES ../dird/ndmp_slot2elemaddr.cc + LINK_LIBRARIES ${LINK_LIBRARIES} ) - - gtest_discover_tests(test_backtrace TEST_PREFIX gtest:) -ENDIF() - -####### test_crc32 ##################################### -add_executable(test_crc32 test_crc32.cc ../stored/crc32/crc32.cc) - -target_link_libraries(test_crc32 - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +endif()#client-only +bareos_add_test( + recent_job_results_list + LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} + COMPILE_DEFINITIONS TEST_TEMP_DIR=\"${TEST_TEMP_DIR}\" + TEST_ORIGINAL_FILE_DIR=\"${TEST_ORIGINAL_FILE_DIR}\" ) -gtest_discover_tests(test_crc32 TEST_PREFIX gtest:) -####### thread_list ##################################### -add_executable(thread_list thread_list.cc) - -target_link_libraries(thread_list - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +if(NOT client-only) +bareos_add_test( + show_cmd_available_resources_equals_config_resources + LINK_LIBRARIES dird_objects bareos bareosfind bareoscats bareossql + ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(thread_list TEST_PREFIX gtest:) - -####### ua_available_resources_equals_config_resources ########### -add_executable(show_cmd_available_resources_equals_config_resources show_cmd_available_resources_equals_config_resources.cc) - -target_link_libraries(show_cmd_available_resources_equals_config_resources - dird_objects - bareos - bareosfind - bareoscats - bareossql - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +endif() +bareos_add_test( + test_config_parser_console + LINK_LIBRARIES console_objects bareos bareosfind ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) -gtest_discover_tests(show_cmd_available_resources_equals_config_resources TEST_PREFIX gtest:) - -####### test_job_control_record ##################################### -add_executable(test_job_control_record job_control_record.cc) - -target_link_libraries(test_job_control_record - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +if(NOT client-only) +bareos_add_test( + test_config_parser_dir + LINK_LIBRARIES dird_objects bareos bareosfind bareoscats bareossql + ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ) -gtest_discover_tests(test_job_control_record TEST_PREFIX gtest:) - -####### test_recent_job_results_list ##################################### - -add_executable(test_recent_job_results_list recent_job_results_list.cc) - -file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/src/tests/test_recent_job_results_list_tmp) -target_compile_definitions(test_recent_job_results_list - PRIVATE TEST_TEMP_DIR=\"${PROJECT_BINARY_DIR}/src/tests/test_recent_job_results_list_tmp\") -target_compile_definitions(test_recent_job_results_list - PRIVATE TEST_ORIGINAL_FILE_DIR=\"${PROJECT_SOURCE_DIR}/src/tests/recent_job_results_list\") - -target_link_libraries(test_recent_job_results_list - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +endif() +bareos_add_test( + test_config_parser_fd + LINK_LIBRARIES fd_objects bareos bareosfind ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(test_recent_job_results_list TEST_PREFIX gtest:) - -####### test_job_control_record ##################################### -add_executable(test_thread_specific_data thread_specific_data.cc) - -target_link_libraries(test_thread_specific_data - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +if(NOT client-only) +bareos_add_test( + test_config_parser_sd + LINK_LIBRARIES stored_objects bareossd bareos ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(test_thread_specific_data TEST_PREFIX gtest:) - -####### test_timer_thread ##################################### -add_executable(test_timer_thread timer_thread.cc) - -target_link_libraries(test_timer_thread - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +endif() +bareos_add_test( + test_crc32 + ADDITIONAL_SOURCES ../stored/crc32/crc32.cc + LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(test_timer_thread TEST_PREFIX gtest:) - -####### test_watchdog_timer ########################################## -add_executable(test_watchdog_timer watchdog_timer.cc) - -target_link_libraries(test_watchdog_timer - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +if(NOT client-only) +bareos_add_test( + test_fileindex_list + LINK_LIBRARIES + dird_objects + bareos + bareosfind + bareoscats + bareossql + $<$:${PAM_LIBRARIES}> + ${LMDB_LIBS} + ${NDMP_LIBS} + ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(test_watchdog_timer TEST_PREFIX gtest:) - -####### run_on_incoming_connect_interval ##################################### -add_executable(run_on_incoming_connect_interval run_on_incoming_connect_interval.cc) - -target_link_libraries(run_on_incoming_connect_interval - dird_objects - bareos - bareosfind - bareoscats - bareossql - ${LMDB_LIBS} - ${NDMP_LIBS} - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +endif() +if(NOT client-only) +bareos_add_test( + test_setdebug + LINK_LIBRARIES + dird_objects + bareos + bareosfind + bareoscats + bareossql + $<$:${PAM_LIBRARIES}> + ${LMDB_LIBS} + ${NDMP_LIBS} + ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -IF(HAVE_PAM) - target_link_libraries(run_on_incoming_connect_interval ${PAM_LIBRARIES}) -ENDIF() - -gtest_discover_tests(run_on_incoming_connect_interval TEST_PREFIX gtest:) - -####### scheduler_job_item_queue ##################################### -add_executable(scheduler_job_item_queue scheduler_job_item_queue.cc) - -target_link_libraries(scheduler_job_item_queue - dird_objects - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +endif() +bareos_add_test( + thread_list LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ) - -IF(HAVE_PAM) - target_link_libraries(scheduler_job_item_queue ${PAM_LIBRARIES}) -ENDIF() - -gtest_discover_tests(scheduler_job_item_queue TEST_PREFIX gtest:) - -####### scheduler ##################################### -add_executable(scheduler scheduler.cc) - -target_link_libraries(scheduler - dird_objects - bareos - bareosfind - bareoscats - bareossql - ${LMDB_LIBS} - ${NDMP_LIBS} - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +bareos_add_test( + thread_specific_data LINK_LIBRARIES bareos ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} ) - -IF(HAVE_PAM) - target_link_libraries(scheduler ${PAM_LIBRARIES}) -ENDIF() - -gtest_discover_tests(scheduler TEST_PREFIX gtest:) - -####### test_is_name_valid ##################################### -add_executable(test_is_name_valid test_is_name_valid.cc) - -target_link_libraries(test_is_name_valid - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +bareos_add_test( + timer_thread LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ) -gtest_discover_tests(test_is_name_valid TEST_PREFIX gtest:) - -####### test_acl_entry_syntax ##################################### -add_executable(test_acl_entry_syntax test_acl_entry_syntax.cc) - -target_link_libraries(test_acl_entry_syntax - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +if(HAVE_EXECINFO_H + AND HAVE_BACKTRACE + AND HAVE_BACKTRACE_SYMBOLS ) + bareos_add_test( + test_backtrace LINK_LIBRARIES bareos ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} + ) +endif() -gtest_discover_tests(test_acl_entry_syntax TEST_PREFIX gtest:) - -####### version_strings ##################################### -add_executable(version_strings version_strings.cc) +if(GMOCK_FOUND AND NOT client-only) + bareos_add_test( + sd_reservation LINK_LIBRARIES ${LINK_LIBRARIES} ${GMOCK_LIBRARIES} + ) +endif() -target_link_libraries(version_strings - bareos - ${GTEST_LIBRARIES} - ${GTEST_MAIN_LIBRARIES} +if(NOT client-only) +bareos_add_test( + lib_tests + ADDITIONAL_SOURCES + alist_test.cc bareos_test_sockets.cc dlist_test.cc htable_test.cc + qualified_resource_name_type_converter_test.cc + ${PROJECT_SOURCE_DIR}/src/filed/evaluate_job_command.cc + LINK_LIBRARIES stored_objects bareossd bareos ${JANSSON_LIBRARIES} + ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ) - -gtest_discover_tests(version_strings TEST_PREFIX gtest:) +bareos_add_test( + bsock_test_connection_setup + ADDITIONAL_SOURCES ${SSL_UNIT_TEST_FILES} + LINK_LIBRARIES ${LINK_LIBRARIES} +) +endif() +if(NOT HAVE_WIN32 AND NOT client-only) + bareos_add_test( + test_bsock + ADDITIONAL_SOURCES + bareos_test_sockets.cc bsock_constructor_test.cc + bsock_cert_verify_common_names_test.cc create_resource.cc + ${SSL_UNIT_TEST_FILES} + LINK_LIBRARIES ${LINK_LIBRARIES} + COMPILE_DEFINITIONS -DCERTDIR=\"${CERTDIR}\" + ) + bareos_add_test( + watchdog_timer LINK_LIBRARIES bareos ${GTEST_LIBRARIES} + ${GTEST_MAIN_LIBRARIES} + ) +endif() diff --git a/core/src/tests/add_new_unit_test.sh b/core/src/tests/add_new_unit_test.sh deleted file mode 100755 index 53991ce5498..00000000000 --- a/core/src/tests/add_new_unit_test.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -# create and add an empty unittest file - -if [ $# -ne 1 ]; then - echo "usage: $0 " - exit 1 -fi -testname="$1" - -if [ -f "$testname.cc" ]; then - echo "Filename for test already exists: $testname.cc" - exit 1 -fi - -if grep -qw "$testname.cc" CMakeLists.txt; then - echo "$testname.cc already exists in CMakeLists.txt" - exit 1 -fi - -if ! sed -e "s/@year@/$(date +%Y)/g" test_template.cc.in > "$testname.cc"; then - echo "File creation failed: $testname.cc" - exit 1 -fi - -if ! sed -e "s/@testname@/$testname/g" test_cmakelists_template.txt.in >> CMakeLists.txt; then - echo "Adding to CMakeLists.txt failed" - exit 1 -fi - -echo "Don't forget to add your new file to the git index with" -echo " git add $testname.cc" - -exit 0 - diff --git a/core/src/tests/alist_test.cc b/core/src/tests/alist_test.cc index 8c385f84068..bbbe0651f54 100644 --- a/core/src/tests/alist_test.cc +++ b/core/src/tests/alist_test.cc @@ -2,7 +2,7 @@ BAREOS® - Backup Archiving REcovery Open Sourced Copyright (C) 2003-2011 Free Software Foundation Europe e.V. - Copyright (C) 2015-2017 Bareos GmbH & Co. KG + Copyright (C) 2015-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -27,10 +27,15 @@ * Philipp Storz, November 2017 */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/alist.h" -//#include "windows.h" struct FileSet { FileSet() = default; diff --git a/core/src/tests/bareos_test_sockets.cc b/core/src/tests/bareos_test_sockets.cc index 9b78dd6139c..39be20ce2e1 100644 --- a/core/src/tests/bareos_test_sockets.cc +++ b/core/src/tests/bareos_test_sockets.cc @@ -1,7 +1,7 @@ /* BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -18,12 +18,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else +#include "gtest/gtest.h" +#include "include/bareos.h" +#endif #include "bareos_test_sockets.h" #include "tests/bsock_test.h" -#include "gtest/gtest.h" -#include "include/bareos.h" #include "lib/bsock_tcp.h" static int create_listening_server_socket(int port) @@ -36,7 +41,7 @@ static int create_listening_server_socket(int port) return -1; } - if (setsockopt(listen_file_descriptor, SOL_SOCKET, SO_REUSEADDR, &opt, + if (setsockopt(listen_file_descriptor, SOL_SOCKET, SO_REUSEADDR, (sockopt_val_t)&opt, sizeof(opt))) { perror("setsockopt"); return -1; @@ -56,7 +61,7 @@ static int create_listening_server_socket(int port) timeout.tv_sec = 10; // after 10 seconds connect() will timeout timeout.tv_usec = 0; - if (setsockopt(listen_file_descriptor, SOL_SOCKET, SO_RCVTIMEO, &timeout, + if (setsockopt(listen_file_descriptor, SOL_SOCKET, SO_RCVTIMEO, (sockopt_val_t)&timeout, sizeof(timeout)) < 0) { perror("setsockopt"); return -1; diff --git a/core/src/tests/bsock_cert_verify_common_names_test.cc b/core/src/tests/bsock_cert_verify_common_names_test.cc index 33ac55467bb..bed4a5bbe09 100644 --- a/core/src/tests/bsock_cert_verify_common_names_test.cc +++ b/core/src/tests/bsock_cert_verify_common_names_test.cc @@ -1,7 +1,7 @@ /* BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -19,8 +19,14 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/alist.h" #include "lib/tls_conf_cert.h" diff --git a/core/src/tests/bsock_constructor_test.cc b/core/src/tests/bsock_constructor_test.cc index 4282fba9212..ed675733533 100644 --- a/core/src/tests/bsock_constructor_test.cc +++ b/core/src/tests/bsock_constructor_test.cc @@ -1,7 +1,7 @@ /* BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -18,7 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" +#include "include/bareos.h" +#endif + #include #include diff --git a/core/src/tests/bsock_test_connection_setup.cc b/core/src/tests/bsock_test_connection_setup.cc index f5113fbd875..f638754c70a 100644 --- a/core/src/tests/bsock_test_connection_setup.cc +++ b/core/src/tests/bsock_test_connection_setup.cc @@ -18,8 +18,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" +#endif #include "console/console_conf.h" #include "console/console_globals.h" @@ -47,9 +51,7 @@ bool DoReloadConfig() { return false; } static void InitSignalHandler() { struct sigaction sig { - { - 0 - } + (0) }; sig.sa_handler = signal_handler; sigaction(SIGUSR2, &sig, nullptr); @@ -58,6 +60,10 @@ static void InitSignalHandler() static void InitGlobals() { + OSDependentInit(); +#if HAVE_WIN32 + WSA_Init(); +#endif directordaemon::my_config = nullptr; directordaemon::me = nullptr; console::my_config = nullptr; @@ -184,17 +190,15 @@ TEST(bsock, console_director_connection_test_tls_psk) { InitOpenSsl(); do_connection_test( - std::string( - PROJECT_SOURCE_DIR - "/src/tests/configs/console-director/tls_psk_default_enabled/"), + std::string(RELATIVE_PROJECT_SOURCE_DIR + "/configs/console-director/tls_psk_default_enabled/"), TlsPolicy::kBnetTlsEnabled); } TEST(bsock, console_director_connection_test_cleartext) { InitOpenSsl(); - do_connection_test( - std::string(PROJECT_SOURCE_DIR - "/src/tests/configs/console-director/tls_disabled/"), - TlsPolicy::kBnetTlsNone); + do_connection_test(std::string(RELATIVE_PROJECT_SOURCE_DIR + "/configs/console-director/tls_disabled/"), + TlsPolicy::kBnetTlsNone); } diff --git a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf.in b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf similarity index 84% rename from core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf.in rename to core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf index 64adf730fea..97a2b3d7174 100644 --- a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf.in +++ b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto1.conf @@ -2,7 +2,7 @@ Device { Name = auto1dev0 Media Type = File Device Type = tape - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . LabelMedia = yes Random Access = yes Autochanger = yes @@ -15,7 +15,7 @@ Device { Device { Name = auto1dev1 Media Type = File - Archive Device = @PROJECT_BINARY_DIR@/non-existent + Archive Device = ./non-existent LabelMedia = yes Random Access = yes Autochanger = yes @@ -28,7 +28,7 @@ Device { Name = auto1dev2 Media Type = File Device Type = tape - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . LabelMedia = yes Random Access = yes Autochanger = yes @@ -41,7 +41,7 @@ Device { Name = auto1dev3 Media Type = File Device Type = tape - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . LabelMedia = yes Random Access = yes Autochanger = yes @@ -54,7 +54,7 @@ Device { Name = auto1dev4 Media Type = File Device Type = tape - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . LabelMedia = yes Random Access = yes Autochanger = yes diff --git a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto2.conf.in b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto2.conf similarity index 83% rename from core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto2.conf.in rename to core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto2.conf index 3d0bcd55397..d5a74880514 100644 --- a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto2.conf.in +++ b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/auto2.conf @@ -1,7 +1,7 @@ Device { Name = auto2dev0 Media Type = NotFile - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . LabelMedia = yes Random Access = yes Autochanger = yes @@ -14,7 +14,7 @@ Device { Device { Name = auto2dev1 Media Type = NotFile - Archive Device = @PROJECT_BINARY_DIR@/non-existent + Archive Device = ./non-existent LabelMedia = yes Random Access = yes Autochanger = yes @@ -26,7 +26,7 @@ Device { Device { Name = auto2dev2 Media Type = NotFile - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . LabelMedia = yes Random Access = yes Autochanger = yes @@ -38,7 +38,7 @@ Device { Device { Name = auto2dev3 Media Type = NotFile - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . LabelMedia = yes Random Access = yes Autochanger = yes @@ -50,7 +50,7 @@ Device { Device { Name = auto2dev4 Media Type = NotFile - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . LabelMedia = yes Random Access = yes Autochanger = yes diff --git a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single1.conf b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single1.conf new file mode 100644 index 00000000000..e15e1686f27 --- /dev/null +++ b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single1.conf @@ -0,0 +1,5 @@ +Device { + Name = single1 + Media Type = File + Archive Device = ./non-existent +} diff --git a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single1.conf.in b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single1.conf.in deleted file mode 100644 index 11e5ffc6718..00000000000 --- a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single1.conf.in +++ /dev/null @@ -1,5 +0,0 @@ -Device { - Name = single1 - Media Type = File - Archive Device = @PROJECT_BINARY_DIR@/non-existent -} diff --git a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single2.conf.in b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single2.conf similarity index 56% rename from core/src/tests/configs/sd_reservation/bareos-sd.d/device/single2.conf.in rename to core/src/tests/configs/sd_reservation/bareos-sd.d/device/single2.conf index 0cb80d4cb94..eab446cc2b7 100644 --- a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single2.conf.in +++ b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single2.conf @@ -1,5 +1,5 @@ Device { Name = single2 Media Type = NotFile - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . } diff --git a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single3.conf.in b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single3.conf similarity index 54% rename from core/src/tests/configs/sd_reservation/bareos-sd.d/device/single3.conf.in rename to core/src/tests/configs/sd_reservation/bareos-sd.d/device/single3.conf index 3033e4fb18b..c48006f8a72 100644 --- a/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single3.conf.in +++ b/core/src/tests/configs/sd_reservation/bareos-sd.d/device/single3.conf @@ -1,5 +1,5 @@ Device { Name = single3 Media Type = File - Archive Device = @PROJECT_BINARY_DIR@ + Archive Device = . } diff --git a/core/src/tests/configs/sd_reservation/bareos-sd.d/storage/myself.conf.in b/core/src/tests/configs/sd_reservation/bareos-sd.d/storage/myself.conf.in index 1a44f0eb071..394794a4434 100644 --- a/core/src/tests/configs/sd_reservation/bareos-sd.d/storage/myself.conf.in +++ b/core/src/tests/configs/sd_reservation/bareos-sd.d/storage/myself.conf.in @@ -1,4 +1,4 @@ Storage { Name = test-sd - Backend Directory = @PROJECT_BINARY_DIR@/src/stored/backends + @UNCOMMENT_SD_BACKEND_DIRECTORY@Backend Directory = @PROJECT_BINARY_DIR@/src/stored/backends } diff --git a/core/src/tests/configs/test_bsock/tls/CA/bareosca.crt b/core/src/tests/configs/test_bsock/tls/CA/bareosca.crt new file mode 100644 index 00000000000..23c4d398121 --- /dev/null +++ b/core/src/tests/configs/test_bsock/tls/CA/bareosca.crt @@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE----- +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 +OOq2UNo5te7sLYY= +-----END CERTIFICATE----- diff --git a/core/src/tests/configs/test_bsock/tls/CA/bareosca.key b/core/src/tests/configs/test_bsock/tls/CA/bareosca.key new file mode 100644 index 00000000000..18efbcbee4c --- /dev/null +++ b/core/src/tests/configs/test_bsock/tls/CA/bareosca.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/core/src/tests/configs/test_bsock/tls/CA/bareosca.srl b/core/src/tests/configs/test_bsock/tls/CA/bareosca.srl new file mode 100644 index 00000000000..6403030bcd1 --- /dev/null +++ b/core/src/tests/configs/test_bsock/tls/CA/bareosca.srl @@ -0,0 +1 @@ +6DCBD2BE607E9378F2F0E05B6962DE1093B746C2 diff --git a/core/src/tests/configs/test_bsock/tls/CA/ca.seq b/core/src/tests/configs/test_bsock/tls/CA/ca.seq new file mode 100644 index 00000000000..5479a1c4f60 --- /dev/null +++ b/core/src/tests/configs/test_bsock/tls/CA/ca.seq @@ -0,0 +1 @@ +530463EB73FE7208BF392F0074DB385DCA5EA4D5 diff --git a/core/src/tests/configs/test_bsock/tls/CA/create-cert.sh b/core/src/tests/configs/test_bsock/tls/CA/create-cert.sh new file mode 100755 index 00000000000..ec12a022bc3 --- /dev/null +++ b/core/src/tests/configs/test_bsock/tls/CA/create-cert.sh @@ -0,0 +1,11 @@ +#!/bin/bash +HOSTNAME="$1" + +# create key +openssl genrsa -out "$HOSTNAME-key.pem" 4096 + +# crate csr +openssl req -new -sha256 -key "$HOSTNAME-key.pem" -subj "/C=DE/ST=NRW/O=Bareos GmbH & Co. KG/CN=$HOSTNAME" -out "$HOSTNAME.csr" + +# sign +openssl x509 -req -in "$HOSTNAME.csr" -CA bareosca.crt -CAkey bareosca.key -CAcreateserial -out "$HOSTNAME-cert.pem" -days 3650 -sha256 diff --git a/core/src/tests/configs/test_bsock/tls/bareos-ca.pem b/core/src/tests/configs/test_bsock/tls/bareos-ca.pem index af7ca8cdabe..23c4d398121 100644 --- a/core/src/tests/configs/test_bsock/tls/bareos-ca.pem +++ b/core/src/tests/configs/test_bsock/tls/bareos-ca.pem @@ -1,31 +1,35 @@ -----BEGIN CERTIFICATE----- -MIIFUTCCAzmgAwIBAgIBATANBgkqhkiG9w0BAQUFADAyMRwwGgYDVQQKDBNCYXJl -b3MgR21iSCAmIENvIEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwHhcNMTYwNDA2MTYy -NjAwWhcNMjYwNDA2MTYyNjAwWjAyMRwwGgYDVQQKDBNCYXJlb3MgR21iSCAmIENv -IEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDu4Gmxg0AC8UfW2EHflJnzpIdqW7K574XjBDjR3PeuplGiMl41zlLn -Lh0/7XzJilrs29hslE15t9Vt6hzijjQEYWjryhP0lkbCqQxcLVJD3df3wxRE2Dn9 -5IKHJqAEgosTBuCTpPpSnEt1BjYufroKJl+KbJejg4vK9XIqUYCVCmyoQyTHVBo0 -XgsFYGIMMlXs+P0rVddgBSGioutYG8+uy0yY5knoK38NuG3uSImeHjnhbp6MkaKh -ytPUMtkjLjdrKTQMetxZTlBNDB9alknpZGDMfMG9SgQr3Kr+huENz87+FO8uB+wE -VABrFWkwnvOZ7VcWEZmMnkxzGdZlZmMbvSEhKXULFVfRnMq6vVvtveilXnIhoCdN -0eqrfXJdST5ZwzMr+Kf+PBKDnjc7u+A0Iff9C+wnIRq+4wJJh8wWy3qh/zYxfSQ4 -eaQKmWRA/57RuWdTwENIGlO+68WIHXFK2JoLBSNesaBwxE756qSInbcqZTHBL7sl -XGd0n8v2rfJFtblZeO7WftT+33oW8+4il9waXvi/ZifZbH/3LkywK0X3kTX8YS68 -wmFdXiCvXCnLoMZwA3LEJLxLl2phDM1IsF55UTmGS0qrJY/ZhzfMQLKTzKItERHK -Dwnbzzjtv+yDTnAPe7N2JziIydnl8ryYERRQOsYxaIlBdX3VVzKtRwIDAQABo3Iw -cDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHtrHfhwAGi1cEXd3wMXpb9QN5 -YDALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMB4GCWCGSAGG+EIBDQQR -Fg94Y2EgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggIBAKg2SX6ABaMCShGZ -4TgQi53X/Xs0qUAOl9PQERyAzi7ji2zjvPfft3wdLm7GhGqlGnmFlYnZskw93vzH -klp9JLuIOK6w9XymE0kGXxD4p08YD+JlvOfCCjAEy0Vamu8TRIL07xh3eims7NLc -GxSVeLNAP44KyCkrBMXzPIGAe5JgnvYVvdL/bXt0pT23+VZhymH0OLBuN351YvNI -eU7EMe6mmzq8fYH4PWdGdja9qul6HuJHCu3Pz2dGUAUGjpWfQZiBH0ENxB4vkWQZ -JPdusxRY60TM/WpaHkHG8KGloyl5NrbM8NQAnPGatXAF9U9zMpIaFUbnHE1zNNy8 -07hi3zXBexo2FmK6DjdEUjFBBXiRHValr8zPkzoN9cagBiJChxSO/lxEQqTOlDTN -ucp6FyY/P3AOJzO8br4ywVR5Su0HsxmBeq2iRLYDLxbPLSPaVDhOmQqKqO/1GC2L -sLwvhWcZK+0GDLx5JRvpN6l1XpefS7j2UFitmWBa4aH8+kwk1psrx+IaIMzuUPhY -zHVi0TzJVHKz34CCTq6IJ7AUkSqLDLTd/78NRlCYChK1gYe5tb+X6oUObP/fStVg -4IJMNd8gSgBgreD/EKOPmFOZKg4EOEI74AriesEZYyAVo6cq6N0BAUW99KVr+wlK -kWKac0RVbyC5wLiMY4xcSPt0moek +MIIGBzCCA++gAwIBAgIUFGKQP+AYpJjy0Q8vYSSw4DbZcz0wDQYJKoZIhvcNAQEL +BQAwgZIxCzAJBgNVBAYTAkRFMQwwCgYDVQQIDANOUlcxEDAOBgNVBAcMB0NvbG9n +bmUxHTAbBgNVBAoMFEJhcmVvcyBHbWJIICYgQ28uIEtHMQswCQYDVQQLDAJJVDEX +MBUGA1UEAwwOd3d3LmJhcmVvcy5vcmcxHjAcBgkqhkiG9w0BCQEWD2luZm9AYmFy +ZW9zLm9yZzAeFw0xOTEyMDUwNzM1MDVaFw0yMjA5MjQwNzM1MDVaMIGSMQswCQYD +VQQGEwJERTEMMAoGA1UECAwDTlJXMRAwDgYDVQQHDAdDb2xvZ25lMR0wGwYDVQQK +DBRCYXJlb3MgR21iSCAmIENvLiBLRzELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnd3 +dy5iYXJlb3Mub3JnMR4wHAYJKoZIhvcNAQkBFg9pbmZvQGJhcmVvcy5vcmcwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD1T22R5vLyWeqlws8dwqSIgDrS +1ICUep2VM7jRrpnaEmCBeU2jqyDBt28jp+4F4mWvMs7AR7gnq64N0xRfcx7eAKrz +jHngDaH2UUwfaQuXBSOzs150bElzucrJXtwRMz8SEzpDmudzji84oFdbwSrs6y0c +xXwri/lAao3DbZedcpkGfmO/lIw9utvWfGHJa8NggggKTIcscF04Tf6o+7dxCdfx +24e/3tiiaiDuCPeIZbuVZ1JV1jY5bUKGwXE7sms2nexCS5TQw6ovQINHU6YeTiaC +QC+zkE5pMe59bc2JHuUBdRGDWgfCehJYY4wt1bK5x/Ecb7ZnBROtUK8qtNUozr1t +gNk7dthg6Qd/gV2D3rV7vSk9EsLLpFn125T1PcSjJDCcp9PmnxCcgQSe5/VDh1hy +Zh5eFOT7dSE90zyXcFQ1KLpW9GCFVqCYw3y/3p/rCLoSOlkqXOP/JD+IkAO1DqN+ +RTMv15HBm3Xvgprq+H+oMV11a8EdKMyhS5/FZFEKAf7k4qRqv0C1cUU9fNciygX/ +FyF7UnEnGaeorSaH/Eaja8XelyKunL/hOu75LMbggaFaEfHfX3VNHthO66a1L8yO +vVIuEyhXhm9nkNxM2s7E3sgr6pUfMI6BpzxsY1x711C8GghkY1B/wRiZDwolTnbz +vJi9h/TWraaFCZYhEQIDAQABo1MwUTAdBgNVHQ4EFgQUsTnnuD0QvBGlpPg0tn5H +sWGmOecwHwYDVR0jBBgwFoAUsTnnuD0QvBGlpPg0tn5HsWGmOecwDwYDVR0TAQH/ +BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAiulzuQr/G+eavKdrEeT41o6k8J5a +76suStuMhjmezFKFdqg0sH6ymJuY+LLk7+Nt0/f+0vU2j2XAVpNPZkCt/9qSSntv +0Z+AbSh12Ch9AGpOKhnOluI9JnvJIjiGKf1BAQwv+Zh8tDy7k+y+g0BaKWMydozL +ZwLmY5e7JRKkXlg3fndTNYbBjqMY07fHPhWKAbNyVlFdfjFpS+umljo8THkUOiIH +za1T7/iRMLk0D5SuwmO2wfpq3HM8VzitY6mN6Sew9REJl8HeZSeBQxjd3D9bRugr +UkdD+MCx5GfmzuC8mCVymHGrHudIvDjG/s916StIX64UpisMmpJNKVdbQU8lwGIy +/0LNvtJZnPHmqxtXM4RkRRP+aH2xvF3z6xV6w/NajpovcxS+Gn2w+YNptUVs5vN0 +iq2ep2QOs+Tkrwji5R2eK5gHHMcdxF6rNPNeEH4rd7WpQe3VAdTCCmjSD2a+BN4U +6eVpf8nG9vA4p8udxstqlBcb7nJUaqthuzr34OPHIA+aBzGk6xaEt8/MzUpwirtk +ezEEvysKVN6BI6lLLlPCfanyELGfW1K65rsQlBaDQoYOajmO+CeVfh4pVJYC/VrF +xr+NQ0OXl+CSq99WE2hVwGQZWahNnWgtPh2K6gYtj8K+m46YAQCXF4Tygx/yVaOg +OOq2UNo5te7sLYY= -----END CERTIFICATE----- diff --git a/core/src/tests/configs/test_bsock/tls/bareos-dir.bareos.org-cert.pem b/core/src/tests/configs/test_bsock/tls/bareos-dir.bareos.org-cert.pem index 2d83de46cd6..fdc6bbfb9c2 100644 --- a/core/src/tests/configs/test_bsock/tls/bareos-dir.bareos.org-cert.pem +++ b/core/src/tests/configs/test_bsock/tls/bareos-dir.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -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 +DaKtV8dOdw== -----END CERTIFICATE----- diff --git a/core/src/tests/configs/test_bsock/tls/bareos-dir.bareos.org-key.pem b/core/src/tests/configs/test_bsock/tls/bareos-dir.bareos.org-key.pem index 330e72c198c..707be107519 100644 --- a/core/src/tests/configs/test_bsock/tls/bareos-dir.bareos.org-key.pem +++ b/core/src/tests/configs/test_bsock/tls/bareos-dir.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/core/src/tests/configs/test_bsock/tls/bareos-sd1.bareos.org-cert.pem b/core/src/tests/configs/test_bsock/tls/bareos-sd1.bareos.org-cert.pem index 2e387677036..64ae6d75113 100644 --- a/core/src/tests/configs/test_bsock/tls/bareos-sd1.bareos.org-cert.pem +++ b/core/src/tests/configs/test_bsock/tls/bareos-sd1.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -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 +R0mVJklGJQ== -----END CERTIFICATE----- diff --git a/core/src/tests/configs/test_bsock/tls/bareos-sd1.bareos.org-key.pem b/core/src/tests/configs/test_bsock/tls/bareos-sd1.bareos.org-key.pem index 15dc99c789e..26251286e42 100644 --- a/core/src/tests/configs/test_bsock/tls/bareos-sd1.bareos.org-key.pem +++ b/core/src/tests/configs/test_bsock/tls/bareos-sd1.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/core/src/tests/configs/test_bsock/tls/bareos-sd2.bareos.org-cert.pem b/core/src/tests/configs/test_bsock/tls/bareos-sd2.bareos.org-cert.pem index 1783935c893..b2c9b049341 100644 --- a/core/src/tests/configs/test_bsock/tls/bareos-sd2.bareos.org-cert.pem +++ b/core/src/tests/configs/test_bsock/tls/bareos-sd2.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -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 +qz9mhzGgGg== -----END CERTIFICATE----- diff --git a/core/src/tests/configs/test_bsock/tls/bareos-sd2.bareos.org-key.pem b/core/src/tests/configs/test_bsock/tls/bareos-sd2.bareos.org-key.pem index a86012b3f6b..48ba84065e1 100644 --- a/core/src/tests/configs/test_bsock/tls/bareos-sd2.bareos.org-key.pem +++ b/core/src/tests/configs/test_bsock/tls/bareos-sd2.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/core/src/tests/configs/test_bsock/tls/client1.bareos.org-cert.pem b/core/src/tests/configs/test_bsock/tls/client1.bareos.org-cert.pem index 727033ad122..cdc472054ef 100644 --- a/core/src/tests/configs/test_bsock/tls/client1.bareos.org-cert.pem +++ b/core/src/tests/configs/test_bsock/tls/client1.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIEyDCCArCgAwIBAgIBEDANBgkqhkiG9w0BAQUFADAyMRwwGgYDVQQKDBNCYXJl -b3MgR21iSCAmIENvIEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwHhcNMTcwNDE1MTcw -ODAwWhcNMTgwNDE1MTcwODAwWjAdMRswGQYDVQQDExJjbGllbnQxLmJhcmVvcy5v -cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD5X04UtpRkgzy0otmf -YK8rhpcQ/iwAdBQFi4H4eluBkSZlqOSIFQbuFozT/AkENYznYo+Rf+PrdRNsQOPj -mltGTGezH3Bx2fpfO5b4Lz5Dbf8HprdZ8cqGBe5/7qTGRc3rLzeWsmaiAaR6wMyp -xhzbxN6GzC0UyQNvatbcuCSKbIGndXjJ0lFE3jwTpnYdSawEUu0pmYTtspicJDxW -A0xa93S/QfV7P9TeQAfikS+AyHJ5sLFCCCyGzrQWARSVYtMkHSZxHUgQg8FtSu3Y -iN3lfP+fuT7EpVQZnBkxwmZ8muZ7Cy3MFN1wikUz+2uWJj7jXX3LMTXao/GjFI2P -HPRdUpitPsty+4acZA2tuC0NmuN0kNm9GYdzvb5wJrIAfGlm33mgX4Xtj14ExBzE -gdxmieLpt97IWUM+Rlv6YdJ1WxxfBqEJWhG5Mv6QrUnJzr7zuNafYgJOemC7jCqK -l4SfJs2keJ1uZPbR9QD4t7MR2PIU3L1tN01ZtnOZDyR+hJW7O0CVNCtGVvsgDtai -0E59FkkXvwH4N+3PvFVlmBFyitCKzfQEqJL3rJWTuxh68fgvV4yX0noCgja3YcSw -d6qCmo0pHRXsI4mxmd+o+7HpQWzV9iLcjs9smUe37eRs3uPf8Az78IR0Qmaq1ja2 -4CE1o/6VBvhutQF6Uf6B6JE6cwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCctawQ -QKxYj+nPC2kZU8Sn8ZsQ8Jf3MAJjJXRDGKgZEPzjCLhnVe021TXtKXhKJy/xVs91 -VjnEhH+rJSLlpcEvHVgBXLQiYBq/qjIev1ynKVRpJ7UTnX8wT16T64gI80LzYLE2 -5XpZab8hHRG+YW9eG7QwrvzdUnpn2+fDkrRSQQWRuxg3LVtwDt/ZX1o3Aj9J4T3l -Em+pKpexdVCZ5Swv5Xx1PbbIWJiZa7t11vmfIMkMeO7sSkRS7/sGW7Im3146oyJU -AhemsdeGluueFYyJK+cl9wKty2eEF7iEsrgKlwUo/J0jmAlPMHKVmxBk3hsoNy/M -IHXVDPkt5HfaiFgXn0NseIm0hto+o+2FXugEiIriDhjA/gQZFhbvxqmbhdpmAPNe -32XAuDDPncf5Omz51turEw+l9eBFKySfXUuf71NI1JjiouV+Bqzwh5cIxEYsLxX5 -B3rW08UZhs8H0eBWTGvRxO6FulXR1MUKgyWbF+pSnEGITinHcBXtrpkdkBgDrc9j -kra7J1x8J2spVjENeiq/79GmMtiUURimJj1hIA+NKfQKi1giCijdai9AVErxKff9 -p4OQ0KaQyZKqbOnzJirjCjU4Z7GNv8f6bdu4a38ImwadnJyC1n2Wh2vwy6kG6IoE -dWqRkwMjmzY9q7IuviQt1CC1SYI+SbOfDnyp1g== +MIIFcDCCA1gCFFMEY+tz/nIIvzkvAHTbOF3KXqTUMA0GCSqGSIb3DQEBCwUAMIGS +MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMRAwDgYDVQQHDAdDb2xvZ25lMR0w +GwYDVQQKDBRCYXJlb3MgR21iSCAmIENvLiBLRzELMAkGA1UECwwCSVQxFzAVBgNV +BAMMDnd3dy5iYXJlb3Mub3JnMR4wHAYJKoZIhvcNAQkBFg9pbmZvQGJhcmVvcy5v +cmcwHhcNMTkxMjA1MDgwMDA0WhcNMjkxMjAyMDgwMDA0WjBWMQswCQYDVQQGEwJE +RTEMMAoGA1UECAwDTlJXMRwwGgYDVQQKDBNCYXJlb3MgR21iaCAmIENvLktHMRsw +GQYDVQQDDBJjbGllbnQxLmJhcmVvcy5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQC6x+NYnaH2QNAywjQxOyPKORgYgnZLGZ1SOGAvfFfnbZBJyaUd +QLBX49y9vZ0L4wbNvw33n4hk/sAsps757fNgUoSS/3iflKId7spXZyl+hWifiODD +lqCQLhS4taXfoyMu5WRP7lisbfGPRt1iz5yaZPQYWx897CUsbpvVwrgCjWbXWUWP +1C8EikFkuz47qhoV9QhSpTleAtIvneOYbV0itOS91hpuvcoXIJM5G0/TmsDvA5CL +UpZt1KK+WQsaEBp8+HzD/DyyFjKw3TUGzK54jeSZTaYRJSM/Ut0cukybE+5icgdl +CJwr1qk+blNISOm7U+kYfjIfF06jYc+Erpnx1wk+EdykcNlXmzbD1wzPtd5Q2Qr1 +LUj8oL1/bL/dn26c0JFFdPrThWD9JoHD3heJwI3vSPydsRGHIJCWcFjQur2/l2rV +rZprq4PilkAC9lzecd5VQCTqVJgDTev+SDwvn1bMAi0W5FQECTYoQKFKHIew3nlT +O1aZSej9vZw5aVCJ0LSJ2nnfiN8wlFceX5uHjJCxyWOtc9SUctsxlO7mX5FqDwVd +U6Ecn09MzplvffGJ3L9WKP7kPmSmu5vDaXbGRIQs7dT8pSfzOYVK+AiebUqwfJcw +9lYaqj7VpUejadgRueMX9sJwqM0XvPgLq0pN7kaU/P7/1xPMVOBHRp+gWwIDAQAB +MA0GCSqGSIb3DQEBCwUAA4ICAQBMFvWLt2p9AQ5z8WKziVwEPgSXaMgiLOXl2Bbg +13EZyM2SOuWGi9pKzoVGQHBFmiID7zhE/Ft3hD6aE/uYg5UvJbly5DyEhyX1cQfX +dlxtxiFh73Pv8vuFhGyKgWZqpTuAt6zSnTMymbBTKVFtVB4cBYvxnulWDx0ZRBaE +18WN0GsS/wNfRoWFvLyjY6hjiq8g59BGC2GVJN67NniJxeO4BqKE0N4c/hCzsAWB +VzWC37uxNmUg6txcwWhzKEdo1mxjSri4KZ3BVgkkBo00RSuNs2r+io7Xb7IYmaJ1 +XwUlqdeBiTxWI2jl/L+BxoYJTHmKSnF+sxPdUPy9xMEK5yUXW6RvBoYSvzdzfOLR ++rHJl59VGcP00jxfLj1uQQaeXX1Xvc5ILWAAGjsHmInx1AoguOf5UiZvJUfngeVR +6CqAcanbokfNMM/plNRmKW2nqo3HkGrayiKnG3VpIITER8KQ3oKPo4T1KaXmj7Nv +SVM/YJRyfU/SUGFdXa+F55Hry9klDE+IKqX7jd/dSRTxcm7iRzke8KbS5t0Yp/Z4 +x4Eoyrc4DFrG125JDv6dq4oZyLiXBE1aei9Rq8c9SnJ4de+QBGjlcs9xLtZSLW1m +Yqoq8ANckagkZSk4gOi1qhbWZkkdqmsVCZ7NP2IyMG//rBUma+yBUTKyBckq8BE2 +WGaP6Q== -----END CERTIFICATE----- diff --git a/core/src/tests/configs/test_bsock/tls/client1.bareos.org-key+cert.pem b/core/src/tests/configs/test_bsock/tls/client1.bareos.org-key+cert.pem index d9d760be9f5..5b07f76be3e 100644 --- a/core/src/tests/configs/test_bsock/tls/client1.bareos.org-key+cert.pem +++ b/core/src/tests/configs/test_bsock/tls/client1.bareos.org-key+cert.pem @@ -1,79 +1,83 @@ -----BEGIN CERTIFICATE----- -MIIEyDCCArCgAwIBAgIBEDANBgkqhkiG9w0BAQUFADAyMRwwGgYDVQQKDBNCYXJl -b3MgR21iSCAmIENvIEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwHhcNMTcwNDE1MTcw -ODAwWhcNMTgwNDE1MTcwODAwWjAdMRswGQYDVQQDExJjbGllbnQxLmJhcmVvcy5v -cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD5X04UtpRkgzy0otmf -YK8rhpcQ/iwAdBQFi4H4eluBkSZlqOSIFQbuFozT/AkENYznYo+Rf+PrdRNsQOPj -mltGTGezH3Bx2fpfO5b4Lz5Dbf8HprdZ8cqGBe5/7qTGRc3rLzeWsmaiAaR6wMyp -xhzbxN6GzC0UyQNvatbcuCSKbIGndXjJ0lFE3jwTpnYdSawEUu0pmYTtspicJDxW -A0xa93S/QfV7P9TeQAfikS+AyHJ5sLFCCCyGzrQWARSVYtMkHSZxHUgQg8FtSu3Y -iN3lfP+fuT7EpVQZnBkxwmZ8muZ7Cy3MFN1wikUz+2uWJj7jXX3LMTXao/GjFI2P -HPRdUpitPsty+4acZA2tuC0NmuN0kNm9GYdzvb5wJrIAfGlm33mgX4Xtj14ExBzE -gdxmieLpt97IWUM+Rlv6YdJ1WxxfBqEJWhG5Mv6QrUnJzr7zuNafYgJOemC7jCqK -l4SfJs2keJ1uZPbR9QD4t7MR2PIU3L1tN01ZtnOZDyR+hJW7O0CVNCtGVvsgDtai -0E59FkkXvwH4N+3PvFVlmBFyitCKzfQEqJL3rJWTuxh68fgvV4yX0noCgja3YcSw -d6qCmo0pHRXsI4mxmd+o+7HpQWzV9iLcjs9smUe37eRs3uPf8Az78IR0Qmaq1ja2 -4CE1o/6VBvhutQF6Uf6B6JE6cwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCctawQ -QKxYj+nPC2kZU8Sn8ZsQ8Jf3MAJjJXRDGKgZEPzjCLhnVe021TXtKXhKJy/xVs91 -VjnEhH+rJSLlpcEvHVgBXLQiYBq/qjIev1ynKVRpJ7UTnX8wT16T64gI80LzYLE2 -5XpZab8hHRG+YW9eG7QwrvzdUnpn2+fDkrRSQQWRuxg3LVtwDt/ZX1o3Aj9J4T3l -Em+pKpexdVCZ5Swv5Xx1PbbIWJiZa7t11vmfIMkMeO7sSkRS7/sGW7Im3146oyJU -AhemsdeGluueFYyJK+cl9wKty2eEF7iEsrgKlwUo/J0jmAlPMHKVmxBk3hsoNy/M -IHXVDPkt5HfaiFgXn0NseIm0hto+o+2FXugEiIriDhjA/gQZFhbvxqmbhdpmAPNe -32XAuDDPncf5Omz51turEw+l9eBFKySfXUuf71NI1JjiouV+Bqzwh5cIxEYsLxX5 -B3rW08UZhs8H0eBWTGvRxO6FulXR1MUKgyWbF+pSnEGITinHcBXtrpkdkBgDrc9j -kra7J1x8J2spVjENeiq/79GmMtiUURimJj1hIA+NKfQKi1giCijdai9AVErxKff9 -p4OQ0KaQyZKqbOnzJirjCjU4Z7GNv8f6bdu4a38ImwadnJyC1n2Wh2vwy6kG6IoE -dWqRkwMjmzY9q7IuviQt1CC1SYI+SbOfDnyp1g== +MIIFcDCCA1gCFFMEY+tz/nIIvzkvAHTbOF3KXqTUMA0GCSqGSIb3DQEBCwUAMIGS +MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMRAwDgYDVQQHDAdDb2xvZ25lMR0w +GwYDVQQKDBRCYXJlb3MgR21iSCAmIENvLiBLRzELMAkGA1UECwwCSVQxFzAVBgNV +BAMMDnd3dy5iYXJlb3Mub3JnMR4wHAYJKoZIhvcNAQkBFg9pbmZvQGJhcmVvcy5v +cmcwHhcNMTkxMjA1MDgwMDA0WhcNMjkxMjAyMDgwMDA0WjBWMQswCQYDVQQGEwJE +RTEMMAoGA1UECAwDTlJXMRwwGgYDVQQKDBNCYXJlb3MgR21iaCAmIENvLktHMRsw +GQYDVQQDDBJjbGllbnQxLmJhcmVvcy5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQC6x+NYnaH2QNAywjQxOyPKORgYgnZLGZ1SOGAvfFfnbZBJyaUd +QLBX49y9vZ0L4wbNvw33n4hk/sAsps757fNgUoSS/3iflKId7spXZyl+hWifiODD +lqCQLhS4taXfoyMu5WRP7lisbfGPRt1iz5yaZPQYWx897CUsbpvVwrgCjWbXWUWP +1C8EikFkuz47qhoV9QhSpTleAtIvneOYbV0itOS91hpuvcoXIJM5G0/TmsDvA5CL +UpZt1KK+WQsaEBp8+HzD/DyyFjKw3TUGzK54jeSZTaYRJSM/Ut0cukybE+5icgdl +CJwr1qk+blNISOm7U+kYfjIfF06jYc+Erpnx1wk+EdykcNlXmzbD1wzPtd5Q2Qr1 +LUj8oL1/bL/dn26c0JFFdPrThWD9JoHD3heJwI3vSPydsRGHIJCWcFjQur2/l2rV +rZprq4PilkAC9lzecd5VQCTqVJgDTev+SDwvn1bMAi0W5FQECTYoQKFKHIew3nlT +O1aZSej9vZw5aVCJ0LSJ2nnfiN8wlFceX5uHjJCxyWOtc9SUctsxlO7mX5FqDwVd +U6Ecn09MzplvffGJ3L9WKP7kPmSmu5vDaXbGRIQs7dT8pSfzOYVK+AiebUqwfJcw +9lYaqj7VpUejadgRueMX9sJwqM0XvPgLq0pN7kaU/P7/1xPMVOBHRp+gWwIDAQAB +MA0GCSqGSIb3DQEBCwUAA4ICAQBMFvWLt2p9AQ5z8WKziVwEPgSXaMgiLOXl2Bbg +13EZyM2SOuWGi9pKzoVGQHBFmiID7zhE/Ft3hD6aE/uYg5UvJbly5DyEhyX1cQfX +dlxtxiFh73Pv8vuFhGyKgWZqpTuAt6zSnTMymbBTKVFtVB4cBYvxnulWDx0ZRBaE +18WN0GsS/wNfRoWFvLyjY6hjiq8g59BGC2GVJN67NniJxeO4BqKE0N4c/hCzsAWB +VzWC37uxNmUg6txcwWhzKEdo1mxjSri4KZ3BVgkkBo00RSuNs2r+io7Xb7IYmaJ1 +XwUlqdeBiTxWI2jl/L+BxoYJTHmKSnF+sxPdUPy9xMEK5yUXW6RvBoYSvzdzfOLR ++rHJl59VGcP00jxfLj1uQQaeXX1Xvc5ILWAAGjsHmInx1AoguOf5UiZvJUfngeVR +6CqAcanbokfNMM/plNRmKW2nqo3HkGrayiKnG3VpIITER8KQ3oKPo4T1KaXmj7Nv +SVM/YJRyfU/SUGFdXa+F55Hry9klDE+IKqX7jd/dSRTxcm7iRzke8KbS5t0Yp/Z4 +x4Eoyrc4DFrG125JDv6dq4oZyLiXBE1aei9Rq8c9SnJ4de+QBGjlcs9xLtZSLW1m +Yqoq8ANckagkZSk4gOi1qhbWZkkdqmsVCZ7NP2IyMG//rBUma+yBUTKyBckq8BE2 +WGaP6Q== -----END CERTIFICATE----- -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/core/src/tests/configs/test_bsock/tls/client1.bareos.org-key.pem b/core/src/tests/configs/test_bsock/tls/client1.bareos.org-key.pem index 38916d94738..3b386a776b1 100644 --- a/core/src/tests/configs/test_bsock/tls/client1.bareos.org-key.pem +++ b/core/src/tests/configs/test_bsock/tls/client1.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -MIIJKQIBAAKCAgEA+V9OFLaUZIM8tKLZn2CvK4aXEP4sAHQUBYuB+HpbgZEmZajk -iBUG7haM0/wJBDWM52KPkX/j63UTbEDj45pbRkxnsx9wcdn6XzuW+C8+Q23/B6a3 -WfHKhgXuf+6kxkXN6y83lrJmogGkesDMqcYc28TehswtFMkDb2rW3LgkimyBp3V4 -ydJRRN48E6Z2HUmsBFLtKZmE7bKYnCQ8VgNMWvd0v0H1ez/U3kAH4pEvgMhyebCx -Qggshs60FgEUlWLTJB0mcR1IEIPBbUrt2Ijd5Xz/n7k+xKVUGZwZMcJmfJrmewst -zBTdcIpFM/trliY+4119yzE12qPxoxSNjxz0XVKYrT7LcvuGnGQNrbgtDZrjdJDZ -vRmHc72+cCayAHxpZt95oF+F7Y9eBMQcxIHcZoni6bfeyFlDPkZb+mHSdVscXwah -CVoRuTL+kK1Jyc6+87jWn2ICTnpgu4wqipeEnybNpHidbmT20fUA+LezEdjyFNy9 -bTdNWbZzmQ8kfoSVuztAlTQrRlb7IA7WotBOfRZJF78B+Dftz7xVZZgRcorQis30 -BKiS96yVk7sYevH4L1eMl9J6AoI2t2HEsHeqgpqNKR0V7COJsZnfqPux6UFs1fYi -3I7PbJlHt+3kbN7j3/AM+/CEdEJmqtY2tuAhNaP+lQb4brUBelH+geiROnMCAwEA -AQKCAgEA6XiPM9lUyV4NgdlOAmeU2R1jZidxruL+s8pPXwG/lmj9GASuIbH+EP7P -ztCS6HvyddfTLpgcHaA5FQsT0U380q5KEGwI7K72OB8kUyx4EM11DgbKds1nnV8E -UoZtgqxsBBrq4o4YhOkgw0Sq2PCAqEmDRZT3SBSCwNe4XmGQ5IB+SvgypFHigKXI -fWVGBFmrUUkKff4bdCfXtag/TRA9dpVjmoT4ffHfLE2qlDb10I7ajpAdBQN+HKB9 -/nP4f3xMzez0xsZxZ/TTLa4PTMGnbmo/MZ1P5PAc8vUwqWOmbFbiHqTytbV7NRhf -fjGQIr2f92LamVhzYUZIvzRI7IphRP0mowuczjjQh1ENNOqiOh7qnnB7eeCdz0oI -ex6U5ei8d8LcpqSOSBAs+zjl3VXYjjKYeVnd4wt+vBsHZYu5UawiwAwy1cqwqMu6 -7Ateo7YZPfuvhYkurjcmDLIf9ZAdKKFRSUN5oPXwAIzJK+TWNi03McvxY6p/4uGQ -KHssAjF/S62xiffNGMKZSVyf52agfA0Icaf4JP4yk7v4DKUo7Ywa0UdgCgXhLT6O -yg6NvMv/9FmugwSDC1O3DjL42/vxJ/jkaBpaQizcQnfLptpZwfa+3UJwmf6RUH0N -Mrw11qicQaBqfBfK8JVQkPkxGIvD28cy7zpGg3GZ94a0azCR5kECggEBAP4eo8KV -iw4tfpnzDs32Y816KFP9T4C+YOvgq9ysrvuLsPYREecTkAmmBPhpoYep8lz7B5ZY -A82yKmDTJlIVNR4zL7Bpf5mPkRNkS6ux51/R+64SbrOQ9IkSmDj66lLcVkBpfi33 -BJXCHo+JH3ivoe7vHHLnp+nVxAFbrIjys40UYZpCOfKfH/JEDyNnLDcHiXgilrQh -mJL2e5SPA23YkWjjk1wQrc2mbUmiMadzFoXZqNqQik4hg5lhOeVwbeuI8Iu8U6Xa -HNQN9hlHbYPPcsye86iqm8evH8UVM4uGc50lFQGtjjwkMWI96LgQm/CrybcjyomJ -j3iHXMpnHFgC1fECggEBAPs3rDOKCR1b62hFb7X9Mzsld+IQskV74RQ9OQHVKzII -xjpdYIMwyJacqCme3e+3hdxjH36piQ07e1gQfYhyXsOn1q5hhOfkdw99mVFJ2dGY -VKMDZxwFfkRMWDYi3mAzDvzDWWX3U+x1In3I/MbgrZ+065mTwDrJJW9SLS4RBtlK -xbo0mvO/XbGIurrhym70WM4JiZxL3xRoh7SJ6JS5dNeO5uWg8eELN++YvAywCMBH -Rz0YgSihoJnvdWIQjqmMieWTZ/MjoBWe9zCpmCzj6/Pg83p6+tinBoiW4qMzg2w0 -24zvFbYD/IwgJ2dputqDKrVxxASZEBWT2nQ5XybpIqMCggEBAOPGpPSKRF0N7Fej -pJZ6jlSkdTdra3Kzsn5bINEpO6MfQBwfitN8FnR/ih7715yZeTNckx1wgOBEHXYy -bTvP5I/QQ6O1vHjxVZFzKdyZFxItTpFl1jI/8OBYeXdBeP2SoAEWTdJ3gnWVzPzN -ZRcxHk3jp7Va7YhMYmbxPAJ4wPXo2d+CExzlAqaN2J/cH6anq9Gx9zE4l+DK7FRp -qCIyp4vDyNcR4CfgUD9bEXTNVNffFFnsivujUKkPm+yLTQt88FfgE34qtgJhDUD1 -ZDVsobLFmxOI8R8YWrq12UDr3/9wOJcLcN15d4ZehZVO1efwo1rzytxjH+ViN4r4 -x1AgIpECggEAUmsAbuRBe0VV5R6quL06GpR/UUaDBjLPNDGly0khY8fnKOzLph7S -ID+DGCyLyYKfQx+uDIMYeKPkIo8+cA59spkU4J8T2HRm70kYjMe6032zfsu1/0Z6 -F3QomJI1/L+jkh+Q69gJy5DeYQAYljLOI5Ban0cPEPo+8te2BOAHLDDQz/dEQuWs -mnsuL/O101MM84PDhuiJZouowf1gtbJmd/XlIL79vARPNKcaQttZ86Mu5wdsEGV+ -aCJck3C1LUDzWMNUnjs44P8HQArT5x5boeZSWwOP2pZpmVRPRJW47z4kLYeeytlh -+KLv6oiQifHwiBir44pH8ZxRVkIgSobAGwKCAQB4pxohxfveeK5jzBh5Jd7mRGN5 -dNRK8JS1gcIf7YeFSXb3kszMhCyQABQFFaKmmLQq10wsrxQdPJTZkmTVa77DgC7F -klnk1KzhzJuEcTCwyETOUInbt2BFSVINKmTvnkt8ljDpiN8Ft4xtaFlOfmiWjWON -gmv7bql4x4s4dntVhUZbBtTiCbHG14X6BvrrnSpV2DChYheUpmBd341RdvpWJxXN -QYZgPoFkIvKnIGH4GKhFVBgjRuFmBsWRyXag966z0QMDlQMMobCh4StyK3KOpVxB -0h2wtJQN4alSu67KmsDEE01jK/HJAk7prftMPIAeQs+KXQHLJglyt/H+Xdov +MIIJKAIBAAKCAgEAusfjWJ2h9kDQMsI0MTsjyjkYGIJ2SxmdUjhgL3xX522QScml +HUCwV+Pcvb2dC+MGzb8N95+IZP7ALKbO+e3zYFKEkv94n5SiHe7KV2cpfoVon4jg +w5agkC4UuLWl36MjLuVkT+5YrG3xj0bdYs+cmmT0GFsfPewlLG6b1cK4Ao1m11lF +j9QvBIpBZLs+O6oaFfUIUqU5XgLSL53jmG1dIrTkvdYabr3KFyCTORtP05rA7wOQ +i1KWbdSivlkLGhAafPh8w/w8shYysN01BsyueI3kmU2mESUjP1LdHLpMmxPuYnIH +ZQicK9apPm5TSEjpu1PpGH4yHxdOo2HPhK6Z8dcJPhHcpHDZV5s2w9cMz7XeUNkK +9S1I/KC9f2y/3Z9unNCRRXT604Vg/SaBw94XicCN70j8nbERhyCQlnBY0Lq9v5dq +1a2aa6uD4pZAAvZc3nHeVUAk6lSYA03r/kg8L59WzAItFuRUBAk2KEChShyHsN55 +UztWmUno/b2cOWlQidC0idp534jfMJRXHl+bh4yQscljrXPUlHLbMZTu5l+Rag8F +XVOhHJ9PTM6Zb33xidy/Vij+5D5kprubw2l2xkSELO3U/KUn8zmFSvgInm1KsHyX +MPZWGqo+1aVHo2nYEbnjF/bCcKjNF7z4C6tKTe5GlPz+/9cTzFTgR0afoFsCAwEA +AQKCAgBmd1wYdDmy73GINxQM4gXLXbEDWSbuIjo1LepOgqdytZ+Pa0jimGdlgALM +MKZkLALCgop2CxX3We4xUL2BTPHUKNDEF9SjrxWU2Dg25MhVuXhg9OVhR1QEZNNH +VZeO7V9SzdNPKlGJHrODR3wSRhUCelmStwKXpOHr0y44gZ8S/2GoyDeqJNw6YGJp +kXMdpj6zRv5u4GdtVJzcNID0USLj9Fr8beWIVSP1thAuJvaO/nnTZaA5XnBaBmnV +hOHbRXRSlLtVhR4DELx0XJZHiag5SJZdJ8Tv6PDCP4I/zVBTTwbbCPVXjval8hhc +wId9w0o+U1Uv86MpfU7NwM3oWyTmIHMkFBS/J53GgiDJOXnhftt1iUyvEcnhpz9w +AOt8UCwKupz59H0CKWe5N6spT4VrmQKW9lgeAjLFtZcMzdoLYB0gP+eJkhV6ZD1x +9ZhJJI09+dJZr0ti48XbhnBgLSvgiPDRFwE9CPjvzO0gDUWsQNfhgyU3oSpTBNqb +X4CZ94/ZWquQRImFl4f74AUYMLIyrN170UQGh/hcgVaBGnRxpRruJXiW+TO+JMlL +kB2Lo9Ttd0Ontce8wsO15ucCRyAKABmWOU2aRGYb6nOBZ2MQzCGvIJOqmMhrUA3B +uh8L40ptCS0kvS+q0Iv20gWgFAxQM45mfXxpTCfVOvRuDqOGEQKCAQEA4D+EhM3U +lc0vhYYJkSJ2fLhg5CADhN9fPJGuRwtdsxzAb2lxUfIejUNc6lvXcDF6S8zByMYS +vtqOdjWXb3XVFsHEASSPaq7B8Bh4p3Mgkp0EiVUZXVsqno8elcVFSShLyJg71oTO +hTqVlhRQjXOD7Aha5cBmYQ1CM/rMcHANDb9NNDIXOW+t6BbMEJqEDuZEuaWB/hpb +1Ic2SQiGHiPPkfacUH1orETshjdWLxNBx90a98Mqo0O5ReAPFKff6w/u/SwKp3su +daibQKFiI/j6bpTn6u1aOPoMHbAI5hzcDX1zG3dt/Az6YNcmI+mXoqouglO011aF +zZDyZEyzj2j0iQKCAQEA1TpEJe1YJuMvU62y7hsWgcMufWZwDIElBRd6s/ei6Hq2 +Gkf5JwzYqwCmBzZbi6ZPfnOF1Hfgic9Mg0Xz1uCYlJCnfqotcT7eY7f8OKbFSim9 +/SA/PfxaL+qi/vFsCP78j+wcuLXVIiCjj9P1sDCwlu49okLdA6C96tVRwzqlTcMd +pexfE2F9N8nMsXioixe2Vns4dh7N6LUPFhXImd1S38WaSD+uLWzXDbZKTm3V68rI +4XzxWHaol7D4GdAHbCDlcoLYzqafmMF396Qls5TiK0B+iUjANvKTDnR0slhJA4vI +n/xbvrzlTt58i6yN1yLHyrBHL/R1yhMSipfigKN8wwKCAQBUumsdqo+aEi7UanKO +7dCLCzdAun/Z4nQfdIO+wCKlHEXxUovIhIzanwsqWY0rDObCYRkO/Rf0GKwfKdyP +9puOv6OJMwElM+Z/Cx/7VNqHyt/967NrvJh71GOf/ytQmvMXVb22LfPCDwKZ9A8D +gxPjSLzfdjS4ksPi0+4OxaeI/DD1eb+gqfuxZ3uvAlLHNmXdJxXYpqjvwi7WpWvX +U3yID/+7wcac4GXlyF695q7CD16zIoCns1z7c87+5PcL37dS3SMhaL+DITOX1eI4 +6UfmJEkEUK34PTH6vZp/J4RVbILja9qYk2a+1EvK4eWzRk3QXERF4KEprIyJLRnj +I6rRAoIBADQRBUEJosPkJ9NUD+QqgyVuhrSiRewXwPVsVU8KwiHojPz/5CwP6/xd +rS0HrfT8yF6FUQGfwBmGoBVSCIfI0hk89Vltrqj/hAhvjcw7lONWLAlaTXcSXudi +cSi1xP6xXPS74AuOgxvRQn9Fb7H1QbmpNS2hDBztrFJigpOch27knSG+BT1TSeNM +iIoxf15vjNuzPQdC4F7Zj3SCHzjLHYh81P6dZie7cwvrHlvmYB0yqDi/bKOAXgyk +bwDGlnll0wFSSCS19TS00VmMIJSoX03Wcs+NDzqboyMddr1x52pRQM0oLzL1Jz1K +ALmOihglawnoX4mrNPQCEj37dpiY00cCggEBAK1B55hUMwGz8Bo5fo4+ZKpKL8wH +Bh4nuQFDNgytlQxLmmVC/XLZwN/V9tyHK56WyGIwEbHgfw1ev+LpTcBSONj6GK/B +aw0OUUJfdAXWNbTs9gITqevdTsDgY7ylItsbFTW0etVwq7eeE5REEz7rjFV86KRl +QLF00w4RfzB9Y77oJhpr8iWCXIpV3cOuwihxJJPeEVAjzhpZii5zIYsKk9nTvXpE +wwKQRAbi5+PM6Dud478mG+zgSV3K2kL4AfAqOif6meYSXnFa96ql0uR7iiJXaP39 +kQX5DixCc+MDMzIrD6Fyxs+uQllJiUNzAKm/dR3m2STXw3u9g+4IWjScpF4= -----END RSA PRIVATE KEY----- diff --git a/core/src/tests/configs/test_bsock/tls/console.bareos.org-cert.pem b/core/src/tests/configs/test_bsock/tls/console.bareos.org-cert.pem index a9c9df25d15..ebc2c1c4062 100644 --- a/core/src/tests/configs/test_bsock/tls/console.bareos.org-cert.pem +++ b/core/src/tests/configs/test_bsock/tls/console.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIEyDCCArCgAwIBAgIBETANBgkqhkiG9w0BAQUFADAyMRwwGgYDVQQKDBNCYXJl -b3MgR21iSCAmIENvIEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwHhcNMTcwNDE1MTcw -ODAwWhcNMjUwNDE1MTcwODAwWjAdMRswGQYDVQQDExJjb25zb2xlLmJhcmVvcy5v -cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCiHNuaW3dH3snGYXIr -8GwgbpzPdh5rZ5kvjdrKZFmdUOesgUuuEuLmQBCkxuZXWps/yJOXjpA+jO4okPa7 -iU17PdbRBOQL2KAFDFioGiaCKhRJ5Kbso3fnPXvV2tccGMgbBLHrLwD5CtWzuXaF -ujozIFYgXEJUWNnSQ7wiwL/FbQSjfR+LjnhaMrow1dL8Lh+g5iZAxBa2nlbSYIgF -jhgcFUh97P/bJD/+2mRqlsd9nz6NFDyis53/WdNcTjZNgtovt0bUalvR6DjbwIUq -6KSy/xJ/NKiVS5X75nskEL2pCudREv9w0rRfBIFwcGbBZT0OtKzKTRoAbeh9ipc9 -NARMIqoHTPa7Uq1iIbBiFTtQYj6ix4sd26rPJKL+eeAEkrqOG51aL+cM/CMVGzqw -zB+X0IsbJKGoezLaKJIUnwv5vIaNpRNdKm8b6Zf4/jy3YFfC5MIEShXHuI4D+6Zg -9O8lD6UzMwYV0ugsm1Y72yXreO8EgcFNFGVXMXg78ocyPuLoPfuCSuRkL+kCjWSW -lDGGVIfPIv1uKMC+rFNvcrG2xG+nEOCWp0nu3bmLhIKrA9PnHuVMRs80YhbyTPJb -xm0mCXBTeCO416PbUHTM8q8nuAIev3jxoeWSTrXQK2bVAAXNZtEdsUcksYIoWi8o -dqXsIi2xisT0tGSp0yr14Q53MwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAzoiJe -msHExtkD4oF880voRYDwT4iFAVULuRQ/+Q7SBpWbpgfCn1UkY3vSRkSI4hHv0rFU -pmIzP10JW0ix5QPZMQ6nixOGWBrLqqqMLti76E0JHkFNV70cBUY9oMY29Rx2O2hS -sLRfxjBcf+sqaJBExEZmTzI6eaFjb7EQKY0XbQ6XuEJ5veadLB6IHEZK0QW28IFL -5VcD/NoiSco8hSiFQqqz1etgUN8mstnAt0j3kVtCnUpsqyFnSqK9yMHhkeHxZfrm -MiojvD+mBFNMUMe6oaMeMLlidkIiEYLpW8w3Skh/mdreAwhBDCD+IfbE6+bgs9G4 -3t/fcvsFQr4whz7JAnx4pHD3HTanmf59wsoFFVxialUwXb2eNHjTDNOMpmIhV20r -UgEdqgPj35byWp1aFbNvt4kRdZfumKJo39f696YyPcAXRoJz3SPcVqSrhFYz32e5 -hiYOhSMgA3xy9R019hlgt/GYT9EWkOMfhvcD/7phaAQHwTdAplGQaXuerq5Y7M+N -0UYc1/LYN9q66S5qpjqnJnQiMukGLi8CD6w6exJ61pDAMujvdQSpFcFxLFTxlHYM -pYi8J3QbWcGe5qyiDRWjAnwiFbgwi9Ck4wdSiHrpm/WtGo11LxXfVGm0UqYS/VE+ -7sccuxnBePXqbbU/sGfZrea21l5n9VxQIz97mg== +MIIFcDCCA1gCFFMEY+tz/nIIvzkvAHTbOF3KXqTVMA0GCSqGSIb3DQEBCwUAMIGS +MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMRAwDgYDVQQHDAdDb2xvZ25lMR0w +GwYDVQQKDBRCYXJlb3MgR21iSCAmIENvLiBLRzELMAkGA1UECwwCSVQxFzAVBgNV +BAMMDnd3dy5iYXJlb3Mub3JnMR4wHAYJKoZIhvcNAQkBFg9pbmZvQGJhcmVvcy5v +cmcwHhcNMTkxMjA1MDgwMDA0WhcNMjkxMjAyMDgwMDA0WjBWMQswCQYDVQQGEwJE +RTEMMAoGA1UECAwDTlJXMRwwGgYDVQQKDBNCYXJlb3MgR21iaCAmIENvLktHMRsw +GQYDVQQDDBJjb25zb2xlLmJhcmVvcy5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQDL/V7wb3Tjjkerwa4FfIHdRJI2UynQkfe1qI6EsnjEZL7fOCsn +JaFYnFwygQpSoufJCirFRlBHVTrFi+MtYyvk+LCdj19iEetZ6H0AghIsz4hrfMTp +CHaxSF6pYe27WpzZrHlQmJmJBzx6qjq2u3t9tsgqkMZBTGA/jhI2VXpYdEw5vlJc +CoWd/ePR/GAozksilnkWlOZVunatE8ZpaP/g0MFj8Vp9dm1pgYFY5HJZkPj1RWOP +QnnGoSRQnuYXtMmk+T/7yreom3RntXNz7yA3tcn15u8wdgCTU4Yxv9R+mTQjnKbr +OgEjTuV+TB6Si3xVGmc73d/dB0OQh4fquFaEEYb6rvkCUD/LoGpT5AIhNFh6ExYI +6cSkE4GEocpbrJrJYMNlH2da7KUIvI6BaDqoTqYgD7vKnfquvWM4cFDDfjfz3ifX +XHCtA5DHsXZFfqHOtMveWusNG8fX//3OGlS3bxdoq95qQovLsmJPXj0Axjn6+5C0 +c+7tHsjW93CGvpNdDupP/aEYLxVfn9Bhcml3UC4Q2ufOZ6k4lFAIplcd6v3ppGQH +eObodQwDaD6Y+/dTE77Fb9IGqBdZlQ4I8ZVS/HVYxIWQk6pCFm8balBpLvg19zTJ +SvElhdObjuvy9Je46jVb6JIqJfgfAfHOcf+mQEcGlO8ZQ/oMupTbgeIunQIDAQAB +MA0GCSqGSIb3DQEBCwUAA4ICAQACj2tbJLtAXS242RY8bXPl8kXqo7vRldv0ChW1 +q6hZ6zug6/XH9nSCN0oI555II33aTUGZ6yWAq2LryovbKEncydY1TPovBECyQXjh +rIlm9j+ar9q04h+LIzXtjbkCtSFsI37Je1vNOXLczFu7XrEzv5AheS0Hy+vBPSHw +PI0Jf9efgkrTbW1Jlc7GSIxd5Ybt+Bslu/YDwKkdRGMqTa/7cfSTFa9ozFUpMBDZ +maeizqafH2B/Ez+ZWfQo65UefeAY9Hm0xzUD7VhPTV1ysqA/6aN8UDbZfPIaU+dE +6iIVL5eQrt6n5gLpp1WfFWx3jGvYDD9uOzwECecDrRgtZOrSjVFz1dndJF9tiy/c +CtOGpDNIRLQW1Ske0K4rE7oaPKyWEe2gs9R4nXTEBSh0Q50LEH7eNgJUNskF3ktF +1sygrXCaNghylYGCzzB0Cwb1/TDerA9DfeoZCz8QG6xlgVlEk8frSgpJL29zWt+M +Ic2y7ar8eJLCD6qCbMD762L7GsPAajk0MEQJlxv8+kmydC7lYwX9hCbPymqGu6HE +meAvC5/Vv9vUjl5K5aWgs6W9pBN7/F3u40U3K/PW8VgJysHPR1aJjLk+8oYMreh3 +/N1fbiNfqLPAtYkoHOndjGPcEzde8QLTQAx5tKTUSyFGQ9cOpfsh/3KNhh4TTRCg +MlsT7w== -----END CERTIFICATE----- diff --git a/core/src/tests/configs/test_bsock/tls/console.bareos.org-key.pem b/core/src/tests/configs/test_bsock/tls/console.bareos.org-key.pem index e301968bbcd..9ab3f46512d 100644 --- a/core/src/tests/configs/test_bsock/tls/console.bareos.org-key.pem +++ b/core/src/tests/configs/test_bsock/tls/console.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/core/src/tests/create_resource.cc b/core/src/tests/create_resource.cc index ccefc3c26da..a94691669c3 100644 --- a/core/src/tests/create_resource.cc +++ b/core/src/tests/create_resource.cc @@ -1,7 +1,7 @@ /* BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -18,11 +18,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else +#include "gtest/gtest.h" +#include "include/bareos.h" +#endif + + #include "create_resource.h" #include "bsock_test.h" #include "bareos_test_sockets.h" -#include "include/bareos.h" #include "console/console_conf.h" #include "stored/stored_conf.h" #include "dird/dird_conf.h" diff --git a/core/src/tests/dlist_test.cc b/core/src/tests/dlist_test.cc index f5b4233e03d..d9011686c80 100644 --- a/core/src/tests/dlist_test.cc +++ b/core/src/tests/dlist_test.cc @@ -2,7 +2,7 @@ BAREOS® - Backup Archiving REcovery Open Sourced Copyright (C) 2003-2011 Free Software Foundation Europe e.V. - Copyright (C) 2015-2017 Bareos GmbH & Co. KG + Copyright (C) 2015-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -27,8 +27,13 @@ * Philipp Storz, November 2017 */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif #include "lib/dlist.h" diff --git a/core/src/tests/htable_test.cc b/core/src/tests/htable_test.cc index 00f6ad3a5af..0be60281f8f 100644 --- a/core/src/tests/htable_test.cc +++ b/core/src/tests/htable_test.cc @@ -26,7 +26,14 @@ * * Philipp Storz, November 2017 */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" #include "gtest/gtest.h" +#else +#include "gtest/gtest.h" +#include "include/bareos.h" +#endif + #include "lib/htable.h" struct HTABLEJCR { diff --git a/core/src/tests/job_control_record.cc b/core/src/tests/job_control_record.cc index cbae4fa0b1d..7d1604d2952 100644 --- a/core/src/tests/job_control_record.cc +++ b/core/src/tests/job_control_record.cc @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "include/jcr.h" #include "lib/volume_session_info.h" diff --git a/core/src/tests/lib_tests.cc b/core/src/tests/lib_tests.cc index fc7e7a5dcbf..cd0acb6d906 100644 --- a/core/src/tests/lib_tests.cc +++ b/core/src/tests/lib_tests.cc @@ -1,7 +1,7 @@ /** BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "include/version_numbers.h" #define BAREOS_TEST_LIB #include "lib/bnet.h" diff --git a/core/src/tests/multiplied_device_test.cc b/core/src/tests/multiplied_device_test.cc index 167c1eb8c1f..b11242401dd 100644 --- a/core/src/tests/multiplied_device_test.cc +++ b/core/src/tests/multiplied_device_test.cc @@ -19,8 +19,14 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/alist.h" #include "lib/parse_conf.h" #include "stored/stored_conf.h" @@ -30,7 +36,11 @@ using namespace storagedaemon; typedef std::unique_ptr PConfigParser; -static void InitGlobals() { my_config = nullptr; } +static void InitGlobals() +{ + my_config = nullptr; + OSDependentInit(); +} static DeviceResource* GetMultipliedDeviceResource( ConfigurationParser& my_config) @@ -48,7 +58,7 @@ TEST(sd, MultipliedDeviceTest_ConfigParameter) { InitGlobals(); std::string path_to_config = - PROJECT_SOURCE_DIR "/src/tests/configs/stored_multiplied_device/"; + RELATIVE_PROJECT_SOURCE_DIR "/configs/stored_multiplied_device/"; PConfigParser my_config(InitSdConfig(path_to_config.c_str(), M_INFO)); storagedaemon::my_config = my_config.get(); @@ -75,7 +85,7 @@ TEST(sd, MultipliedDeviceTest_CountAllAutomaticallyCreatedResources) { InitGlobals(); std::string path_to_config = - PROJECT_SOURCE_DIR "/src/tests/configs/stored_multiplied_device/"; + RELATIVE_PROJECT_SOURCE_DIR "/configs/stored_multiplied_device/"; PConfigParser my_config(InitSdConfig(path_to_config.c_str(), M_INFO)); storagedaemon::my_config = my_config.get(); @@ -137,7 +147,7 @@ TEST(sd, MultipliedDeviceTest_CheckNames_1) { InitGlobals(); std::string path_to_config = - PROJECT_SOURCE_DIR "/src/tests/configs/stored_multiplied_device/"; + RELATIVE_PROJECT_SOURCE_DIR "/configs/stored_multiplied_device/"; PConfigParser my_config(InitSdConfig(path_to_config.c_str(), M_INFO)); storagedaemon::my_config = my_config.get(); @@ -200,7 +210,7 @@ TEST(sd, MultipliedDeviceTest_CheckNames_2) { InitGlobals(); std::string path_to_config = - PROJECT_SOURCE_DIR "/src/tests/configs/stored_multiplied_device/"; + RELATIVE_PROJECT_SOURCE_DIR "/configs/stored_multiplied_device/"; PConfigParser my_config(InitSdConfig(path_to_config.c_str(), M_INFO)); storagedaemon::my_config = my_config.get(); @@ -248,7 +258,7 @@ TEST(sd, MultipliedDeviceTest_CheckNameOfAutomaticallyAttachedAutochanger) { InitGlobals(); std::string path_to_config = - PROJECT_SOURCE_DIR "/src/tests/configs/stored_multiplied_device/"; + RELATIVE_PROJECT_SOURCE_DIR "/configs/stored_multiplied_device/"; PConfigParser my_config(InitSdConfig(path_to_config.c_str(), M_INFO)); storagedaemon::my_config = my_config.get(); @@ -292,7 +302,7 @@ TEST(sd, { InitGlobals(); std::string path_to_config = - PROJECT_SOURCE_DIR "/src/tests/configs/stored_multiplied_device/"; + RELATIVE_PROJECT_SOURCE_DIR "/configs/stored_multiplied_device/"; PConfigParser my_config(InitSdConfig(path_to_config.c_str(), M_INFO)); storagedaemon::my_config = my_config.get(); @@ -308,7 +318,7 @@ TEST(sd, MultipliedDeviceTest_CheckPointerReferenceOfOriginalDevice) { InitGlobals(); std::string path_to_config = - PROJECT_SOURCE_DIR "/src/tests/configs/stored_multiplied_device/"; + RELATIVE_PROJECT_SOURCE_DIR "/configs/stored_multiplied_device/"; PConfigParser my_config(InitSdConfig(path_to_config.c_str(), M_INFO)); storagedaemon::my_config = my_config.get(); @@ -326,7 +336,7 @@ TEST(sd, MultipliedDeviceTest_CheckPointerReferenceOfCopiedDevice) { InitGlobals(); std::string path_to_config = - PROJECT_SOURCE_DIR "/src/tests/configs/stored_multiplied_device/"; + RELATIVE_PROJECT_SOURCE_DIR "/configs/stored_multiplied_device/"; PConfigParser my_config(InitSdConfig(path_to_config.c_str(), M_INFO)); storagedaemon::my_config = my_config.get(); diff --git a/core/src/tests/ndmp_address_translate_test.cc b/core/src/tests/ndmp_address_translate_test.cc index a9bd669a5cd..791b62d7004 100644 --- a/core/src/tests/ndmp_address_translate_test.cc +++ b/core/src/tests/ndmp_address_translate_test.cc @@ -1,7 +1,7 @@ /* BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -19,13 +19,17 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" - #include "include/bareos.h" +#endif + #include "dird/dird.h" #include "dird/storage.h" - void print_smc_aa(smc_element_address_assignment smc_elem_aa) { printf("drive: %d, %d\n", smc_elem_aa.dte_addr, smc_elem_aa.dte_count); diff --git a/core/src/tests/qualified_resource_name_type_converter_test.cc b/core/src/tests/qualified_resource_name_type_converter_test.cc index 1d8319a57d3..90a111f60b7 100644 --- a/core/src/tests/qualified_resource_name_type_converter_test.cc +++ b/core/src/tests/qualified_resource_name_type_converter_test.cc @@ -1,7 +1,7 @@ /** BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -18,12 +18,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" +#include "include/bareos.h" +#endif + #define private public #include "lib/qualified_resource_name_type_converter.h" #undef private -#include "include/bareos.h" static constexpr char record_separator_ = 0x1e; diff --git a/core/src/tests/recent_job_results_list.cc b/core/src/tests/recent_job_results_list.cc index a4dbc4c4700..886fb9fdf11 100644 --- a/core/src/tests/recent_job_results_list.cc +++ b/core/src/tests/recent_job_results_list.cc @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/bsys.h" #include "lib/recent_job_results_list.h" @@ -29,6 +34,7 @@ TEST(recent_job_results_list, read_job_results_from_file) { + OSDependentInit(); RecentJobResultsList::Cleanup(); char orig_path[]{TEST_ORIGINAL_FILE_DIR}; @@ -48,6 +54,7 @@ TEST(recent_job_results_list, read_job_results_from_file) TEST(recent_job_results_list, write_job_results_to_file) { + OSDependentInit(); RecentJobResultsList::Cleanup(); char orig_path[]{TEST_ORIGINAL_FILE_DIR}; @@ -75,11 +82,12 @@ TEST(recent_job_results_list, write_job_results_to_file) // create truncated files that will be deleted from ReadStateFile static bool create_file(std::string path, std::string filename) { + OSDependentInit(); std::string filename1(path); filename1 += "/"; filename1 += filename; std::string filename1_orig(filename1); - filename1_orig += ".orig"; + filename1_orig += ".original"; std::ifstream file1_orig; std::ofstream file1; @@ -103,6 +111,7 @@ static bool create_file(std::string path, std::string filename) TEST(recent_job_results_list, read_job_results_from_file_truncated_jobs) { + OSDependentInit(); RecentJobResultsList::Cleanup(); char orig_path[]{TEST_ORIGINAL_FILE_DIR}; @@ -120,6 +129,7 @@ TEST(recent_job_results_list, read_job_results_from_file_truncated_jobs) TEST(recent_job_results_list, read_job_results_from_file_truncated_header) { + OSDependentInit(); RecentJobResultsList::Cleanup(); char orig_path[]{TEST_ORIGINAL_FILE_DIR}; @@ -135,6 +145,7 @@ TEST(recent_job_results_list, read_job_results_from_file_truncated_header) TEST(recent_job_results_list, read_job_results_from_file_not_exist) { + OSDependentInit(); RecentJobResultsList::Cleanup(); char orig_path[]{TEST_ORIGINAL_FILE_DIR}; diff --git a/core/src/tests/recent_job_results_list/bareos-dir-truncated-header.42001.state.orig b/core/src/tests/recent_job_results_list/bareos-dir-truncated-header.42001.state.original similarity index 100% rename from core/src/tests/recent_job_results_list/bareos-dir-truncated-header.42001.state.orig rename to core/src/tests/recent_job_results_list/bareos-dir-truncated-header.42001.state.original diff --git a/core/src/tests/recent_job_results_list/bareos-dir-truncated-jobs.42001.state.orig b/core/src/tests/recent_job_results_list/bareos-dir-truncated-jobs.42001.state.original similarity index 100% rename from core/src/tests/recent_job_results_list/bareos-dir-truncated-jobs.42001.state.orig rename to core/src/tests/recent_job_results_list/bareos-dir-truncated-jobs.42001.state.original diff --git a/core/src/tests/run_on_incoming_connect_interval.cc b/core/src/tests/run_on_incoming_connect_interval.cc index 27e07b776ab..06eb26d3fa4 100644 --- a/core/src/tests/run_on_incoming_connect_interval.cc +++ b/core/src/tests/run_on_incoming_connect_interval.cc @@ -19,7 +19,17 @@ 02110-1301, USA. */ + +#if defined(HAVE_MINGW) #include "include/bareos.h" +#include "gtest/gtest.h" +#include "gmock/gmock.h" +#else +#include "gtest/gtest.h" +#include "gmock/gmock.h" +#include "include/bareos.h" +#endif + #include "cats/cats.h" #include "dird/dird_conf.h" #include "dird/dird_globals.h" @@ -28,12 +38,10 @@ #include "dird/run_on_incoming_connect_interval.h" #include "dird/scheduler.h" #include "dird/scheduler_time_adapter.h" -#include "gmock/gmock.h" #include "include/bareos.h" #include "include/jcr.h" #include "include/make_unique.h" #include "lib/parse_conf.h" -#include "gtest/gtest.h" #include #include @@ -65,10 +73,11 @@ class RunOnIncomingConnectIntervalTest : public ::testing::Test { void RunOnIncomingConnectIntervalTest::SetUp() { + OSDependentInit(); InitMsg(nullptr, nullptr); std::string path_to_config_file = std::string( - PROJECT_SOURCE_DIR "/src/tests/configs/client-initiated-reconnect"); + RELATIVE_PROJECT_SOURCE_DIR "/configs/client-initiated-reconnect"); my_config = InitDirConfig(path_to_config_file.c_str(), M_ERROR_TERM); my_config->ParseConfig(); } @@ -148,10 +157,11 @@ class MockDatabase : public BareosDb { kFindStartTimeWrongString }; explicit MockDatabase(Mode mode) : mode_(mode) {} - SqlFindResult FindLastJobStartTimeForJobAndClient(JobControlRecord* /*jcr*/, - std::string /*job_basename*/, - std::string /*client_name*/, - char* stime) override + SqlFindResult FindLastJobStartTimeForJobAndClient( + JobControlRecord* /*jcr*/, + std::string /*job_basename*/, + std::string /*client_name*/, + char* stime) override { switch (mode_) { case Mode::kFindNoStartTime: diff --git a/core/src/tests/scheduler.cc b/core/src/tests/scheduler.cc index 96a051e6fc1..2d721723e31 100644 --- a/core/src/tests/scheduler.cc +++ b/core/src/tests/scheduler.cc @@ -19,8 +19,15 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) #include "include/bareos.h" #include "gtest/gtest.h" +#else +#include "gtest/gtest.h" +#include "include/bareos.h" +#endif + + #include "dird/dird_globals.h" #include "dird/jcr_private.h" #include "dird/scheduler.h" @@ -62,6 +69,7 @@ static SimulatedTimeAdapter* time_adapter; class SchedulerTest : public ::testing::Test { void SetUp() override { + OSDependentInit(); std::unique_ptr ta = std::make_unique(); time_adapter = ta.get(); @@ -83,7 +91,7 @@ TEST_F(SchedulerTest, terminate) InitMsg(NULL, NULL); /* initialize message handler */ std::string path_to_config_file = - std::string(PROJECT_SOURCE_DIR "/src/tests/configs/scheduler-hourly"); + std::string(RELATIVE_PROJECT_SOURCE_DIR "/configs/scheduler-hourly"); my_config = InitDirConfig(path_to_config_file.c_str(), M_ERROR_TERM); ASSERT_TRUE(my_config); @@ -105,7 +113,7 @@ TEST_F(SchedulerTest, system_time_source) s.SleepFor(std::chrono::seconds(1)); time_t end = s.SystemTime(); EXPECT_GT(end - start, 0); - EXPECT_LT(end - start, 2); + EXPECT_LT(end - start, 3); } TEST_F(SchedulerTest, system_time_source_canceled) @@ -177,7 +185,7 @@ TEST_F(SchedulerTest, hourly) if (debug) { std::cout << "Start test" << std::endl; } std::string path_to_config_file{ - std::string(PROJECT_SOURCE_DIR "/src/tests/configs/scheduler-hourly")}; + std::string(RELATIVE_PROJECT_SOURCE_DIR "/configs/scheduler-hourly")}; my_config = InitDirConfig(path_to_config_file.c_str(), M_ERROR_TERM); ASSERT_TRUE(my_config); @@ -235,7 +243,7 @@ TEST_F(SchedulerTest, on_time) if (debug) { std::cout << "Start test" << std::endl; } std::string path_to_config_file{ - std::string(PROJECT_SOURCE_DIR "/src/tests/configs/scheduler-on-time")}; + std::string(RELATIVE_PROJECT_SOURCE_DIR "/configs/scheduler-on-time")}; my_config = InitDirConfig(path_to_config_file.c_str(), M_ERROR_TERM); ASSERT_TRUE(my_config); @@ -274,7 +282,7 @@ TEST_F(SchedulerTest, add_job_with_no_run_resource_to_queue) if (debug) { std::cout << "Start test" << std::endl; } std::string path_to_config_file{std::string( - PROJECT_SOURCE_DIR "/src/tests/configs/bareos-configparser-tests")}; + RELATIVE_PROJECT_SOURCE_DIR "/configs/bareos-configparser-tests")}; my_config = InitDirConfig(path_to_config_file.c_str(), M_ERROR_TERM); ASSERT_TRUE(my_config); diff --git a/core/src/tests/scheduler_job_item_queue.cc b/core/src/tests/scheduler_job_item_queue.cc index 2881ea92514..236325ce767 100644 --- a/core/src/tests/scheduler_job_item_queue.cc +++ b/core/src/tests/scheduler_job_item_queue.cc @@ -19,7 +19,14 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" #include "gtest/gtest.h" +#else +#include "gtest/gtest.h" +#include "include/bareos.h" +#endif + #include "dird/dird_globals.h" #include "dird/scheduler.h" #include "dird/scheduler_job_item_queue.h" diff --git a/core/src/tests/sd_reservation.cc b/core/src/tests/sd_reservation.cc index df170dcc042..4b6680cda83 100644 --- a/core/src/tests/sd_reservation.cc +++ b/core/src/tests/sd_reservation.cc @@ -21,12 +21,19 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else +#include "gtest/gtest.h" +#include "include/bareos.h" +#endif + + #include #include #define STORAGE_DAEMON 1 -#include "gtest/gtest.h" -#include "include/bareos.h" #include "include/jcr.h" #include "lib/crypto_cache.h" #include "lib/edit.h" @@ -62,11 +69,11 @@ class ReservationTest : public ::testing::Test { void ReservationTest::SetUp() { - InitMsg(NULL, NULL); OSDependentInit(); + InitMsg(NULL, NULL); /* configfile is a global char* from stored_globals.h */ - configfile = strdup(PROJECT_SOURCE_DIR "/src/tests/configs/sd_reservation/"); + configfile = strdup(RELATIVE_PROJECT_SOURCE_DIR "/configs/sd_reservation/"); my_config = InitSdConfig(configfile, M_ERROR_TERM); ParseSdConfig(configfile, M_ERROR_TERM); /* diff --git a/core/src/tests/show_cmd_available_resources_equals_config_resources.cc b/core/src/tests/show_cmd_available_resources_equals_config_resources.cc index 2cb7e881453..a479c8448bc 100644 --- a/core/src/tests/show_cmd_available_resources_equals_config_resources.cc +++ b/core/src/tests/show_cmd_available_resources_equals_config_resources.cc @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/parse_conf.h" #include "dird/dird_globals.h" #include "dird/dird_conf.h" diff --git a/core/src/tests/test_acl_entry_syntax.cc b/core/src/tests/test_acl_entry_syntax.cc index 17159e4284d..6473104d7e8 100644 --- a/core/src/tests/test_acl_entry_syntax.cc +++ b/core/src/tests/test_acl_entry_syntax.cc @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/edit.h" POOLMEM* msg = GetPoolMemory(PM_FNAME); diff --git a/core/src/tests/bsock_test.cc b/core/src/tests/test_bsock.cc similarity index 99% rename from core/src/tests/bsock_test.cc rename to core/src/tests/test_bsock.cc index 4c2f8e719f1..8eed313c9cc 100644 --- a/core/src/tests/bsock_test.cc +++ b/core/src/tests/test_bsock.cc @@ -18,11 +18,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else +#include "gtest/gtest.h" +#include "include/bareos.h" +#endif + #include "bsock_test.h" #include "create_resource.h" #include "tests/bareos_test_sockets.h" #include "tests/init_openssl.h" -#include "gtest/gtest.h" #include #include #include @@ -30,7 +37,6 @@ #include #include -#include "include/bareos.h" #include "console/console.h" #include "console/console_conf.h" #include "console/console_globals.h" @@ -64,6 +70,7 @@ static std::unique_ptr cons_cons_config; void InitForTest() { + OSDependentInit(); InitOpenSsl(); dir_cons_config.reset( directordaemon::CreateAndInitializeNewConsoleResource()); diff --git a/core/src/tests/test_config_parser_console.cc b/core/src/tests/test_config_parser_console.cc index 011d5ad82eb..de766d52292 100644 --- a/core/src/tests/test_config_parser_console.cc +++ b/core/src/tests/test_config_parser_console.cc @@ -18,21 +18,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/parse_conf.h" #include "console/console_globals.h" #include "console/console_conf.h" namespace console { -TEST(ConfigParser, test_filed_config) +TEST(ConfigParser, test_console_config) { + OSDependentInit(); InitMsg(NULL, NULL); /* initialize message handler */ std::string path_to_config_file = std::string( - PROJECT_SOURCE_DIR "/src/tests/configs/bareos-configparser-tests"); + RELATIVE_PROJECT_SOURCE_DIR "/configs/bareos-configparser-tests"); my_config = InitConsConfig(path_to_config_file.c_str(), M_ERROR_TERM); my_config->ParseConfig(); diff --git a/core/src/tests/test_config_parser_dir.cc b/core/src/tests/test_config_parser_dir.cc index d3c8ab85295..e39289c5a6d 100644 --- a/core/src/tests/test_config_parser_dir.cc +++ b/core/src/tests/test_config_parser_dir.cc @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/parse_conf.h" #include "dird/dird_globals.h" #include "dird/dird_conf.h" @@ -29,10 +34,11 @@ namespace directordaemon { TEST(ConfigParser_Dir, bareos_configparser_tests) { + OSDependentInit(); InitMsg(NULL, NULL); /* initialize message handler */ std::string path_to_config_file = std::string( - PROJECT_SOURCE_DIR "/src/tests/configs/bareos-configparser-tests"); + RELATIVE_PROJECT_SOURCE_DIR "/configs/bareos-configparser-tests"); my_config = InitDirConfig(path_to_config_file.c_str(), M_ERROR_TERM); my_config->ParseConfig(); @@ -46,10 +52,11 @@ TEST(ConfigParser_Dir, bareos_configparser_tests) TEST(ConfigParser_Dir, runscript_test) { + OSDependentInit(); InitMsg(NULL, NULL); /* initialize message handler */ std::string path_to_config_file = std::string( - PROJECT_SOURCE_DIR "/src/tests/configs/runscript-tests/bareos-dir.conf"); + RELATIVE_PROJECT_SOURCE_DIR "/configs/runscript-tests/bareos-dir.conf"); my_config = InitDirConfig(path_to_config_file.c_str(), M_ERROR_TERM); my_config->ParseConfig(); diff --git a/core/src/tests/test_config_parser_fd.cc b/core/src/tests/test_config_parser_fd.cc index 36f9dc84bd4..de2055f0c5e 100644 --- a/core/src/tests/test_config_parser_fd.cc +++ b/core/src/tests/test_config_parser_fd.cc @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/parse_conf.h" #include "filed/filed_globals.h" #include "filed/filed_conf.h" @@ -29,10 +34,11 @@ namespace filedaemon { TEST(ConfigParser, test_filed_config) { + OSDependentInit(); InitMsg(NULL, NULL); /* initialize message handler */ std::string path_to_config_file = std::string( - PROJECT_SOURCE_DIR "/src/tests/configs/bareos-configparser-tests"); + RELATIVE_PROJECT_SOURCE_DIR "/configs/bareos-configparser-tests"); my_config = InitFdConfig(path_to_config_file.c_str(), M_ERROR_TERM); ASSERT_TRUE(my_config->ParseConfig()); diff --git a/core/src/tests/test_config_parser_sd.cc b/core/src/tests/test_config_parser_sd.cc index 4ab45b117e9..51826a7a0f8 100644 --- a/core/src/tests/test_config_parser_sd.cc +++ b/core/src/tests/test_config_parser_sd.cc @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/parse_conf.h" #include "stored/stored_globals.h" #include "stored/stored_conf.h" @@ -29,10 +34,11 @@ namespace storagedaemon { TEST(ConfigParser, test_stored_config) { + OSDependentInit(); InitMsg(NULL, NULL); /* initialize message handler */ std::string path_to_config_file = std::string( - PROJECT_SOURCE_DIR "/src/tests/configs/bareos-configparser-tests"); + RELATIVE_PROJECT_SOURCE_DIR "/configs/bareos-configparser-tests"); my_config = InitSdConfig(path_to_config_file.c_str(), M_ERROR_TERM); ParseSdConfig(configfile, M_ERROR_TERM); diff --git a/core/src/tests/test_crc32.cc b/core/src/tests/test_crc32.cc index 241e4a573a0..163dc71436a 100644 --- a/core/src/tests/test_crc32.cc +++ b/core/src/tests/test_crc32.cc @@ -1,7 +1,7 @@ /** BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "stored/crc32/crc32.h" const size_t len = 63 * 1024; @@ -34,9 +39,9 @@ TEST(crc32, internal) TEST(crc32, internal_spd) { uint8_t* buf = static_cast(malloc(len)); - std::fill(buf, buf+len, 0xbb); + std::fill(buf, buf + len, 0xbb); - for(int i=0;i<10000;i++) { + for (int i = 0; i < 10000; i++) { ASSERT_EQ(0xbc003c2c, crc32_fast(buf, len)); } free(buf); diff --git a/core/src/tests/test_dir_plugins.cc b/core/src/tests/test_dir_plugins.cc index 334d4c0ad49..710cf698e91 100644 --- a/core/src/tests/test_dir_plugins.cc +++ b/core/src/tests/test_dir_plugins.cc @@ -26,8 +26,14 @@ /** @file * BAREOS pluginloader */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "dird/dird.h" #include "dird/dird_globals.h" #include "dird/dir_plugins.h" diff --git a/core/src/tests/test_fd_plugins.cc b/core/src/tests/test_fd_plugins.cc index 8cd32c55fd7..f08ca087f93 100644 --- a/core/src/tests/test_fd_plugins.cc +++ b/core/src/tests/test_fd_plugins.cc @@ -31,9 +31,14 @@ * @file * Bareos pluginloader */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" - #include "include/bareos.h" +#endif + #include "filed/filed.h" #include "filed/filed_globals.h" #include "filed/accurate.h" diff --git a/core/src/tests/test_fileindex_list.cc b/core/src/tests/test_fileindex_list.cc index 0a35f3564f0..01e22744d3c 100644 --- a/core/src/tests/test_fileindex_list.cc +++ b/core/src/tests/test_fileindex_list.cc @@ -18,8 +18,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif #include "dird/bsr.h" diff --git a/core/src/tests/test_is_name_valid.cc b/core/src/tests/test_is_name_valid.cc index 16304c8775d..cd7f2bbf0ab 100644 --- a/core/src/tests/test_is_name_valid.cc +++ b/core/src/tests/test_is_name_valid.cc @@ -19,8 +19,15 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + + #include "lib/edit.h" POOLMEM* msg = GetPoolMemory(PM_FNAME); diff --git a/core/src/tests/lib_tests_output_formatter.cc b/core/src/tests/test_output_formatter.cc similarity index 86% rename from core/src/tests/lib_tests_output_formatter.cc rename to core/src/tests/test_output_formatter.cc index 74ce96defaa..f2790c5174b 100644 --- a/core/src/tests/lib_tests_output_formatter.cc +++ b/core/src/tests/test_output_formatter.cc @@ -1,7 +1,7 @@ /* BAREOS® - Backup Archiving REcovery Open Sourced - Copyright (C) 2018-2018 Bareos GmbH & Co. KG + Copyright (C) 2018-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/output_formatter.h" TEST(output_formatter, constructor_destructor) {} diff --git a/core/src/tests/test_sd_plugins.cc b/core/src/tests/test_sd_plugins.cc index df9c0604888..ab1c03aa28c 100644 --- a/core/src/tests/test_sd_plugins.cc +++ b/core/src/tests/test_sd_plugins.cc @@ -22,8 +22,15 @@ */ /* originally Kern Sibbald, October 2007 */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + + #include "stored/stored.h" #include "stored/stored_globals.h" #include "stored/sd_plugins.h" diff --git a/core/src/tests/test_setdebug.cc b/core/src/tests/test_setdebug.cc index 71599421e1e..91ed2fa3354 100644 --- a/core/src/tests/test_setdebug.cc +++ b/core/src/tests/test_setdebug.cc @@ -20,9 +20,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "lib/parse_conf.h" #include "dird/dird_globals.h" #include "dird/dird_conf.h" @@ -64,8 +69,9 @@ static void DoStorageSetdebug(UaContext* ua, void SetdebugTest::SetUpTestCase() { + OSDependentInit(); std::string path_to_config_file = std::string( - PROJECT_SOURCE_DIR "/src/tests/configs/bareos-configparser-tests"); + RELATIVE_PROJECT_SOURCE_DIR "/configs/bareos-configparser-tests"); my_config = InitDirConfig(path_to_config_file.c_str(), M_ERROR_TERM); ASSERT_TRUE(my_config); ASSERT_TRUE(my_config->ParseConfig()); diff --git a/core/src/tests/thread_list.cc b/core/src/tests/thread_list.cc index fce0e663782..e6e99004f1b 100644 --- a/core/src/tests/thread_list.cc +++ b/core/src/tests/thread_list.cc @@ -19,7 +19,14 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" #include "gtest/gtest.h" +#else +#include "gtest/gtest.h" +#endif + + #include "lib/thread_list.h" #include "include/make_unique.h" diff --git a/core/src/tests/thread_specific_data.cc b/core/src/tests/thread_specific_data.cc index 8e999a8f2f7..77c9bbc57b0 100644 --- a/core/src/tests/thread_specific_data.cc +++ b/core/src/tests/thread_specific_data.cc @@ -18,9 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" +#endif + #include "include/jcr.h" #include "include/make_unique.h" #include "lib/thread_specific_data.h" diff --git a/core/src/tests/timer_thread.cc b/core/src/tests/timer_thread.cc index 6c5294c1af8..3d3ffbd9ca2 100644 --- a/core/src/tests/timer_thread.cc +++ b/core/src/tests/timer_thread.cc @@ -19,10 +19,15 @@ 02110-1301, USA. */ +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" #include "include/bareos.h" -#include "lib/timer_thread.h" +#endif +#include "lib/timer_thread.h" #include class TimerThreadTest : public ::testing::Test { @@ -154,19 +159,22 @@ TEST_F(TimerThreadTest, register_twice_fails) TimerThread::UnregisterTimer(timer_item); } -TEST_F(TimerThreadTest, should_shutdown_with_timer_thread_guard) -{ - OneShotTimerOff(); - SetUp(); - - /* This test does not shutdown the timer thread during tear down, - * as a matter of fact the timer thread keeps running and will be - * stopped by the timer thread guard. */ - - stop_timer_thread_on_tear_down = false; - // use debugger to check c++ library shut-down -} - +// Disabled the following test as shows undefined behaviour on wine: +// Sometimes the test successfully passes but the executable does not exit. +// +// TEST_F(TimerThreadTest, should_shutdown_with_timer_thread_guard) +//{ +// OneShotTimerOff(); +// SetUp(); +// +// /* This test does not shutdown the timer thread during tear down, +// * as a matter of fact the timer thread keeps running and will be +// * stopped by the timer thread guard. */ +// +// stop_timer_thread_on_tear_down = false; +// // use debugger to check c++ library shut-down +//} +// // TEST_F(TimerThreadTest, just_run_timer_thread) //{ // while (1) continue; diff --git a/core/src/tests/version_strings.cc b/core/src/tests/version_strings.cc index 67f4d38361f..9e60632b0b3 100644 --- a/core/src/tests/version_strings.cc +++ b/core/src/tests/version_strings.cc @@ -19,11 +19,17 @@ 02110-1301, USA. */ #include -#include -#include -#include #include + +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" +#include "include/bareos.h" +#endif + + #include "lib/version.h" TEST(version_strings, version) @@ -97,11 +103,13 @@ TEST(version_strings, dates) EXPECT_EQ(year, atoi(kBareosVersionStrings.ProgDateTime)); // construct shortdate from date and check if it matches - std::string ref_short_date = date.substr(0,2) + date.substr(3,3) + date.substr(date_len -2, 2); + std::string ref_short_date = + date.substr(0, 2) + date.substr(3, 3) + date.substr(date_len - 2, 2); EXPECT_EQ(short_date, ref_short_date); } -TEST(version_strings, messages) { +TEST(version_strings, messages) +{ // just make sure these strings contain at least some text EXPECT_GT(strlen(kBareosVersionStrings.BinaryInfo), 10); EXPECT_GT(strlen(kBareosVersionStrings.ServicesMessage), 10); diff --git a/core/src/tests/watchdog_timer.cc b/core/src/tests/watchdog_timer.cc index e011bafc94d..7ba423e9ba4 100644 --- a/core/src/tests/watchdog_timer.cc +++ b/core/src/tests/watchdog_timer.cc @@ -18,8 +18,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#if defined(HAVE_MINGW) +#include "include/bareos.h" +#include "gtest/gtest.h" +#else #include "gtest/gtest.h" +#include "include/bareos.h" +#endif + #include "lib/btimers.h" #include "lib/bsignal.h" #include "lib/watchdog_timer.h" diff --git a/core/src/tools/CMakeLists.txt b/core/src/tools/CMakeLists.txt index ff0957cb613..bf7513127e9 100644 --- a/core/src/tools/CMakeLists.txt +++ b/core/src/tools/CMakeLists.txt @@ -17,10 +17,10 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -SET(BSMTPSRCS bsmtp.cc) -IF(HAVE_WIN32) - LIST(APPEND BSMTPSRCS ../win32/tools/bsmtpres.rc) -ENDIF() +set(BSMTPSRCS bsmtp.cc) +if(HAVE_WIN32) + list(APPEND BSMTPSRCS ../win32/tools/bsmtpres.rc) +endif() add_executable(bsmtp ${BSMTPSRCS}) target_link_libraries(bsmtp bareos ${JANSSON_LIBRARIES}) @@ -30,47 +30,46 @@ target_link_libraries(drivetype bareos bareosfind ${JANSSON_LIBRARIES}) add_executable(fstype fstype.cc) target_link_libraries(fstype bareos bareosfind ${JANSSON_LIBRARIES}) -SET(BREGEXSRCS bregex.cc) -IF(HAVE_WIN32) - LIST(APPEND BREGEXSRCS ../win32/tools/bregexres.rc) -ENDIF() +set(BREGEXSRCS bregex.cc) +if(HAVE_WIN32) + list(APPEND BREGEXSRCS ../win32/tools/bregexres.rc) +endif() add_executable(bregex ${BREGEXSRCS}) target_link_libraries(bregex bareos bareosfind ${JANSSON_LIBRARIES}) -SET(BWILDSRCS bwild.cc) -IF(HAVE_WIN32) - LIST(APPEND BWILDSRCS ../win32/tools/bwildres.rc) -ENDIF() +set(BWILDSRCS bwild.cc) +if(HAVE_WIN32) + list(APPEND BWILDSRCS ../win32/tools/bwildres.rc) +endif() add_executable(bwild ${BWILDSRCS}) target_link_libraries(bwild bareos ${JANSSON_LIBRARIES}) add_executable(bscrypto bscrypto.cc) target_link_libraries(bscrypto bareos ${JANSSON_LIBRARIES}) +if(NOT HAVE_WIN32) -IF(NOT HAVE_WIN32) + add_executable(btestls btestls.cc) + target_link_libraries(btestls bareosfind bareos ${JANSSON_LIBRARIES}) - add_executable(btestls btestls.cc) - target_link_libraries(btestls bareosfind bareos ${JANSSON_LIBRARIES}) + add_executable(bpluginfo bpluginfo.cc) + target_link_libraries(bpluginfo bareos ${DL_LIBRARIES} ${JANSSON_LIBRARIES}) - add_executable(bpluginfo bpluginfo.cc) - target_link_libraries(bpluginfo bareos ${DL_LIBRARIES} ${JANSSON_LIBRARIES}) + add_executable(timelimit timelimit.cc) +endif() - add_executable(timelimit timelimit.cc) -ENDIF() +set(TOOLS_BIN bsmtp bwild bregex) -set (TOOLS_BIN bsmtp bwild bregex) +set(TOOLS_SBIN bscrypto bwild bregex) -set (TOOLS_SBIN bscrypto bwild bregex) +if(NOT HAVE_WIN32) + list(APPEND TOOLS_BIN timelimit) + list(APPEND TOOLS_SBIN bpluginfo timelimit btestls) +endif() -IF(NOT HAVE_WIN32) - LIST(APPEND TOOLS_BIN timelimit) - LIST(APPEND TOOLS_SBIN bpluginfo timelimit btestls) -ENDIF() - -INSTALL(TARGETS ${TOOLS_BIN} DESTINATION "${bindir}") -INSTALL(TARGETS ${TOOLS_SBIN} DESTINATION "${sbindir}") +install(TARGETS ${TOOLS_BIN} DESTINATION "${bindir}") +install(TARGETS ${TOOLS_SBIN} DESTINATION "${sbindir}") # install bsmtp for non-root directors -INSTALL(TARGETS bsmtp DESTINATION "${bindir}") -INSTALL(TARGETS bsmtp DESTINATION "${sbindir}") +install(TARGETS bsmtp DESTINATION "${bindir}") +install(TARGETS bsmtp DESTINATION "${sbindir}") diff --git a/core/src/win32/compat/compat.cc b/core/src/win32/compat/compat.cc index c52c61355f3..2e57e6f318f 100644 --- a/core/src/win32/compat/compat.cc +++ b/core/src/win32/compat/compat.cc @@ -1689,6 +1689,10 @@ static int stat2(const char* filename, struct stat* sb) OPEN_EXISTING, 0, NULL); FreePoolMemory(win32_fname); + } else { + Emsg0(M_FATAL, 0, + _("p_GetFileAttributesW and p_GetFileAttributesA undefined. " + "probably missing OSDependentInit() call\n")); } if (attr == (DWORD)-1) { @@ -1762,6 +1766,9 @@ int stat(const char* filename, struct stat* sb) goto bail_out; } } else { + Emsg0(M_FATAL, 0, + _("p_GetFileAttributesExW and p_GetFileAttributesExA undefined. " + "probably missing OSDependentInit() call\n")); goto bail_out; } diff --git a/core/src/win32/compat/include/compat.h b/core/src/win32/compat/include/compat.h index de2dae088ad..4da89732963 100644 --- a/core/src/win32/compat/include/compat.h +++ b/core/src/win32/compat/include/compat.h @@ -2,6 +2,7 @@ BAREOS® - Backup Archiving REcovery Open Sourced Copyright (C) 2004-2011 Free Software Foundation Europe e.V. + Copyright (C) 2019-2019 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -58,31 +59,7 @@ #define _declspec __declspec #endif -typedef struct _REPARSE_DATA_BUFFER { - DWORD ReparseTag; - WORD ReparseDataLength; - WORD Reserved; - union { - struct { - WORD SubstituteNameOffset; - WORD SubstituteNameLength; - WORD PrintNameOffset; - WORD PrintNameLength; - ULONG Flags; - WCHAR PathBuffer[1]; - } SymbolicLinkReparseBuffer; - struct { - WORD SubstituteNameOffset; - WORD SubstituteNameLength; - WORD PrintNameOffset; - WORD PrintNameLength; - WCHAR PathBuffer[1]; - } MountPointReparseBuffer; - struct { - BYTE DataBuffer[1]; - } GenericReparseBuffer; - } DUMMYUNIONNAME; -} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; +#include #include @@ -110,7 +87,6 @@ typedef UINT32 mode_t; typedef INT32 ssize_t; typedef UINT32 size_t; #define HAVE_SSIZE_T 1 - #endif /* HAVE_MINGW */ struct dirent { @@ -215,6 +191,9 @@ struct stat { #define S_ISVTX 001000 #define S_ISSOCK(x) 0 +#define _S_IFDIR S_IFDIR +#define _stat stat + #if __STDC__ #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY @@ -335,7 +314,7 @@ int stat(const char*, struct stat*); #if defined(__cplusplus) #define access _access extern "C" _CRTIMP int __cdecl _access(const char*, int); -int execvp(const char*, char* []); +int execvp(const char*, char*[]); extern "C" void* __cdecl _alloca(size_t); #endif #endif // HAVE_MINGW diff --git a/docs/manuals/CMakeLists.txt b/docs/manuals/CMakeLists.txt index b4cfc11684f..0d4bbadd5c2 100644 --- a/docs/manuals/CMakeLists.txt +++ b/docs/manuals/CMakeLists.txt @@ -17,86 +17,126 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -cmake_minimum_required( VERSION 3.0 ) +cmake_minimum_required(VERSION 3.0) project(bareos-docs NONE) -###### commands building json files ###### +# commands building json files ###### add_custom_command( - OUTPUT ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-dir-config-schema.json + OUTPUT + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-dir-config-schema.json COMMAND bareos-dir -xs >/dev/null - COMMAND bareos-dir -xs >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-dir-config-schema.json - COMMAND sed --in-place --expression="/\\\"version\\\":/d" ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-dir-config-schema.json - DEPENDS $<$:bareos-dir> ) + COMMAND + bareos-dir -xs + >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-dir-config-schema.json + COMMAND + sed --in-place --expression="/\\\"version\\\":/d" + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-dir-config-schema.json + DEPENDS $<$:bareos-dir> +) add_custom_command( - OUTPUT ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-sd-config-schema.json + OUTPUT + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-sd-config-schema.json COMMAND bareos-sd -xs >/dev/null - COMMAND bareos-sd -xs >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-sd-config-schema.json - COMMAND sed --in-place --expression="/\\\"version\\\":/d" ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-sd-config-schema.json - DEPENDS $<$:bareos-sd> ) + COMMAND + bareos-sd -xs + >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-sd-config-schema.json + COMMAND + sed --in-place --expression="/\\\"version\\\":/d" + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-sd-config-schema.json + DEPENDS $<$:bareos-sd> +) add_custom_command( - OUTPUT ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-fd-config-schema.json + OUTPUT + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-fd-config-schema.json COMMAND bareos-fd -xs >/dev/null - COMMAND bareos-fd -xs >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-fd-config-schema.json - COMMAND sed --in-place --expression="/\\\"version\\\":/d" ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-fd-config-schema.json - DEPENDS $<$:bareos-fd> ) + COMMAND + bareos-fd -xs + >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-fd-config-schema.json + COMMAND + sed --in-place --expression="/\\\"version\\\":/d" + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-fd-config-schema.json + DEPENDS $<$:bareos-fd> +) add_custom_command( - OUTPUT ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bconsole-config-schema.json + OUTPUT + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bconsole-config-schema.json COMMAND bconsole -xs >/dev/null - COMMAND bconsole -xs >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bconsole-config-schema.json - COMMAND sed --in-place --expression="/\\\"version\\\":/d" ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bconsole-config-schema.json - DEPENDS $<$:bconsole> ) + COMMAND + bconsole -xs + >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bconsole-config-schema.json + COMMAND + sed --in-place --expression="/\\\"version\\\":/d" + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bconsole-config-schema.json + DEPENDS $<$:bconsole> +) add_custom_command( - OUTPUT ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-tray-monitor-config-schema.json + OUTPUT + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-tray-monitor-config-schema.json COMMAND bareos-tray-monitor -xs >/dev/null - COMMAND bareos-tray-monitor -xs >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-tray-monitor-config-schema.json - COMMAND sed --in-place --expression="/\\\"version\\\":/d" ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-tray-monitor-config-schema.json - DEPENDS $<$:bareos-tray-monitor> ) - -set( AUTOGENERATED_RESOURCE_DESCRIPTION_JSON_FILES - ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-dir-config-schema.json - ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-sd-config-schema.json - ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-fd-config-schema.json - ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bconsole-config-schema.json - ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-tray-monitor-config-schema.json ) - -IF(${docs-build-json}) - set( CLEAN_JSON_FILES rm -f ${PROJECT_SOURCE_DIR}/source/include/autogenerated/*.json ) -ENDIF() - -###### target: clean-docs ###### -add_custom_target( clean-docs + COMMAND + bareos-tray-monitor -xs + >${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-tray-monitor-config-schema.json + COMMAND + sed --in-place --expression="/\\\"version\\\":/d" + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-tray-monitor-config-schema.json + DEPENDS $<$:bareos-tray-monitor> +) + +set(AUTOGENERATED_RESOURCE_DESCRIPTION_JSON_FILES + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-dir-config-schema.json + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-sd-config-schema.json + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-fd-config-schema.json + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bconsole-config-schema.json + ${PROJECT_SOURCE_DIR}/source/include/autogenerated/bareos-tray-monitor-config-schema.json +) + +if(${docs-build-json}) + set(CLEAN_JSON_FILES + rm -f ${PROJECT_SOURCE_DIR}/source/include/autogenerated/*.json + ) +endif() + +# target: clean-docs ###### +add_custom_target( + clean-docs COMMAND ${CLEAN_JSON_FILES} - COMMAND rm -f ${PROJECT_SOURCE_DIR}/source/include/autogenerated/*.inc - COMMAND rm -rf ${PROJECT_BINARY_DIR}/BareosMainReference ) - -###### target: check-git ###### -# To prevent documentation to be built out of sync with the actual binaries, -# this target checks if the generated json files differ from the ones in the repository. - -add_custom_target ( check-git - COMMAND git diff --exit-code --stat=80 ${PROJECT_SOURCE_DIR}/source/include/autogenerated + COMMAND rm -f ${PROJECT_SOURCE_DIR}/source/include/autogenerated/*.inc + COMMAND rm -rf ${PROJECT_BINARY_DIR}/BareosMainReference +) + +# target: check-git ###### To prevent documentation to be built out of sync with +# the actual binaries, this target checks if the generated json files differ +# from the ones in the repository. + +add_custom_target( + check-git + COMMAND git diff --exit-code --stat=80 + ${PROJECT_SOURCE_DIR}/source/include/autogenerated DEPENDS ${AUTOGENERATED_RESOURCE_DESCRIPTION_JSON_FILES} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - COMMENT "Comparing json files in \"${PROJECT_SOURCE_DIR}/source/include/autogenerated\" with git repo" ) - - -set( SPHINX_OPTS $ENV{SPHINX_OPTS} ) -set( SPHINX_COMMAND sphinx-build ) -set( SPHINX_BUILDDIR ${PROJECT_BINARY_DIR}/BareosMainReference ) -set( SPHINX_SOURCE_DIR ${PROJECT_SOURCE_DIR}/source ) - -IF(${docs-only}) - set(DOCS_ALL ALL) #this enables "make docs" by just typing "make" -ENDIF() - -###### target: docs ###### -add_custom_target( docs ${DOCS_ALL} - COMMAND ${SPHINX_COMMAND} -M html "${SPHINX_SOURCE_DIR}" "${SPHINX_BUILDDIR}" "${SPHINX_OPTS}" + COMMENT + "Comparing json files in \"${PROJECT_SOURCE_DIR}/source/include/autogenerated\" with git repo" +) + +set(SPHINX_OPTS $ENV{SPHINX_OPTS}) +set(SPHINX_COMMAND sphinx-build) +set(SPHINX_BUILDDIR ${PROJECT_BINARY_DIR}/BareosMainReference) +set(SPHINX_SOURCE_DIR ${PROJECT_SOURCE_DIR}/source) + +if(${docs-only}) + set(DOCS_ALL ALL) # this enables "make docs" by just typing "make" +endif() + +# target: docs ###### +add_custom_target( + docs ${DOCS_ALL} + COMMAND ${SPHINX_COMMAND} -M html "${SPHINX_SOURCE_DIR}" "${SPHINX_BUILDDIR}" + "${SPHINX_OPTS}" DEPENDS $<$:clean-docs> - DEPENDS check-git ) - + DEPENDS check-git +) diff --git a/get_version.cmake b/get_version.cmake index 0297d83fa56..738b282bf0d 100644 --- a/get_version.cmake +++ b/get_version.cmake @@ -18,9 +18,10 @@ cmake_minimum_required(VERSION 3.0) if(NOT DEFINED VERSION_STRING) - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" - "${CMAKE_CURRENT_LIST_DIR}/core/cmake" - "${CMAKE_CURRENT_LIST_DIR}/webui/cmake") + set(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_LIST_DIR}/cmake" "${CMAKE_CURRENT_LIST_DIR}/core/cmake" + "${CMAKE_CURRENT_LIST_DIR}/webui/cmake" + ) find_package(Git QUIET) include(BareosVersionFromGit) @@ -32,7 +33,8 @@ if(NOT DEFINED VERSION_STRING) else() message( FATAL_ERROR - "BareosVersion.cmake not found and no git version available.") + "BareosVersion.cmake not found and no git version available." + ) endif() endif() endif() diff --git a/regress/CTestCustom.cmake b/regress/CTestCustom.cmake index bbbabe9d726..2a7bb46f672 100644 --- a/regress/CTestCustom.cmake +++ b/regress/CTestCustom.cmake @@ -1,25 +1,25 @@ -SET(CTEST_CUSTOM_ERROR_EXCEPTION - ${CTEST_CUSTOM_ERROR_EXCEPTION} - "ERROR: *role \".*\" already exists" - "ERROR: *database \".*\" already exists" - "ERROR: *table \".*\" does not exist" - "NOTICE: *table \".*\" does not exist, skipping" - "NOTICE: .*will create implicit sequence" - "NOTICE: .*will create implicit index" - ) +set(CTEST_CUSTOM_ERROR_EXCEPTION + ${CTEST_CUSTOM_ERROR_EXCEPTION} + "ERROR: *role \".*\" already exists" + "ERROR: *database \".*\" already exists" + "ERROR: *table \".*\" does not exist" + "NOTICE: *table \".*\" does not exist, skipping" + "NOTICE: .*will create implicit sequence" + "NOTICE: .*will create implicit index" +) -SET(CTEST_CUSTOM_WARNING_EXCEPTION - ${CTEST_CUSTOM_WARNING_EXCEPTION} - "libtool: install: warning: relinking .*" - "libtool: link: warning: .* seems to be moved" - "libtool: relink: warning: .* seems to be moved" - "libtool: warning: relinking .*" - ) +set(CTEST_CUSTOM_WARNING_EXCEPTION + ${CTEST_CUSTOM_WARNING_EXCEPTION} + "libtool: install: warning: relinking .*" + "libtool: link: warning: .* seems to be moved" + "libtool: relink: warning: .* seems to be moved" + "libtool: warning: relinking .*" +) -SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 100000) -SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1048576) -SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 500) +set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 100000) +set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1048576) +set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 500) -SET (CTEST_NIGHTLY_START_TIME "23:00:00 CET") +set(CTEST_NIGHTLY_START_TIME "23:00:00 CET") -SET(CTEST_CUSTOM_PRE_TEST scripts/pretest) +set(CTEST_CUSTOM_PRE_TEST scripts/pretest) diff --git a/regress/configs/BASE/tls/bareos-ca.pem b/regress/configs/BASE/tls/bareos-ca.pem index af7ca8cdabe..23c4d398121 100644 --- a/regress/configs/BASE/tls/bareos-ca.pem +++ b/regress/configs/BASE/tls/bareos-ca.pem @@ -1,31 +1,35 @@ -----BEGIN CERTIFICATE----- -MIIFUTCCAzmgAwIBAgIBATANBgkqhkiG9w0BAQUFADAyMRwwGgYDVQQKDBNCYXJl -b3MgR21iSCAmIENvIEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwHhcNMTYwNDA2MTYy -NjAwWhcNMjYwNDA2MTYyNjAwWjAyMRwwGgYDVQQKDBNCYXJlb3MgR21iSCAmIENv -IEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDu4Gmxg0AC8UfW2EHflJnzpIdqW7K574XjBDjR3PeuplGiMl41zlLn -Lh0/7XzJilrs29hslE15t9Vt6hzijjQEYWjryhP0lkbCqQxcLVJD3df3wxRE2Dn9 -5IKHJqAEgosTBuCTpPpSnEt1BjYufroKJl+KbJejg4vK9XIqUYCVCmyoQyTHVBo0 -XgsFYGIMMlXs+P0rVddgBSGioutYG8+uy0yY5knoK38NuG3uSImeHjnhbp6MkaKh -ytPUMtkjLjdrKTQMetxZTlBNDB9alknpZGDMfMG9SgQr3Kr+huENz87+FO8uB+wE -VABrFWkwnvOZ7VcWEZmMnkxzGdZlZmMbvSEhKXULFVfRnMq6vVvtveilXnIhoCdN -0eqrfXJdST5ZwzMr+Kf+PBKDnjc7u+A0Iff9C+wnIRq+4wJJh8wWy3qh/zYxfSQ4 -eaQKmWRA/57RuWdTwENIGlO+68WIHXFK2JoLBSNesaBwxE756qSInbcqZTHBL7sl -XGd0n8v2rfJFtblZeO7WftT+33oW8+4il9waXvi/ZifZbH/3LkywK0X3kTX8YS68 -wmFdXiCvXCnLoMZwA3LEJLxLl2phDM1IsF55UTmGS0qrJY/ZhzfMQLKTzKItERHK -Dwnbzzjtv+yDTnAPe7N2JziIydnl8ryYERRQOsYxaIlBdX3VVzKtRwIDAQABo3Iw -cDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHtrHfhwAGi1cEXd3wMXpb9QN5 -YDALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMB4GCWCGSAGG+EIBDQQR -Fg94Y2EgY2VydGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADggIBAKg2SX6ABaMCShGZ -4TgQi53X/Xs0qUAOl9PQERyAzi7ji2zjvPfft3wdLm7GhGqlGnmFlYnZskw93vzH -klp9JLuIOK6w9XymE0kGXxD4p08YD+JlvOfCCjAEy0Vamu8TRIL07xh3eims7NLc -GxSVeLNAP44KyCkrBMXzPIGAe5JgnvYVvdL/bXt0pT23+VZhymH0OLBuN351YvNI -eU7EMe6mmzq8fYH4PWdGdja9qul6HuJHCu3Pz2dGUAUGjpWfQZiBH0ENxB4vkWQZ -JPdusxRY60TM/WpaHkHG8KGloyl5NrbM8NQAnPGatXAF9U9zMpIaFUbnHE1zNNy8 -07hi3zXBexo2FmK6DjdEUjFBBXiRHValr8zPkzoN9cagBiJChxSO/lxEQqTOlDTN -ucp6FyY/P3AOJzO8br4ywVR5Su0HsxmBeq2iRLYDLxbPLSPaVDhOmQqKqO/1GC2L -sLwvhWcZK+0GDLx5JRvpN6l1XpefS7j2UFitmWBa4aH8+kwk1psrx+IaIMzuUPhY -zHVi0TzJVHKz34CCTq6IJ7AUkSqLDLTd/78NRlCYChK1gYe5tb+X6oUObP/fStVg -4IJMNd8gSgBgreD/EKOPmFOZKg4EOEI74AriesEZYyAVo6cq6N0BAUW99KVr+wlK -kWKac0RVbyC5wLiMY4xcSPt0moek +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 +OOq2UNo5te7sLYY= -----END CERTIFICATE----- diff --git a/regress/configs/BASE/tls/bareos-dir.bareos.org-cert.pem b/regress/configs/BASE/tls/bareos-dir.bareos.org-cert.pem index 2d83de46cd6..fdc6bbfb9c2 100644 --- a/regress/configs/BASE/tls/bareos-dir.bareos.org-cert.pem +++ b/regress/configs/BASE/tls/bareos-dir.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -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 +DaKtV8dOdw== -----END CERTIFICATE----- diff --git a/regress/configs/BASE/tls/bareos-dir.bareos.org-key.pem b/regress/configs/BASE/tls/bareos-dir.bareos.org-key.pem index 330e72c198c..707be107519 100644 --- a/regress/configs/BASE/tls/bareos-dir.bareos.org-key.pem +++ b/regress/configs/BASE/tls/bareos-dir.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/regress/configs/BASE/tls/bareos-sd1.bareos.org-cert.pem b/regress/configs/BASE/tls/bareos-sd1.bareos.org-cert.pem index 2e387677036..64ae6d75113 100644 --- a/regress/configs/BASE/tls/bareos-sd1.bareos.org-cert.pem +++ b/regress/configs/BASE/tls/bareos-sd1.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -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 +R0mVJklGJQ== -----END CERTIFICATE----- diff --git a/regress/configs/BASE/tls/bareos-sd1.bareos.org-key.pem b/regress/configs/BASE/tls/bareos-sd1.bareos.org-key.pem index 15dc99c789e..26251286e42 100644 --- a/regress/configs/BASE/tls/bareos-sd1.bareos.org-key.pem +++ b/regress/configs/BASE/tls/bareos-sd1.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/regress/configs/BASE/tls/bareos-sd2.bareos.org-cert.pem b/regress/configs/BASE/tls/bareos-sd2.bareos.org-cert.pem index 1783935c893..b2c9b049341 100644 --- a/regress/configs/BASE/tls/bareos-sd2.bareos.org-cert.pem +++ b/regress/configs/BASE/tls/bareos-sd2.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -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 +qz9mhzGgGg== -----END CERTIFICATE----- diff --git a/regress/configs/BASE/tls/bareos-sd2.bareos.org-key.pem b/regress/configs/BASE/tls/bareos-sd2.bareos.org-key.pem index a86012b3f6b..48ba84065e1 100644 --- a/regress/configs/BASE/tls/bareos-sd2.bareos.org-key.pem +++ b/regress/configs/BASE/tls/bareos-sd2.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/regress/configs/BASE/tls/client1.bareos.org-cert.pem b/regress/configs/BASE/tls/client1.bareos.org-cert.pem index 727033ad122..cdc472054ef 100644 --- a/regress/configs/BASE/tls/client1.bareos.org-cert.pem +++ b/regress/configs/BASE/tls/client1.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIEyDCCArCgAwIBAgIBEDANBgkqhkiG9w0BAQUFADAyMRwwGgYDVQQKDBNCYXJl -b3MgR21iSCAmIENvIEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwHhcNMTcwNDE1MTcw -ODAwWhcNMTgwNDE1MTcwODAwWjAdMRswGQYDVQQDExJjbGllbnQxLmJhcmVvcy5v -cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD5X04UtpRkgzy0otmf -YK8rhpcQ/iwAdBQFi4H4eluBkSZlqOSIFQbuFozT/AkENYznYo+Rf+PrdRNsQOPj -mltGTGezH3Bx2fpfO5b4Lz5Dbf8HprdZ8cqGBe5/7qTGRc3rLzeWsmaiAaR6wMyp -xhzbxN6GzC0UyQNvatbcuCSKbIGndXjJ0lFE3jwTpnYdSawEUu0pmYTtspicJDxW -A0xa93S/QfV7P9TeQAfikS+AyHJ5sLFCCCyGzrQWARSVYtMkHSZxHUgQg8FtSu3Y -iN3lfP+fuT7EpVQZnBkxwmZ8muZ7Cy3MFN1wikUz+2uWJj7jXX3LMTXao/GjFI2P -HPRdUpitPsty+4acZA2tuC0NmuN0kNm9GYdzvb5wJrIAfGlm33mgX4Xtj14ExBzE -gdxmieLpt97IWUM+Rlv6YdJ1WxxfBqEJWhG5Mv6QrUnJzr7zuNafYgJOemC7jCqK -l4SfJs2keJ1uZPbR9QD4t7MR2PIU3L1tN01ZtnOZDyR+hJW7O0CVNCtGVvsgDtai -0E59FkkXvwH4N+3PvFVlmBFyitCKzfQEqJL3rJWTuxh68fgvV4yX0noCgja3YcSw -d6qCmo0pHRXsI4mxmd+o+7HpQWzV9iLcjs9smUe37eRs3uPf8Az78IR0Qmaq1ja2 -4CE1o/6VBvhutQF6Uf6B6JE6cwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCctawQ -QKxYj+nPC2kZU8Sn8ZsQ8Jf3MAJjJXRDGKgZEPzjCLhnVe021TXtKXhKJy/xVs91 -VjnEhH+rJSLlpcEvHVgBXLQiYBq/qjIev1ynKVRpJ7UTnX8wT16T64gI80LzYLE2 -5XpZab8hHRG+YW9eG7QwrvzdUnpn2+fDkrRSQQWRuxg3LVtwDt/ZX1o3Aj9J4T3l -Em+pKpexdVCZ5Swv5Xx1PbbIWJiZa7t11vmfIMkMeO7sSkRS7/sGW7Im3146oyJU -AhemsdeGluueFYyJK+cl9wKty2eEF7iEsrgKlwUo/J0jmAlPMHKVmxBk3hsoNy/M -IHXVDPkt5HfaiFgXn0NseIm0hto+o+2FXugEiIriDhjA/gQZFhbvxqmbhdpmAPNe -32XAuDDPncf5Omz51turEw+l9eBFKySfXUuf71NI1JjiouV+Bqzwh5cIxEYsLxX5 -B3rW08UZhs8H0eBWTGvRxO6FulXR1MUKgyWbF+pSnEGITinHcBXtrpkdkBgDrc9j -kra7J1x8J2spVjENeiq/79GmMtiUURimJj1hIA+NKfQKi1giCijdai9AVErxKff9 -p4OQ0KaQyZKqbOnzJirjCjU4Z7GNv8f6bdu4a38ImwadnJyC1n2Wh2vwy6kG6IoE -dWqRkwMjmzY9q7IuviQt1CC1SYI+SbOfDnyp1g== +MIIFcDCCA1gCFFMEY+tz/nIIvzkvAHTbOF3KXqTUMA0GCSqGSIb3DQEBCwUAMIGS +MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMRAwDgYDVQQHDAdDb2xvZ25lMR0w +GwYDVQQKDBRCYXJlb3MgR21iSCAmIENvLiBLRzELMAkGA1UECwwCSVQxFzAVBgNV +BAMMDnd3dy5iYXJlb3Mub3JnMR4wHAYJKoZIhvcNAQkBFg9pbmZvQGJhcmVvcy5v +cmcwHhcNMTkxMjA1MDgwMDA0WhcNMjkxMjAyMDgwMDA0WjBWMQswCQYDVQQGEwJE +RTEMMAoGA1UECAwDTlJXMRwwGgYDVQQKDBNCYXJlb3MgR21iaCAmIENvLktHMRsw +GQYDVQQDDBJjbGllbnQxLmJhcmVvcy5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQC6x+NYnaH2QNAywjQxOyPKORgYgnZLGZ1SOGAvfFfnbZBJyaUd +QLBX49y9vZ0L4wbNvw33n4hk/sAsps757fNgUoSS/3iflKId7spXZyl+hWifiODD +lqCQLhS4taXfoyMu5WRP7lisbfGPRt1iz5yaZPQYWx897CUsbpvVwrgCjWbXWUWP +1C8EikFkuz47qhoV9QhSpTleAtIvneOYbV0itOS91hpuvcoXIJM5G0/TmsDvA5CL +UpZt1KK+WQsaEBp8+HzD/DyyFjKw3TUGzK54jeSZTaYRJSM/Ut0cukybE+5icgdl +CJwr1qk+blNISOm7U+kYfjIfF06jYc+Erpnx1wk+EdykcNlXmzbD1wzPtd5Q2Qr1 +LUj8oL1/bL/dn26c0JFFdPrThWD9JoHD3heJwI3vSPydsRGHIJCWcFjQur2/l2rV +rZprq4PilkAC9lzecd5VQCTqVJgDTev+SDwvn1bMAi0W5FQECTYoQKFKHIew3nlT +O1aZSej9vZw5aVCJ0LSJ2nnfiN8wlFceX5uHjJCxyWOtc9SUctsxlO7mX5FqDwVd +U6Ecn09MzplvffGJ3L9WKP7kPmSmu5vDaXbGRIQs7dT8pSfzOYVK+AiebUqwfJcw +9lYaqj7VpUejadgRueMX9sJwqM0XvPgLq0pN7kaU/P7/1xPMVOBHRp+gWwIDAQAB +MA0GCSqGSIb3DQEBCwUAA4ICAQBMFvWLt2p9AQ5z8WKziVwEPgSXaMgiLOXl2Bbg +13EZyM2SOuWGi9pKzoVGQHBFmiID7zhE/Ft3hD6aE/uYg5UvJbly5DyEhyX1cQfX +dlxtxiFh73Pv8vuFhGyKgWZqpTuAt6zSnTMymbBTKVFtVB4cBYvxnulWDx0ZRBaE +18WN0GsS/wNfRoWFvLyjY6hjiq8g59BGC2GVJN67NniJxeO4BqKE0N4c/hCzsAWB +VzWC37uxNmUg6txcwWhzKEdo1mxjSri4KZ3BVgkkBo00RSuNs2r+io7Xb7IYmaJ1 +XwUlqdeBiTxWI2jl/L+BxoYJTHmKSnF+sxPdUPy9xMEK5yUXW6RvBoYSvzdzfOLR ++rHJl59VGcP00jxfLj1uQQaeXX1Xvc5ILWAAGjsHmInx1AoguOf5UiZvJUfngeVR +6CqAcanbokfNMM/plNRmKW2nqo3HkGrayiKnG3VpIITER8KQ3oKPo4T1KaXmj7Nv +SVM/YJRyfU/SUGFdXa+F55Hry9klDE+IKqX7jd/dSRTxcm7iRzke8KbS5t0Yp/Z4 +x4Eoyrc4DFrG125JDv6dq4oZyLiXBE1aei9Rq8c9SnJ4de+QBGjlcs9xLtZSLW1m +Yqoq8ANckagkZSk4gOi1qhbWZkkdqmsVCZ7NP2IyMG//rBUma+yBUTKyBckq8BE2 +WGaP6Q== -----END CERTIFICATE----- diff --git a/regress/configs/BASE/tls/client1.bareos.org-key+cert.pem b/regress/configs/BASE/tls/client1.bareos.org-key+cert.pem index d9d760be9f5..5b07f76be3e 100644 --- a/regress/configs/BASE/tls/client1.bareos.org-key+cert.pem +++ b/regress/configs/BASE/tls/client1.bareos.org-key+cert.pem @@ -1,79 +1,83 @@ -----BEGIN CERTIFICATE----- -MIIEyDCCArCgAwIBAgIBEDANBgkqhkiG9w0BAQUFADAyMRwwGgYDVQQKDBNCYXJl -b3MgR21iSCAmIENvIEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwHhcNMTcwNDE1MTcw -ODAwWhcNMTgwNDE1MTcwODAwWjAdMRswGQYDVQQDExJjbGllbnQxLmJhcmVvcy5v -cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD5X04UtpRkgzy0otmf -YK8rhpcQ/iwAdBQFi4H4eluBkSZlqOSIFQbuFozT/AkENYznYo+Rf+PrdRNsQOPj -mltGTGezH3Bx2fpfO5b4Lz5Dbf8HprdZ8cqGBe5/7qTGRc3rLzeWsmaiAaR6wMyp -xhzbxN6GzC0UyQNvatbcuCSKbIGndXjJ0lFE3jwTpnYdSawEUu0pmYTtspicJDxW -A0xa93S/QfV7P9TeQAfikS+AyHJ5sLFCCCyGzrQWARSVYtMkHSZxHUgQg8FtSu3Y -iN3lfP+fuT7EpVQZnBkxwmZ8muZ7Cy3MFN1wikUz+2uWJj7jXX3LMTXao/GjFI2P -HPRdUpitPsty+4acZA2tuC0NmuN0kNm9GYdzvb5wJrIAfGlm33mgX4Xtj14ExBzE -gdxmieLpt97IWUM+Rlv6YdJ1WxxfBqEJWhG5Mv6QrUnJzr7zuNafYgJOemC7jCqK -l4SfJs2keJ1uZPbR9QD4t7MR2PIU3L1tN01ZtnOZDyR+hJW7O0CVNCtGVvsgDtai -0E59FkkXvwH4N+3PvFVlmBFyitCKzfQEqJL3rJWTuxh68fgvV4yX0noCgja3YcSw -d6qCmo0pHRXsI4mxmd+o+7HpQWzV9iLcjs9smUe37eRs3uPf8Az78IR0Qmaq1ja2 -4CE1o/6VBvhutQF6Uf6B6JE6cwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCctawQ -QKxYj+nPC2kZU8Sn8ZsQ8Jf3MAJjJXRDGKgZEPzjCLhnVe021TXtKXhKJy/xVs91 -VjnEhH+rJSLlpcEvHVgBXLQiYBq/qjIev1ynKVRpJ7UTnX8wT16T64gI80LzYLE2 -5XpZab8hHRG+YW9eG7QwrvzdUnpn2+fDkrRSQQWRuxg3LVtwDt/ZX1o3Aj9J4T3l -Em+pKpexdVCZ5Swv5Xx1PbbIWJiZa7t11vmfIMkMeO7sSkRS7/sGW7Im3146oyJU -AhemsdeGluueFYyJK+cl9wKty2eEF7iEsrgKlwUo/J0jmAlPMHKVmxBk3hsoNy/M -IHXVDPkt5HfaiFgXn0NseIm0hto+o+2FXugEiIriDhjA/gQZFhbvxqmbhdpmAPNe -32XAuDDPncf5Omz51turEw+l9eBFKySfXUuf71NI1JjiouV+Bqzwh5cIxEYsLxX5 -B3rW08UZhs8H0eBWTGvRxO6FulXR1MUKgyWbF+pSnEGITinHcBXtrpkdkBgDrc9j -kra7J1x8J2spVjENeiq/79GmMtiUURimJj1hIA+NKfQKi1giCijdai9AVErxKff9 -p4OQ0KaQyZKqbOnzJirjCjU4Z7GNv8f6bdu4a38ImwadnJyC1n2Wh2vwy6kG6IoE -dWqRkwMjmzY9q7IuviQt1CC1SYI+SbOfDnyp1g== +MIIFcDCCA1gCFFMEY+tz/nIIvzkvAHTbOF3KXqTUMA0GCSqGSIb3DQEBCwUAMIGS +MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMRAwDgYDVQQHDAdDb2xvZ25lMR0w +GwYDVQQKDBRCYXJlb3MgR21iSCAmIENvLiBLRzELMAkGA1UECwwCSVQxFzAVBgNV +BAMMDnd3dy5iYXJlb3Mub3JnMR4wHAYJKoZIhvcNAQkBFg9pbmZvQGJhcmVvcy5v +cmcwHhcNMTkxMjA1MDgwMDA0WhcNMjkxMjAyMDgwMDA0WjBWMQswCQYDVQQGEwJE +RTEMMAoGA1UECAwDTlJXMRwwGgYDVQQKDBNCYXJlb3MgR21iaCAmIENvLktHMRsw +GQYDVQQDDBJjbGllbnQxLmJhcmVvcy5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQC6x+NYnaH2QNAywjQxOyPKORgYgnZLGZ1SOGAvfFfnbZBJyaUd +QLBX49y9vZ0L4wbNvw33n4hk/sAsps757fNgUoSS/3iflKId7spXZyl+hWifiODD +lqCQLhS4taXfoyMu5WRP7lisbfGPRt1iz5yaZPQYWx897CUsbpvVwrgCjWbXWUWP +1C8EikFkuz47qhoV9QhSpTleAtIvneOYbV0itOS91hpuvcoXIJM5G0/TmsDvA5CL +UpZt1KK+WQsaEBp8+HzD/DyyFjKw3TUGzK54jeSZTaYRJSM/Ut0cukybE+5icgdl +CJwr1qk+blNISOm7U+kYfjIfF06jYc+Erpnx1wk+EdykcNlXmzbD1wzPtd5Q2Qr1 +LUj8oL1/bL/dn26c0JFFdPrThWD9JoHD3heJwI3vSPydsRGHIJCWcFjQur2/l2rV +rZprq4PilkAC9lzecd5VQCTqVJgDTev+SDwvn1bMAi0W5FQECTYoQKFKHIew3nlT +O1aZSej9vZw5aVCJ0LSJ2nnfiN8wlFceX5uHjJCxyWOtc9SUctsxlO7mX5FqDwVd +U6Ecn09MzplvffGJ3L9WKP7kPmSmu5vDaXbGRIQs7dT8pSfzOYVK+AiebUqwfJcw +9lYaqj7VpUejadgRueMX9sJwqM0XvPgLq0pN7kaU/P7/1xPMVOBHRp+gWwIDAQAB +MA0GCSqGSIb3DQEBCwUAA4ICAQBMFvWLt2p9AQ5z8WKziVwEPgSXaMgiLOXl2Bbg +13EZyM2SOuWGi9pKzoVGQHBFmiID7zhE/Ft3hD6aE/uYg5UvJbly5DyEhyX1cQfX +dlxtxiFh73Pv8vuFhGyKgWZqpTuAt6zSnTMymbBTKVFtVB4cBYvxnulWDx0ZRBaE +18WN0GsS/wNfRoWFvLyjY6hjiq8g59BGC2GVJN67NniJxeO4BqKE0N4c/hCzsAWB +VzWC37uxNmUg6txcwWhzKEdo1mxjSri4KZ3BVgkkBo00RSuNs2r+io7Xb7IYmaJ1 +XwUlqdeBiTxWI2jl/L+BxoYJTHmKSnF+sxPdUPy9xMEK5yUXW6RvBoYSvzdzfOLR ++rHJl59VGcP00jxfLj1uQQaeXX1Xvc5ILWAAGjsHmInx1AoguOf5UiZvJUfngeVR +6CqAcanbokfNMM/plNRmKW2nqo3HkGrayiKnG3VpIITER8KQ3oKPo4T1KaXmj7Nv +SVM/YJRyfU/SUGFdXa+F55Hry9klDE+IKqX7jd/dSRTxcm7iRzke8KbS5t0Yp/Z4 +x4Eoyrc4DFrG125JDv6dq4oZyLiXBE1aei9Rq8c9SnJ4de+QBGjlcs9xLtZSLW1m +Yqoq8ANckagkZSk4gOi1qhbWZkkdqmsVCZ7NP2IyMG//rBUma+yBUTKyBckq8BE2 +WGaP6Q== -----END CERTIFICATE----- -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/regress/configs/BASE/tls/client1.bareos.org-key.pem b/regress/configs/BASE/tls/client1.bareos.org-key.pem index 38916d94738..3b386a776b1 100644 --- a/regress/configs/BASE/tls/client1.bareos.org-key.pem +++ b/regress/configs/BASE/tls/client1.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -MIIJKQIBAAKCAgEA+V9OFLaUZIM8tKLZn2CvK4aXEP4sAHQUBYuB+HpbgZEmZajk -iBUG7haM0/wJBDWM52KPkX/j63UTbEDj45pbRkxnsx9wcdn6XzuW+C8+Q23/B6a3 -WfHKhgXuf+6kxkXN6y83lrJmogGkesDMqcYc28TehswtFMkDb2rW3LgkimyBp3V4 -ydJRRN48E6Z2HUmsBFLtKZmE7bKYnCQ8VgNMWvd0v0H1ez/U3kAH4pEvgMhyebCx -Qggshs60FgEUlWLTJB0mcR1IEIPBbUrt2Ijd5Xz/n7k+xKVUGZwZMcJmfJrmewst -zBTdcIpFM/trliY+4119yzE12qPxoxSNjxz0XVKYrT7LcvuGnGQNrbgtDZrjdJDZ -vRmHc72+cCayAHxpZt95oF+F7Y9eBMQcxIHcZoni6bfeyFlDPkZb+mHSdVscXwah -CVoRuTL+kK1Jyc6+87jWn2ICTnpgu4wqipeEnybNpHidbmT20fUA+LezEdjyFNy9 -bTdNWbZzmQ8kfoSVuztAlTQrRlb7IA7WotBOfRZJF78B+Dftz7xVZZgRcorQis30 -BKiS96yVk7sYevH4L1eMl9J6AoI2t2HEsHeqgpqNKR0V7COJsZnfqPux6UFs1fYi -3I7PbJlHt+3kbN7j3/AM+/CEdEJmqtY2tuAhNaP+lQb4brUBelH+geiROnMCAwEA -AQKCAgEA6XiPM9lUyV4NgdlOAmeU2R1jZidxruL+s8pPXwG/lmj9GASuIbH+EP7P -ztCS6HvyddfTLpgcHaA5FQsT0U380q5KEGwI7K72OB8kUyx4EM11DgbKds1nnV8E -UoZtgqxsBBrq4o4YhOkgw0Sq2PCAqEmDRZT3SBSCwNe4XmGQ5IB+SvgypFHigKXI -fWVGBFmrUUkKff4bdCfXtag/TRA9dpVjmoT4ffHfLE2qlDb10I7ajpAdBQN+HKB9 -/nP4f3xMzez0xsZxZ/TTLa4PTMGnbmo/MZ1P5PAc8vUwqWOmbFbiHqTytbV7NRhf -fjGQIr2f92LamVhzYUZIvzRI7IphRP0mowuczjjQh1ENNOqiOh7qnnB7eeCdz0oI -ex6U5ei8d8LcpqSOSBAs+zjl3VXYjjKYeVnd4wt+vBsHZYu5UawiwAwy1cqwqMu6 -7Ateo7YZPfuvhYkurjcmDLIf9ZAdKKFRSUN5oPXwAIzJK+TWNi03McvxY6p/4uGQ -KHssAjF/S62xiffNGMKZSVyf52agfA0Icaf4JP4yk7v4DKUo7Ywa0UdgCgXhLT6O -yg6NvMv/9FmugwSDC1O3DjL42/vxJ/jkaBpaQizcQnfLptpZwfa+3UJwmf6RUH0N -Mrw11qicQaBqfBfK8JVQkPkxGIvD28cy7zpGg3GZ94a0azCR5kECggEBAP4eo8KV -iw4tfpnzDs32Y816KFP9T4C+YOvgq9ysrvuLsPYREecTkAmmBPhpoYep8lz7B5ZY -A82yKmDTJlIVNR4zL7Bpf5mPkRNkS6ux51/R+64SbrOQ9IkSmDj66lLcVkBpfi33 -BJXCHo+JH3ivoe7vHHLnp+nVxAFbrIjys40UYZpCOfKfH/JEDyNnLDcHiXgilrQh -mJL2e5SPA23YkWjjk1wQrc2mbUmiMadzFoXZqNqQik4hg5lhOeVwbeuI8Iu8U6Xa -HNQN9hlHbYPPcsye86iqm8evH8UVM4uGc50lFQGtjjwkMWI96LgQm/CrybcjyomJ -j3iHXMpnHFgC1fECggEBAPs3rDOKCR1b62hFb7X9Mzsld+IQskV74RQ9OQHVKzII -xjpdYIMwyJacqCme3e+3hdxjH36piQ07e1gQfYhyXsOn1q5hhOfkdw99mVFJ2dGY -VKMDZxwFfkRMWDYi3mAzDvzDWWX3U+x1In3I/MbgrZ+065mTwDrJJW9SLS4RBtlK -xbo0mvO/XbGIurrhym70WM4JiZxL3xRoh7SJ6JS5dNeO5uWg8eELN++YvAywCMBH -Rz0YgSihoJnvdWIQjqmMieWTZ/MjoBWe9zCpmCzj6/Pg83p6+tinBoiW4qMzg2w0 -24zvFbYD/IwgJ2dputqDKrVxxASZEBWT2nQ5XybpIqMCggEBAOPGpPSKRF0N7Fej -pJZ6jlSkdTdra3Kzsn5bINEpO6MfQBwfitN8FnR/ih7715yZeTNckx1wgOBEHXYy -bTvP5I/QQ6O1vHjxVZFzKdyZFxItTpFl1jI/8OBYeXdBeP2SoAEWTdJ3gnWVzPzN -ZRcxHk3jp7Va7YhMYmbxPAJ4wPXo2d+CExzlAqaN2J/cH6anq9Gx9zE4l+DK7FRp -qCIyp4vDyNcR4CfgUD9bEXTNVNffFFnsivujUKkPm+yLTQt88FfgE34qtgJhDUD1 -ZDVsobLFmxOI8R8YWrq12UDr3/9wOJcLcN15d4ZehZVO1efwo1rzytxjH+ViN4r4 -x1AgIpECggEAUmsAbuRBe0VV5R6quL06GpR/UUaDBjLPNDGly0khY8fnKOzLph7S -ID+DGCyLyYKfQx+uDIMYeKPkIo8+cA59spkU4J8T2HRm70kYjMe6032zfsu1/0Z6 -F3QomJI1/L+jkh+Q69gJy5DeYQAYljLOI5Ban0cPEPo+8te2BOAHLDDQz/dEQuWs -mnsuL/O101MM84PDhuiJZouowf1gtbJmd/XlIL79vARPNKcaQttZ86Mu5wdsEGV+ -aCJck3C1LUDzWMNUnjs44P8HQArT5x5boeZSWwOP2pZpmVRPRJW47z4kLYeeytlh -+KLv6oiQifHwiBir44pH8ZxRVkIgSobAGwKCAQB4pxohxfveeK5jzBh5Jd7mRGN5 -dNRK8JS1gcIf7YeFSXb3kszMhCyQABQFFaKmmLQq10wsrxQdPJTZkmTVa77DgC7F -klnk1KzhzJuEcTCwyETOUInbt2BFSVINKmTvnkt8ljDpiN8Ft4xtaFlOfmiWjWON -gmv7bql4x4s4dntVhUZbBtTiCbHG14X6BvrrnSpV2DChYheUpmBd341RdvpWJxXN -QYZgPoFkIvKnIGH4GKhFVBgjRuFmBsWRyXag966z0QMDlQMMobCh4StyK3KOpVxB -0h2wtJQN4alSu67KmsDEE01jK/HJAk7prftMPIAeQs+KXQHLJglyt/H+Xdov +MIIJKAIBAAKCAgEAusfjWJ2h9kDQMsI0MTsjyjkYGIJ2SxmdUjhgL3xX522QScml +HUCwV+Pcvb2dC+MGzb8N95+IZP7ALKbO+e3zYFKEkv94n5SiHe7KV2cpfoVon4jg +w5agkC4UuLWl36MjLuVkT+5YrG3xj0bdYs+cmmT0GFsfPewlLG6b1cK4Ao1m11lF +j9QvBIpBZLs+O6oaFfUIUqU5XgLSL53jmG1dIrTkvdYabr3KFyCTORtP05rA7wOQ +i1KWbdSivlkLGhAafPh8w/w8shYysN01BsyueI3kmU2mESUjP1LdHLpMmxPuYnIH +ZQicK9apPm5TSEjpu1PpGH4yHxdOo2HPhK6Z8dcJPhHcpHDZV5s2w9cMz7XeUNkK +9S1I/KC9f2y/3Z9unNCRRXT604Vg/SaBw94XicCN70j8nbERhyCQlnBY0Lq9v5dq +1a2aa6uD4pZAAvZc3nHeVUAk6lSYA03r/kg8L59WzAItFuRUBAk2KEChShyHsN55 +UztWmUno/b2cOWlQidC0idp534jfMJRXHl+bh4yQscljrXPUlHLbMZTu5l+Rag8F +XVOhHJ9PTM6Zb33xidy/Vij+5D5kprubw2l2xkSELO3U/KUn8zmFSvgInm1KsHyX +MPZWGqo+1aVHo2nYEbnjF/bCcKjNF7z4C6tKTe5GlPz+/9cTzFTgR0afoFsCAwEA +AQKCAgBmd1wYdDmy73GINxQM4gXLXbEDWSbuIjo1LepOgqdytZ+Pa0jimGdlgALM +MKZkLALCgop2CxX3We4xUL2BTPHUKNDEF9SjrxWU2Dg25MhVuXhg9OVhR1QEZNNH +VZeO7V9SzdNPKlGJHrODR3wSRhUCelmStwKXpOHr0y44gZ8S/2GoyDeqJNw6YGJp +kXMdpj6zRv5u4GdtVJzcNID0USLj9Fr8beWIVSP1thAuJvaO/nnTZaA5XnBaBmnV +hOHbRXRSlLtVhR4DELx0XJZHiag5SJZdJ8Tv6PDCP4I/zVBTTwbbCPVXjval8hhc +wId9w0o+U1Uv86MpfU7NwM3oWyTmIHMkFBS/J53GgiDJOXnhftt1iUyvEcnhpz9w +AOt8UCwKupz59H0CKWe5N6spT4VrmQKW9lgeAjLFtZcMzdoLYB0gP+eJkhV6ZD1x +9ZhJJI09+dJZr0ti48XbhnBgLSvgiPDRFwE9CPjvzO0gDUWsQNfhgyU3oSpTBNqb +X4CZ94/ZWquQRImFl4f74AUYMLIyrN170UQGh/hcgVaBGnRxpRruJXiW+TO+JMlL +kB2Lo9Ttd0Ontce8wsO15ucCRyAKABmWOU2aRGYb6nOBZ2MQzCGvIJOqmMhrUA3B +uh8L40ptCS0kvS+q0Iv20gWgFAxQM45mfXxpTCfVOvRuDqOGEQKCAQEA4D+EhM3U +lc0vhYYJkSJ2fLhg5CADhN9fPJGuRwtdsxzAb2lxUfIejUNc6lvXcDF6S8zByMYS +vtqOdjWXb3XVFsHEASSPaq7B8Bh4p3Mgkp0EiVUZXVsqno8elcVFSShLyJg71oTO +hTqVlhRQjXOD7Aha5cBmYQ1CM/rMcHANDb9NNDIXOW+t6BbMEJqEDuZEuaWB/hpb +1Ic2SQiGHiPPkfacUH1orETshjdWLxNBx90a98Mqo0O5ReAPFKff6w/u/SwKp3su +daibQKFiI/j6bpTn6u1aOPoMHbAI5hzcDX1zG3dt/Az6YNcmI+mXoqouglO011aF +zZDyZEyzj2j0iQKCAQEA1TpEJe1YJuMvU62y7hsWgcMufWZwDIElBRd6s/ei6Hq2 +Gkf5JwzYqwCmBzZbi6ZPfnOF1Hfgic9Mg0Xz1uCYlJCnfqotcT7eY7f8OKbFSim9 +/SA/PfxaL+qi/vFsCP78j+wcuLXVIiCjj9P1sDCwlu49okLdA6C96tVRwzqlTcMd +pexfE2F9N8nMsXioixe2Vns4dh7N6LUPFhXImd1S38WaSD+uLWzXDbZKTm3V68rI +4XzxWHaol7D4GdAHbCDlcoLYzqafmMF396Qls5TiK0B+iUjANvKTDnR0slhJA4vI +n/xbvrzlTt58i6yN1yLHyrBHL/R1yhMSipfigKN8wwKCAQBUumsdqo+aEi7UanKO +7dCLCzdAun/Z4nQfdIO+wCKlHEXxUovIhIzanwsqWY0rDObCYRkO/Rf0GKwfKdyP +9puOv6OJMwElM+Z/Cx/7VNqHyt/967NrvJh71GOf/ytQmvMXVb22LfPCDwKZ9A8D +gxPjSLzfdjS4ksPi0+4OxaeI/DD1eb+gqfuxZ3uvAlLHNmXdJxXYpqjvwi7WpWvX +U3yID/+7wcac4GXlyF695q7CD16zIoCns1z7c87+5PcL37dS3SMhaL+DITOX1eI4 +6UfmJEkEUK34PTH6vZp/J4RVbILja9qYk2a+1EvK4eWzRk3QXERF4KEprIyJLRnj +I6rRAoIBADQRBUEJosPkJ9NUD+QqgyVuhrSiRewXwPVsVU8KwiHojPz/5CwP6/xd +rS0HrfT8yF6FUQGfwBmGoBVSCIfI0hk89Vltrqj/hAhvjcw7lONWLAlaTXcSXudi +cSi1xP6xXPS74AuOgxvRQn9Fb7H1QbmpNS2hDBztrFJigpOch27knSG+BT1TSeNM +iIoxf15vjNuzPQdC4F7Zj3SCHzjLHYh81P6dZie7cwvrHlvmYB0yqDi/bKOAXgyk +bwDGlnll0wFSSCS19TS00VmMIJSoX03Wcs+NDzqboyMddr1x52pRQM0oLzL1Jz1K +ALmOihglawnoX4mrNPQCEj37dpiY00cCggEBAK1B55hUMwGz8Bo5fo4+ZKpKL8wH +Bh4nuQFDNgytlQxLmmVC/XLZwN/V9tyHK56WyGIwEbHgfw1ev+LpTcBSONj6GK/B +aw0OUUJfdAXWNbTs9gITqevdTsDgY7ylItsbFTW0etVwq7eeE5REEz7rjFV86KRl +QLF00w4RfzB9Y77oJhpr8iWCXIpV3cOuwihxJJPeEVAjzhpZii5zIYsKk9nTvXpE +wwKQRAbi5+PM6Dud478mG+zgSV3K2kL4AfAqOif6meYSXnFa96ql0uR7iiJXaP39 +kQX5DixCc+MDMzIrD6Fyxs+uQllJiUNzAKm/dR3m2STXw3u9g+4IWjScpF4= -----END RSA PRIVATE KEY----- diff --git a/regress/configs/BASE/tls/console.bareos.org-cert.pem b/regress/configs/BASE/tls/console.bareos.org-cert.pem index a9c9df25d15..ebc2c1c4062 100644 --- a/regress/configs/BASE/tls/console.bareos.org-cert.pem +++ b/regress/configs/BASE/tls/console.bareos.org-cert.pem @@ -1,28 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIEyDCCArCgAwIBAgIBETANBgkqhkiG9w0BAQUFADAyMRwwGgYDVQQKDBNCYXJl -b3MgR21iSCAmIENvIEtHMRIwEAYDVQQDEwliYXJlb3MtY2EwHhcNMTcwNDE1MTcw -ODAwWhcNMjUwNDE1MTcwODAwWjAdMRswGQYDVQQDExJjb25zb2xlLmJhcmVvcy5v -cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCiHNuaW3dH3snGYXIr -8GwgbpzPdh5rZ5kvjdrKZFmdUOesgUuuEuLmQBCkxuZXWps/yJOXjpA+jO4okPa7 -iU17PdbRBOQL2KAFDFioGiaCKhRJ5Kbso3fnPXvV2tccGMgbBLHrLwD5CtWzuXaF -ujozIFYgXEJUWNnSQ7wiwL/FbQSjfR+LjnhaMrow1dL8Lh+g5iZAxBa2nlbSYIgF -jhgcFUh97P/bJD/+2mRqlsd9nz6NFDyis53/WdNcTjZNgtovt0bUalvR6DjbwIUq -6KSy/xJ/NKiVS5X75nskEL2pCudREv9w0rRfBIFwcGbBZT0OtKzKTRoAbeh9ipc9 -NARMIqoHTPa7Uq1iIbBiFTtQYj6ix4sd26rPJKL+eeAEkrqOG51aL+cM/CMVGzqw -zB+X0IsbJKGoezLaKJIUnwv5vIaNpRNdKm8b6Zf4/jy3YFfC5MIEShXHuI4D+6Zg -9O8lD6UzMwYV0ugsm1Y72yXreO8EgcFNFGVXMXg78ocyPuLoPfuCSuRkL+kCjWSW -lDGGVIfPIv1uKMC+rFNvcrG2xG+nEOCWp0nu3bmLhIKrA9PnHuVMRs80YhbyTPJb -xm0mCXBTeCO416PbUHTM8q8nuAIev3jxoeWSTrXQK2bVAAXNZtEdsUcksYIoWi8o -dqXsIi2xisT0tGSp0yr14Q53MwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAzoiJe -msHExtkD4oF880voRYDwT4iFAVULuRQ/+Q7SBpWbpgfCn1UkY3vSRkSI4hHv0rFU -pmIzP10JW0ix5QPZMQ6nixOGWBrLqqqMLti76E0JHkFNV70cBUY9oMY29Rx2O2hS -sLRfxjBcf+sqaJBExEZmTzI6eaFjb7EQKY0XbQ6XuEJ5veadLB6IHEZK0QW28IFL -5VcD/NoiSco8hSiFQqqz1etgUN8mstnAt0j3kVtCnUpsqyFnSqK9yMHhkeHxZfrm -MiojvD+mBFNMUMe6oaMeMLlidkIiEYLpW8w3Skh/mdreAwhBDCD+IfbE6+bgs9G4 -3t/fcvsFQr4whz7JAnx4pHD3HTanmf59wsoFFVxialUwXb2eNHjTDNOMpmIhV20r -UgEdqgPj35byWp1aFbNvt4kRdZfumKJo39f696YyPcAXRoJz3SPcVqSrhFYz32e5 -hiYOhSMgA3xy9R019hlgt/GYT9EWkOMfhvcD/7phaAQHwTdAplGQaXuerq5Y7M+N -0UYc1/LYN9q66S5qpjqnJnQiMukGLi8CD6w6exJ61pDAMujvdQSpFcFxLFTxlHYM -pYi8J3QbWcGe5qyiDRWjAnwiFbgwi9Ck4wdSiHrpm/WtGo11LxXfVGm0UqYS/VE+ -7sccuxnBePXqbbU/sGfZrea21l5n9VxQIz97mg== +MIIFcDCCA1gCFFMEY+tz/nIIvzkvAHTbOF3KXqTVMA0GCSqGSIb3DQEBCwUAMIGS +MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMRAwDgYDVQQHDAdDb2xvZ25lMR0w +GwYDVQQKDBRCYXJlb3MgR21iSCAmIENvLiBLRzELMAkGA1UECwwCSVQxFzAVBgNV +BAMMDnd3dy5iYXJlb3Mub3JnMR4wHAYJKoZIhvcNAQkBFg9pbmZvQGJhcmVvcy5v +cmcwHhcNMTkxMjA1MDgwMDA0WhcNMjkxMjAyMDgwMDA0WjBWMQswCQYDVQQGEwJE +RTEMMAoGA1UECAwDTlJXMRwwGgYDVQQKDBNCYXJlb3MgR21iaCAmIENvLktHMRsw +GQYDVQQDDBJjb25zb2xlLmJhcmVvcy5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQDL/V7wb3Tjjkerwa4FfIHdRJI2UynQkfe1qI6EsnjEZL7fOCsn +JaFYnFwygQpSoufJCirFRlBHVTrFi+MtYyvk+LCdj19iEetZ6H0AghIsz4hrfMTp +CHaxSF6pYe27WpzZrHlQmJmJBzx6qjq2u3t9tsgqkMZBTGA/jhI2VXpYdEw5vlJc +CoWd/ePR/GAozksilnkWlOZVunatE8ZpaP/g0MFj8Vp9dm1pgYFY5HJZkPj1RWOP +QnnGoSRQnuYXtMmk+T/7yreom3RntXNz7yA3tcn15u8wdgCTU4Yxv9R+mTQjnKbr +OgEjTuV+TB6Si3xVGmc73d/dB0OQh4fquFaEEYb6rvkCUD/LoGpT5AIhNFh6ExYI +6cSkE4GEocpbrJrJYMNlH2da7KUIvI6BaDqoTqYgD7vKnfquvWM4cFDDfjfz3ifX +XHCtA5DHsXZFfqHOtMveWusNG8fX//3OGlS3bxdoq95qQovLsmJPXj0Axjn6+5C0 +c+7tHsjW93CGvpNdDupP/aEYLxVfn9Bhcml3UC4Q2ufOZ6k4lFAIplcd6v3ppGQH +eObodQwDaD6Y+/dTE77Fb9IGqBdZlQ4I8ZVS/HVYxIWQk6pCFm8balBpLvg19zTJ +SvElhdObjuvy9Je46jVb6JIqJfgfAfHOcf+mQEcGlO8ZQ/oMupTbgeIunQIDAQAB +MA0GCSqGSIb3DQEBCwUAA4ICAQACj2tbJLtAXS242RY8bXPl8kXqo7vRldv0ChW1 +q6hZ6zug6/XH9nSCN0oI555II33aTUGZ6yWAq2LryovbKEncydY1TPovBECyQXjh +rIlm9j+ar9q04h+LIzXtjbkCtSFsI37Je1vNOXLczFu7XrEzv5AheS0Hy+vBPSHw +PI0Jf9efgkrTbW1Jlc7GSIxd5Ybt+Bslu/YDwKkdRGMqTa/7cfSTFa9ozFUpMBDZ +maeizqafH2B/Ez+ZWfQo65UefeAY9Hm0xzUD7VhPTV1ysqA/6aN8UDbZfPIaU+dE +6iIVL5eQrt6n5gLpp1WfFWx3jGvYDD9uOzwECecDrRgtZOrSjVFz1dndJF9tiy/c +CtOGpDNIRLQW1Ske0K4rE7oaPKyWEe2gs9R4nXTEBSh0Q50LEH7eNgJUNskF3ktF +1sygrXCaNghylYGCzzB0Cwb1/TDerA9DfeoZCz8QG6xlgVlEk8frSgpJL29zWt+M +Ic2y7ar8eJLCD6qCbMD762L7GsPAajk0MEQJlxv8+kmydC7lYwX9hCbPymqGu6HE +meAvC5/Vv9vUjl5K5aWgs6W9pBN7/F3u40U3K/PW8VgJysHPR1aJjLk+8oYMreh3 +/N1fbiNfqLPAtYkoHOndjGPcEzde8QLTQAx5tKTUSyFGQ9cOpfsh/3KNhh4TTRCg +MlsT7w== -----END CERTIFICATE----- diff --git a/regress/configs/BASE/tls/console.bareos.org-key.pem b/regress/configs/BASE/tls/console.bareos.org-key.pem index e301968bbcd..9ab3f46512d 100644 --- a/regress/configs/BASE/tls/console.bareos.org-key.pem +++ b/regress/configs/BASE/tls/console.bareos.org-key.pem @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt index e675e703ff1..9f1ca8dfc5d 100644 --- a/systemtests/CMakeLists.txt +++ b/systemtests/CMakeLists.txt @@ -20,82 +20,111 @@ cmake_minimum_required(VERSION 3.3) project(bareos-systemtests) -cmake_policy(SET CMP0057 NEW) #IF(.. IN_LIST ..) +cmake_policy(SET CMP0057 NEW) # IF(.. IN_LIST ..) -function(ConfigureFilesToSystemtest srcbasedir dirname globexpression configure_option srcdirname) - if (srcdirname STREQUAL "") - set(srcdirname "${dirname}" ) +function(ConfigureFilesToSystemtest srcbasedir dirname globexpression + configure_option srcdirname +) + if(srcdirname STREQUAL "") + set(srcdirname "${dirname}") endif() set(count 1) file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${dirname}) - file(GLOB_RECURSE ALL_FILES "${CMAKE_SOURCE_DIR}/${srcbasedir}/${srcdirname}/${globexpression}") + file(GLOB_RECURSE ALL_FILES + "${CMAKE_SOURCE_DIR}/${srcbasedir}/${srcdirname}/${globexpression}" + ) foreach(CURRENT_FILE ${ALL_FILES}) - MATH(EXPR COUNT "${COUNT}+1") + math(EXPR COUNT "${COUNT}+1") string(REPLACE "${CMAKE_SOURCE_DIR}/" "" TARGET_FILE ${CURRENT_FILE}) - string(REGEX REPLACE ".in$" "" TARGET_FILE ${TARGET_FILE}) # do not mess with .ini files + string(REGEX REPLACE ".in$" "" TARGET_FILE ${TARGET_FILE}) # do not mess + # with .ini files string(REPLACE "${srcbasedir}/${srcdirname}" "" TARGET_FILE ${TARGET_FILE}) - #MESSAGE(STATUS "configuring ${TARGET_FILE}" ) - configure_file(${CURRENT_FILE} ${PROJECT_BINARY_DIR}/${dirname}/${TARGET_FILE} ${configure_option}) + # MESSAGE(STATUS "configuring ${TARGET_FILE}" ) + configure_file( + ${CURRENT_FILE} ${PROJECT_BINARY_DIR}/${dirname}/${TARGET_FILE} + ${configure_option} + ) endforeach() - MESSAGE(STATUS "Configured ${COUNT} files from ${srcbasedir}/${srcdirname} to ${dirname} with glob ${globexpression} ${configure_option}" ) + message( + STATUS + "Configured ${COUNT} files from ${srcbasedir}/${srcdirname} to ${dirname} with glob ${globexpression} ${configure_option}" + ) endfunction() # generic function to probe for a python module function(PythonModuleStatus module) - EXECUTE_PROCESS(COMMAND "${PYTHON}" "-c" "import ${module}" RESULT_VARIABLE ${module}_status ERROR_QUIET) - STRING(TOUPPER ${module} module_uppercase) - IF(${module}_status EQUAL 0) - SET("PYTHON_${module_uppercase}_FOUND" TRUE PARENT_SCOPE) - ELSE() - SET("PYTHON_${module_uppercase}_FOUND" FALSE PARENT_SCOPE) - ENDIF() + execute_process( + COMMAND "${PYTHON}" "-c" "import ${module}" + RESULT_VARIABLE ${module}_status + ERROR_QUIET + ) + string(TOUPPER ${module} module_uppercase) + if(${module}_status EQUAL 0) + set("PYTHON_${module_uppercase}_FOUND" + TRUE + PARENT_SCOPE + ) + else() + set("PYTHON_${module_uppercase}_FOUND" + FALSE + PARENT_SCOPE + ) + endif() endfunction() macro(CheckForEnabledAndDisabledListEntry TEST_NAME_TO_CHECK) - IF(${TEST_NAME_TO_CHECK} IN_LIST SYSTEM_TESTS AND ${TEST_NAME_TO_CHECK} IN_LIST SYSTEM_TESTS_DISABLED) - message(FATAL_ERROR "The test name: ${TEST_NAME} is listed ambiguously in SYSTEM_TESTS and SYSTEM_TESTS_DISABLED at the same time") - ENDIF() + if(${TEST_NAME_TO_CHECK} IN_LIST SYSTEM_TESTS + AND ${TEST_NAME_TO_CHECK} IN_LIST SYSTEM_TESTS_DISABLED + ) + message( + FATAL_ERROR + "The test name: ${TEST_NAME} is listed ambiguously in SYSTEM_TESTS and SYSTEM_TESTS_DISABLED at the same time" + ) + endif() endmacro() -macro (handle_python_plugin_modules) - IF (EXISTS ${python_plugin_module_src_test_dir}) +macro(handle_python_plugin_modules) + if(EXISTS ${python_plugin_module_src_test_dir}) set(PYMODULES_TO_LINK_TO_SRC - filed/bareos-fd-local-fileset.py - filed/BareosFdPluginLocalFileset.py - filed/BareosFdWrapper.py - filed/BareosFdPluginLDAP.py - filed/bareos-fd-mock-test.py - filed/BareosFdPluginBaseclass.py - filed/bareos_fd_consts.py - filed/bareos-fd-ldap.py - dird/bareos_dir_consts.py - dird/BareosDirPluginBaseclass.py - dird/bareos-dir-class-plugin.py - dird/BareosDirWrapper.py - stored/bareos_sd_consts.py - stored/bareos-sd-class-plugin.py - stored/BareosSdPluginBaseclass.py - stored/BareosSdWrapper.py + filed/bareos-fd-local-fileset.py + filed/BareosFdPluginLocalFileset.py + filed/BareosFdWrapper.py + filed/BareosFdPluginLDAP.py + filed/bareos-fd-mock-test.py + filed/BareosFdPluginBaseclass.py + filed/bareos_fd_consts.py + filed/bareos-fd-ldap.py + dird/bareos_dir_consts.py + dird/BareosDirPluginBaseclass.py + dird/bareos-dir-class-plugin.py + dird/BareosDirWrapper.py + stored/bareos_sd_consts.py + stored/bareos-sd-class-plugin.py + stored/BareosSdPluginBaseclass.py + stored/BareosSdWrapper.py ) - foreach (PYMODULE_SOURCEPATH ${PYMODULES_TO_LINK_TO_SRC}) + foreach(PYMODULE_SOURCEPATH ${PYMODULES_TO_LINK_TO_SRC}) get_filename_component(PYMODULE_NAME ${PYMODULE_SOURCEPATH} NAME) - execute_process(COMMAND - ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/../core/src/plugins/${PYMODULE_SOURCEPATH} ${python_plugin_module_src_test_dir}/${PYMODULE_NAME}) + execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${PROJECT_SOURCE_DIR}/../core/src/plugins/${PYMODULE_SOURCEPATH} + ${python_plugin_module_src_test_dir}/${PYMODULE_NAME} + ) endforeach() - ENDIF() + endif() endmacro() -macro (prepare_test) +macro(prepare_test) # base directory for this test set(current_test_directory ${PROJECT_BINARY_DIR}/tests/${TEST_NAME}) set(basename ${TEST_NAME}) - #db parameters + # db parameters set(db_password "") - #db_name is regress-${TEST_NAME} replacing - by _ + # db_name is regress-${TEST_NAME} replacing - by _ string(REPLACE "-" "_" db_name "regress-${TEST_NAME}") - #set(db_name "regress-${TEST_NAME}") + # set(db_name "regress-${TEST_NAME}") set(db_user "regress") set(job_email root@localhost) @@ -108,8 +137,8 @@ macro (prepare_test) set(sd_password sd_password) math(EXPR dir_port "${BASEPORT} + 0") - math(EXPR fd_port "${BASEPORT} + 1") - math(EXPR sd_port "${BASEPORT} + 2") + math(EXPR fd_port "${BASEPORT} + 1") + math(EXPR sd_port "${BASEPORT} + 2") math(EXPR sd2_port "${BASEPORT} + 3") math(EXPR php_port "${BASEPORT} + 4") @@ -121,7 +150,9 @@ macro (prepare_test) set(tmpdir ${current_test_directory}/tmp) set(tmp ${tmpdir}) set(working_dir ${current_test_directory}/working) - set(python_plugin_module_src_test_dir ${current_test_directory}/python-modules) + set(python_plugin_module_src_test_dir + ${current_test_directory}/python-modules + ) file(MAKE_DIRECTORY ${archivedir}) file(MAKE_DIRECTORY ${confdir}) @@ -131,18 +162,20 @@ macro (prepare_test) endmacro() # extract db version from cats.h -file(STRINGS ${CMAKE_SOURCE_DIR}/core/src/cats/cats.h DB_VERSION_STRING REGEX .*BDB_VERSION.*) +file(STRINGS ${CMAKE_SOURCE_DIR}/core/src/cats/cats.h DB_VERSION_STRING + REGEX .*BDB_VERSION.* +) string(REGEX MATCH [0-9]+ BDB_VERSION ${DB_VERSION_STRING}) find_program(PERL perl) find_program(PYTHON python) find_program(PHP php) -# set variable values to be replaced by configure_file -#set(DEFAULT_DB_TYPE ${default_db_backend}) +# set variable values to be replaced by configure_file set(DEFAULT_DB_TYPE +# ${default_db_backend}) message(STATUS "DEFAULT_DB_TYPE is ${DEFAULT_DB_TYPE}") -#set(TAPEDRIVE "TAPEDRIVE") +# set(TAPEDRIVE "TAPEDRIVE") set(archivedir "${PROJECT_BINARY_DIR}/archivedir") set(backenddir "${PROJECT_BINARY_DIR}/../core/src/cats") @@ -150,9 +183,8 @@ set(backenddir "${PROJECT_BINARY_DIR}/../core/src/cats") set(bin ${PROJECT_BINARY_DIR}/bin) set(bindir ${PROJECT_BINARY_DIR}/bin) -#set(conf ${PROJECT_BINARY_DIR}/defaultconfigs) -#set(confdir ${conf}) -#set(configs ${conf}) +# set(conf ${PROJECT_BINARY_DIR}/defaultconfigs) set(confdir ${conf}) +# set(configs ${conf}) set(BAREOS_CONFIG_DIR ${conf}) set(db_name "regress") @@ -177,10 +209,10 @@ set(plugindirtmp ${PROJECT_BINARY_DIR}/plugindirtmp) set(rscripts ${PROJECT_BINARY_DIR}/scripts) if(TARGET python-dir) - get_target_property(dir_plugin_binary_path python-dir BINARY_DIR) + get_target_property(dir_plugin_binary_path python-dir BINARY_DIR) endif() if(TARGET python-sd) - get_target_property(sd_plugin_binary_path python-sd BINARY_DIR) + get_target_property(sd_plugin_binary_path python-sd BINARY_DIR) endif() if(TARGET python-fd) get_target_property(fd_plugin_binary_path python-fd BINARY_DIR) @@ -204,7 +236,7 @@ set(working_dir ${PROJECT_BINARY_DIR}/working) set(piddir ${PROJECT_BINARY_DIR}/piddir) file(MAKE_DIRECTORY ${piddir}) -#set(BASEPORT ${dir_port}) +# set(BASEPORT ${dir_port}) # for config-lib.sh: do not remove @DB___@ but replace them with the original set(DB_NAME @DB_NAME@) @@ -212,27 +244,28 @@ set(DB_USER @DB_USER@) set(DB_PASS @DB_PASS@) set(DB_VERSION @DB_VERSION@) -ConfigureFilesToSystemtest("systemtests" "data" "*.tgz" COPYONLY "") +configurefilestosystemtest("systemtests" "data" "*.tgz" COPYONLY "") -ConfigureFilesToSystemtest("systemtests" "scripts" "functions" @ONLY "") -ConfigureFilesToSystemtest("systemtests" "scripts" "cleanup" @ONLY "") -ConfigureFilesToSystemtest("systemtests" "scripts" "setup" @ONLY "") -ConfigureFilesToSystemtest("systemtests" "scripts" "check_for_zombie_jobs" @ONLY "") -ConfigureFilesToSystemtest("systemtests" "scripts" "diff.pl.in" @ONLY "") - -ConfigureFilesToSystemtest("core/src" "defaultconfigs" "*.conf" @ONLY "") -ConfigureFilesToSystemtest("core/src" "defaultconfigs" "*.in" @ONLY "") +configurefilestosystemtest("systemtests" "scripts" "functions" @ONLY "") +configurefilestosystemtest("systemtests" "scripts" "cleanup" @ONLY "") +configurefilestosystemtest("systemtests" "scripts" "setup" @ONLY "") +configurefilestosystemtest( + "systemtests" "scripts" "check_for_zombie_jobs" @ONLY "" +) +configurefilestosystemtest("systemtests" "scripts" "diff.pl.in" @ONLY "") -ConfigureFilesToSystemtest("core" "scripts" "*.in" @ONLY "") -ConfigureFilesToSystemtest("core" "scripts" "bareos-ctl-funcs" @ONLY "") -ConfigureFilesToSystemtest("core" "scripts" "btraceback.gdb" @ONLY "") +configurefilestosystemtest("core/src" "defaultconfigs" "*.conf" @ONLY "") +configurefilestosystemtest("core/src" "defaultconfigs" "*.in" @ONLY "") -ConfigureFilesToSystemtest("core/src/cats" "ddl" "${DEFAULT_DB_TYPE}*" @ONLY "") -ConfigureFilesToSystemtest("core/src" "cats" "*.in" @ONLY "") -ConfigureFilesToSystemtest("core/src" "cats" "*_bareos_*" @ONLY "") +configurefilestosystemtest("core" "scripts" "*.in" @ONLY "") +configurefilestosystemtest("core" "scripts" "bareos-ctl-funcs" @ONLY "") +configurefilestosystemtest("core" "scripts" "btraceback.gdb" @ONLY "") -ConfigureFilesToSystemtest("core/src" "console" "*.in" @ONLY "") +configurefilestosystemtest("core/src/cats" "ddl" "${DEFAULT_DB_TYPE}*" @ONLY "") +configurefilestosystemtest("core/src" "cats" "*.in" @ONLY "") +configurefilestosystemtest("core/src" "cats" "*_bareos_*" @ONLY "") +configurefilestosystemtest("core/src" "console" "*.in" @ONLY "") file(MAKE_DIRECTORY ${subsysdir}) file(MAKE_DIRECTORY ${sbindir}) @@ -241,131 +274,133 @@ file(MAKE_DIRECTORY ${scripts}) file(MAKE_DIRECTORY ${working}) file(MAKE_DIRECTORY ${archivedir}) -execute_process(COMMAND - ${CMAKE_COMMAND} -E create_symlink ${scriptdir}/btraceback ${sbindir}/btraceback) +execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink ${scriptdir}/btraceback + ${sbindir}/btraceback +) file(REMOVE_RECURSE ${scripts}/ddl) file(RENAME ${PROJECT_BINARY_DIR}/ddl ${scripts}/ddl) file(GLOB ALL_FILES "${CMAKE_BINARY_DIR}/systemtests/cats/*_bareos_*") foreach(CURRENT_FILE ${ALL_FILES}) - string(REPLACE "${CMAKE_BINARY_DIR}/systemtests/cats/" "" TARGET_FILE ${CURRENT_FILE}) + string(REPLACE "${CMAKE_BINARY_DIR}/systemtests/cats/" "" TARGET_FILE + ${CURRENT_FILE} + ) file(RENAME ${CURRENT_FILE} ${scripts}/${TARGET_FILE}) # MESSAGE(STATUS "moved ${scripts}/${TARGET_FILE}") endforeach() set(tests_dir ${PROJECT_BINARY_DIR}/tests) set(SYSTEM_TESTS - backup-bareos-test - backup-bareos-passive-test - multiplied-device-test - virtualfull - virtualfull-bscan - backup-bscan - copy-bscan - copy-remote-bscan - bconsole-status-client - scheduler-backup-test + backup-bareos-test + backup-bareos-passive-test + multiplied-device-test + virtualfull + virtualfull-bscan + backup-bscan + copy-bscan + copy-remote-bscan + bconsole-status-client + scheduler-backup-test ) -set(SYSTEM_TESTS_DISABLED - #initialy empty +set(SYSTEM_TESTS_DISABLED # initialy empty ) -IF(PYTHON) +if(PYTHON) list(APPEND SYSTEM_TESTS "python-bareos-test") -ELSE() +else() list(APPEND SYSTEM_TESTS_DISABLED "python-bareos-test") -ENDIF() - +endif() -IF(PAM_WRAPPER_LIBRARIES) # BareosFindLibrary(pam_wrapper) +if(PAM_WRAPPER_LIBRARIES) # BareosFindLibrary(pam_wrapper) find_program(PAMTESTER pamtester) - IF(PAMTESTER) + if(PAMTESTER) set(ENV{PAM_WRAPPER_LIBRARIES} "${PAM_WRAPPER_LIBRARIES}") execute_process( - COMMAND "${CMAKE_SOURCE_DIR}/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh" + COMMAND + "${CMAKE_SOURCE_DIR}/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/systemtests/tests/bconsole-pam/" - RESULT_VARIABLE PAM_EXEC_AVAILABLE_RC + RESULT_VARIABLE PAM_EXEC_AVAILABLE_RC ) - IF(${PAM_EXEC_AVAILABLE_RC} EQUAL "0") + if(${PAM_EXEC_AVAILABLE_RC} EQUAL "0") set(PAM_EXEC_FOUND TRUE) set(ENABLE_BCONSOLE_PAM_TEST TRUE) - ENDIF() - ENDIF() -ENDIF() - + endif() + endif() +endif() -MESSAGE( STATUS "PAM_EXEC_FOUND: " ${PAM_EXEC_FOUND} ) +message(STATUS "PAM_EXEC_FOUND: " ${PAM_EXEC_FOUND}) -IF(ENABLE_BCONSOLE_PAM_TEST) +if(ENABLE_BCONSOLE_PAM_TEST) list(APPEND SYSTEM_TESTS "bconsole-pam") -ELSE() +else() list(APPEND SYSTEM_TESTS_DISABLED "bconsole-pam") -ENDIF() +endif() -IF(TARGET python-fd) +if(TARGET python-fd) list(APPEND SYSTEM_TESTS "python-fd-plugin-local-fileset-test") -ELSE() +else() list(APPEND SYSTEM_TESTS_DISABLED "python-fd-plugin-local-fileset-test") -ENDIF() +endif() -IF(TARGET python-dir) +if(TARGET python-dir) list(APPEND SYSTEM_TESTS "python-dir-plugin-test") -ELSE() +else() list(APPEND SYSTEM_TESTS_DISABLED "python-dir-plugin-test") -ENDIF() - -SET(PHP_FOUND FALSE) -SET(PYTHON_FOUND FALSE) -SET(PYTHON_SELENIUM_FOUND "NOT SEARCHED") -SET(CHROMEDRIVER_FOUND "NOT SEARCHED") - -IF(PHP) - SET(PHP_FOUND TRUE) - IF(PYTHON) - SET(PYTHON_FOUND TRUE) - PythonModuleStatus("selenium") # sets PYTHON_SELENIUM_FOUND to TRUE or FALSE - IF(${PYTHON_SELENIUM_FOUND}) +endif() + +set(PHP_FOUND FALSE) +set(PYTHON_FOUND FALSE) +set(PYTHON_SELENIUM_FOUND "NOT SEARCHED") +set(CHROMEDRIVER_FOUND "NOT SEARCHED") + +if(PHP) + set(PHP_FOUND TRUE) + if(PYTHON) + set(PYTHON_FOUND TRUE) + pythonmodulestatus("selenium") # sets PYTHON_SELENIUM_FOUND to TRUE or FALSE + if(${PYTHON_SELENIUM_FOUND}) find_program(CHROMEDRIVER chromedriver) - IF(CHROMEDRIVER) - SET(CHROMEDRIVER_FOUND TRUE) - SET(ENABLE_WEBUI_SELENIUM_TEST TRUE) - ELSE() - SET(CHROMEDRIVER_FOUND FALSE) - ENDIF() - ENDIF() - ENDIF() -ENDIF() - -MESSAGE(STATUS "PHP_FOUND: " ${PHP_FOUND}) -MESSAGE(STATUS "PYTHON_FOUND: " ${PYTHON_FOUND}) -MESSAGE(STATUS "PYTHON_SELENIUM_FOUND: " ${PYTHON_SELENIUM_FOUND}) -MESSAGE(STATUS "CHROMEDRIVER_FOUND: " ${CHROMEDRIVER_FOUND}) + if(CHROMEDRIVER) + set(CHROMEDRIVER_FOUND TRUE) + set(ENABLE_WEBUI_SELENIUM_TEST TRUE) + else() + set(CHROMEDRIVER_FOUND FALSE) + endif() + endif() + endif() +endif() + +message(STATUS "PHP_FOUND: " ${PHP_FOUND}) +message(STATUS "PYTHON_FOUND: " ${PYTHON_FOUND}) +message(STATUS "PYTHON_SELENIUM_FOUND: " ${PYTHON_SELENIUM_FOUND}) +message(STATUS "CHROMEDRIVER_FOUND: " ${CHROMEDRIVER_FOUND}) set(AVAILABLE_WEBUI_SELENIUM_TESTS - "admin-client_disabling" - "admin-rerun_job" - "admin-restore" - "admin-run_configured_job" - "admin-run_default_job" - "readonly-client_disabling" - "readonly-rerun_job" - "readonly-restore" - "readonly-run_configured_job" - "readonly-run_default_job" - ) + "admin-client_disabling" + "admin-rerun_job" + "admin-restore" + "admin-run_configured_job" + "admin-run_default_job" + "readonly-client_disabling" + "readonly-rerun_job" + "readonly-restore" + "readonly-run_configured_job" + "readonly-run_default_job" +) -IF(ENABLE_WEBUI_SELENIUM_TEST) +if(ENABLE_WEBUI_SELENIUM_TEST) set(WEBUI_SELENIUM_TESTS ${AVAILABLE_WEBUI_SELENIUM_TESTS}) -ELSE() +else() set(WEBUI_SELENIUM_TESTS) foreach(TEST_NAME_DISABLED ${AVAILABLE_WEBUI_SELENIUM_TESTS}) add_test(NAME webui:${TEST_NAME_DISABLED} COMMAND empty_command) set_tests_properties(webui:${TEST_NAME_DISABLED} PROPERTIES DISABLED true) message(STATUS "Disabled test: webui:${TEST_NAME_DISABLED}") endforeach() -ENDIF() +endif() set(BASEPORT 42001) @@ -373,66 +408,83 @@ foreach(TEST_NAME ${SYSTEM_TESTS}) prepare_test() - ConfigureFilesToSystemtest("systemtests" "tests/${TEST_NAME}" "*" @ONLY "") + configurefilestosystemtest("systemtests" "tests/${TEST_NAME}" "*" @ONLY "") handle_python_plugin_modules() configure_file("environment.in" "tests/${TEST_NAME}/environment" @ONLY) - # create a bin/bareos and bin/bconsole script - # in every testdir for start/stop and bconsole - #file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/tests/${TEST_NAME}/bin") + # create a bin/bareos and bin/bconsole script in every testdir for start/stop + # and bconsole file(MAKE_DIRECTORY + # "${CMAKE_BINARY_DIR}/tests/${TEST_NAME}/bin") configure_file("bin/bconsole" "tests/${TEST_NAME}/bin/bconsole" COPYONLY) configure_file("bin/bareos" "tests/${TEST_NAME}/bin/bareos" COPYONLY) + checkforenabledanddisabledlistentry(${TEST_NAME}) - CheckForEnabledAndDisabledListEntry(${TEST_NAME}) - - add_test(NAME "system:${TEST_NAME}" + add_test( + NAME "system:${TEST_NAME}" COMMAND ${tests_dir}/${TEST_NAME}/testrunner - WORKING_DIRECTORY ${tests_dir}/${TEST_NAME}) + WORKING_DIRECTORY ${tests_dir}/${TEST_NAME} + ) math(EXPR BASEPORT "${BASEPORT} + 10") endforeach() # webui specific settings -IF(ENABLE_WEBUI_SELENIUM_TEST) +if(ENABLE_WEBUI_SELENIUM_TEST) foreach(TEST_NAME ${WEBUI_SELENIUM_TESTS}) prepare_test() # split WEBUI_TEST_NAME into PROFILE and TESTNAME string(REPLACE "-" ";" SELENIUM_TESTCOMPONENTS ${TEST_NAME}) - #"webui-admin-restore" + # "webui-admin-restore" list(GET SELENIUM_TESTCOMPONENTS 0 BAREOS_WEBUI_PROFILE) list(GET SELENIUM_TESTCOMPONENTS 1 BAREOS_WEBUI_TESTNAME) - set(WEBUICONFDIR ${current_test_directory}/etc/bareos-webui) # used for testenvironment settings + set(WEBUICONFDIR ${current_test_directory}/etc/bareos-webui) # used for test + # environment + # settings file(MAKE_DIRECTORY ${WEBUICONFDIR}) - configure_file("${CMAKE_SOURCE_DIR}/webui/config/autoload/global.php.in" "${current_test_directory}/webui/config/autoload/global.php" @ONLY) - configure_file("${CMAKE_SOURCE_DIR}/systemtests/tests/webui-common/directors.ini.in" "${current_test_directory}/etc/bareos-webui/directors.ini" @ONLY) - file(COPY "${CMAKE_SOURCE_DIR}/webui/install/configuration.ini" DESTINATION "${current_test_directory}/etc/bareos-webui/") - configure_file("${CMAKE_SOURCE_DIR}/systemtests/tests/webui-common/testrunner.in" "${current_test_directory}/testrunner" @ONLY) + configure_file( + "${CMAKE_SOURCE_DIR}/webui/config/autoload/global.php.in" + "${current_test_directory}/webui/config/autoload/global.php" @ONLY + ) + configure_file( + "${CMAKE_SOURCE_DIR}/systemtests/tests/webui-common/directors.ini.in" + "${current_test_directory}/etc/bareos-webui/directors.ini" @ONLY + ) + file(COPY "${CMAKE_SOURCE_DIR}/webui/install/configuration.ini" + DESTINATION "${current_test_directory}/etc/bareos-webui/" + ) + configure_file( + "${CMAKE_SOURCE_DIR}/systemtests/tests/webui-common/testrunner.in" + "${current_test_directory}/testrunner" @ONLY + ) - ConfigureFilesToSystemtest("systemtests" "tests/${TEST_NAME}" "*" @ONLY "tests/webui-common") + configurefilestosystemtest( + "systemtests" "tests/${TEST_NAME}" "*" @ONLY "tests/webui-common" + ) configure_file("environment.in" "tests/${TEST_NAME}/environment" @ONLY) - # create a bin/bareos and bin/bconsole script - # in every testdir for start/stop and bconsole - #file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/tests/${TEST_NAME}/bin") + # create a bin/bareos and bin/bconsole script in every testdir for + # start/stop and bconsole file(MAKE_DIRECTORY + # "${CMAKE_BINARY_DIR}/tests/${TEST_NAME}/bin") configure_file("bin/bconsole" "tests/${TEST_NAME}/bin/bconsole" COPYONLY) configure_file("bin/bareos" "tests/${TEST_NAME}/bin/bareos" COPYONLY) - CheckForEnabledAndDisabledListEntry(${TEST_NAME}) + checkforenabledanddisabledlistentry(${TEST_NAME}) - add_test(NAME "webui:${TEST_NAME}" COMMAND ${tests_dir}/${TEST_NAME}/testrunner WORKING_DIRECTORY ${tests_dir}/${TEST_NAME}) + add_test( + NAME "webui:${TEST_NAME}" + COMMAND ${tests_dir}/${TEST_NAME}/testrunner + WORKING_DIRECTORY ${tests_dir}/${TEST_NAME} + ) math(EXPR BASEPORT "${BASEPORT} + 10") endforeach() -ENDIF() - - - +endif() foreach(TEST_NAME_DISABLED ${SYSTEM_TESTS_DISABLED}) - CheckForEnabledAndDisabledListEntry(${TEST_NAME_DISABLED}) + checkforenabledanddisabledlistentry(${TEST_NAME_DISABLED}) add_test(NAME system:${TEST_NAME_DISABLED} COMMAND empty_command) set_tests_properties(system:${TEST_NAME_DISABLED} PROPERTIES DISABLED true) message(STATUS "Disabled test: system:${TEST_NAME_DISABLED}") @@ -441,47 +493,56 @@ endforeach() # create symlinks for the binaries set(BINARIES_TO_LINK_TO_SBIN - dird/bareos-dir - dird/bareos-dbcheck - filed/bareos-fd - stored/bareos-sd - stored/bcopy - stored/btape - stored/bextract - stored/bareos-sd - stored/bls - stored/bscan - ) + dird/bareos-dir + dird/bareos-dbcheck + filed/bareos-fd + stored/bareos-sd + stored/bcopy + stored/btape + stored/bextract + stored/bareos-sd + stored/bls + stored/bscan +) -foreach (BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_SBIN}) +foreach(BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_SBIN}) get_filename_component(BINARY_NAME ${BINARY_SOURCEPATH} NAME) -execute_process(COMMAND - ${CMAKE_COMMAND} -E create_symlink ${PROJECT_BINARY_DIR}/../core/src/${BINARY_SOURCEPATH} ${sbindir}/${BINARY_NAME}) + execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${PROJECT_BINARY_DIR}/../core/src/${BINARY_SOURCEPATH} + ${sbindir}/${BINARY_NAME} + ) endforeach() set(BINARIES_TO_LINK_TO_BIN - console/bconsole - tools/bsmtp - tools/timelimit - tools/bwild - tools/bpluginfo - tools/bsmtp - tools/bscrypto - tools/btestls - tools/drivetype - tools/fstype - tools/bregex - ) + console/bconsole + tools/bsmtp + tools/timelimit + tools/bwild + tools/bpluginfo + tools/bsmtp + tools/bscrypto + tools/btestls + tools/drivetype + tools/fstype + tools/bregex +) -foreach (BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_BIN}) +foreach(BINARY_SOURCEPATH ${BINARIES_TO_LINK_TO_BIN}) get_filename_component(BINARY_NAME ${BINARY_SOURCEPATH} NAME) -execute_process(COMMAND - ${CMAKE_COMMAND} -E create_symlink ${PROJECT_BINARY_DIR}/../core/src/${BINARY_SOURCEPATH} ${bindir}/${BINARY_NAME}) + execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${PROJECT_BINARY_DIR}/../core/src/${BINARY_SOURCEPATH} + ${bindir}/${BINARY_NAME} + ) endforeach() -execute_process(COMMAND - ${CMAKE_COMMAND} -E create_symlink ${PROJECT_BINARY_DIR}/../core/src/console/bconsole ${bindir}/bconsole) - -execute_process(COMMAND - ${CMAKE_COMMAND} -E create_symlink ${scriptdir}/bareos ${bindir}/bareos) +execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${PROJECT_BINARY_DIR}/../core/src/console/bconsole ${bindir}/bconsole +) +execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink ${scriptdir}/bareos + ${bindir}/bareos +) diff --git a/vmware/CMakeLists.txt b/vmware/CMakeLists.txt index 00355f2b34a..f29fccd3daa 100644 --- a/vmware/CMakeLists.txt +++ b/vmware/CMakeLists.txt @@ -21,26 +21,20 @@ cmake_minimum_required(VERSION 3.0) project(bareos-vmware) -INCLUDE(GNUInstallDirs) +include(GNUInstallDirs) add_subdirectory(vadp_dumper) add_subdirectory(vmware_cbt_tool) add_subdirectory(vmware_plugin) -#add_subdirectory(vmware-vix-disklib) - +# add_subdirectory(vmware-vix-disklib) # # commented, as it has not been used for inherited directories. # -# set INSTALL_LIB_DIR automatically to lib or lib64 automatically -# Taken from https://cmake.org/pipermail/cmake/2013-July/055374.html - -#get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) -#if ("${LIB64}" STREQUAL "TRUE") -# set(LIBSUFFIX 64) -#else() -# set(LIBSUFFIX "") -#endif() -#set(INSTALL_LIB_DIR "lib${LIBSUFFIX}" CACHE PATH "Installation directory for libraries") -#mark_as_advanced(INSTALL_LIB_DIR) +# set INSTALL_LIB_DIR automatically to lib or lib64 automatically Taken from +# https://cmake.org/pipermail/cmake/2013-July/055374.html +# get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) if +# ("${LIB64}" STREQUAL "TRUE") set(LIBSUFFIX 64) else() set(LIBSUFFIX "") +# endif() set(INSTALL_LIB_DIR "lib${LIBSUFFIX}" CACHE PATH "Installation +# directory for libraries") mark_as_advanced(INSTALL_LIB_DIR) diff --git a/vmware/vadp_dumper/CMakeLists.txt b/vmware/vadp_dumper/CMakeLists.txt index 79960bc9bb5..bc056bd767e 100644 --- a/vmware/vadp_dumper/CMakeLists.txt +++ b/vmware/vadp_dumper/CMakeLists.txt @@ -1,20 +1,11 @@ include_directories(/usr/lib/vmware-vix-disklib/include) link_directories(/usr/lib/vmware-vix-disklib/lib64) -add_executable(bareos_vadp_dumper - bareos_vadp_dumper.cc - cbuf.cc - copy_thread.cc +add_executable(bareos_vadp_dumper bareos_vadp_dumper.cc cbuf.cc copy_thread.cc) +target_link_libraries(bareos_vadp_dumper vixDiskLib pthread jansson) +install(TARGETS bareos_vadp_dumper DESTINATION "${CMAKE_INSTALL_SBINDIR}") +install( + FILES bareos_vadp_dumper_wrapper.sh + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${CMAKE_INSTALL_SBINDIR}" ) -target_link_libraries(bareos_vadp_dumper - vixDiskLib - pthread - jansson -) -INSTALL(TARGETS bareos_vadp_dumper DESTINATION "${CMAKE_INSTALL_SBINDIR}") -INSTALL(FILES bareos_vadp_dumper_wrapper.sh - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${CMAKE_INSTALL_SBINDIR}" -) - diff --git a/vmware/vmware-vix-disklib/CMakeLists.txt b/vmware/vmware-vix-disklib/CMakeLists.txt index 01b291a872b..ebe9805ecef 100644 --- a/vmware/vmware-vix-disklib/CMakeLists.txt +++ b/vmware/vmware-vix-disklib/CMakeLists.txt @@ -1,6 +1,6 @@ -INSTALL( - DIRECTORY /usr/lib/vmware-vix-disklib/lib64/ - DESTINATION /usr/lib/vmware-vix-disklib/lib64 - FILES_MATCHING PATTERN "*.so*" +install( + DIRECTORY /usr/lib/vmware-vix-disklib/lib64/ + DESTINATION /usr/lib/vmware-vix-disklib/lib64 + FILES_MATCHING + PATTERN "*.so*" ) - diff --git a/vmware/vmware_cbt_tool/CMakeLists.txt b/vmware/vmware_cbt_tool/CMakeLists.txt index b9860ff28e6..2a022d58c5e 100644 --- a/vmware/vmware_cbt_tool/CMakeLists.txt +++ b/vmware/vmware_cbt_tool/CMakeLists.txt @@ -1,8 +1,6 @@ -INSTALL(FILES - vmware_cbt_tool.py - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${CMAKE_INSTALL_SBINDIR}" +install( + FILES vmware_cbt_tool.py + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${CMAKE_INSTALL_SBINDIR}" ) - diff --git a/vmware/vmware_plugin/CMakeLists.txt b/vmware/vmware_plugin/CMakeLists.txt index 6055684dc56..f587f98d90b 100644 --- a/vmware/vmware_plugin/CMakeLists.txt +++ b/vmware/vmware_plugin/CMakeLists.txt @@ -1,31 +1,31 @@ get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) -if ("${LIB64}" STREQUAL "TRUE") - set(LIBSUFFIX 64) +if("${LIB64}" STREQUAL "TRUE") + set(LIBSUFFIX 64) else() - set(LIBSUFFIX "") + set(LIBSUFFIX "") endif() -set(INSTALL_LIB_DIR "lib${LIBSUFFIX}" CACHE PATH "Installation directory for libraries") +set(INSTALL_LIB_DIR + "lib${LIBSUFFIX}" + CACHE PATH "Installation directory for libraries" +) mark_as_advanced(INSTALL_LIB_DIR) -INSTALL(FILES - BareosFdPluginVMware.py - bareos-fd-vmware.py - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${INSTALL_LIB_DIR}/bareos/plugins" +install( + FILES BareosFdPluginVMware.py bareos-fd-vmware.py + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${INSTALL_LIB_DIR}/bareos/plugins" ) -INSTALL(DIRECTORY - DESTINATION "${INSTALL_LIB_DIR}/bareos/plugins/vmware_plugin/" +install(DIRECTORY + DESTINATION "${INSTALL_LIB_DIR}/bareos/plugins/vmware_plugin/" ) -INSTALL( - # as this command is not handled by "INSTALL DESTINATION", - # the target path must be evaluated manually. - CODE " +install( + # as this command is not handled by "INSTALL DESTINATION", + # the target path must be evaluated manually. + CODE " execute_process(COMMAND ln -sf \ ../bareos-fd-vmware.py \ \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/bareos/plugins/vmware_plugin/bareos-fd-vmware.py ) " ) - diff --git a/webui/CMakeLists.txt b/webui/CMakeLists.txt index edf70d15513..c3d77ab63b4 100644 --- a/webui/CMakeLists.txt +++ b/webui/CMakeLists.txt @@ -19,103 +19,139 @@ cmake_minimum_required(VERSION 3.0) project(bareos-webui) -INCLUDE(GNUInstallDirs) +include(GNUInstallDirs) set(CMAKE_MODULE_PATH - ${CMAKE_MODULE_PATH} - ${PROJECT_SOURCE_DIR}/../../SOURCES - ${PROJECT_SOURCE_DIR}/../SOURCES - ${PROJECT_SOURCE_DIR}/cmake - ) + ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/../../SOURCES + ${PROJECT_SOURCE_DIR}/../SOURCES ${PROJECT_SOURCE_DIR}/cmake +) -INCLUDE(BareosLocalBuildDefinitions OPTIONAL RESULT_VARIABLE BareosLocalBuildDefinitionsFile) +include(BareosLocalBuildDefinitions OPTIONAL + RESULT_VARIABLE BareosLocalBuildDefinitionsFile +) -IF (NOT DEFINED VERSION_STRING) +if(NOT DEFINED VERSION_STRING) # try to get version info from version.h - INCLUDE(BareosExtractVersionInfo) -ELSE() + include(BareosExtractVersionInfo) +else() # we got VERSION_STRING from cmake commandline set(BAREOS_FULL_VERSION ${VERSION_STRING}) -ENDIF() +endif() -IF (BAREOS_FULL_VERSION STREQUAL "") - MESSAGE(FATAL_ERROR BAREOS_FULL_VERSION is not set) -ENDIF() +if(BAREOS_FULL_VERSION STREQUAL "") + message(FATAL_ERROR BAREOS_FULL_VERSION is not set) +endif() find_program(PHP php) # set defaults -IF(NOT DEFINED sysconfdir) - set(sysconfdir ${CMAKE_INSTALL_FULL_SYSCONFDIR}) -ENDIF() -IF(NOT DEFINED confdir) - set(confdir "${sysconfdir}/bareos") -ENDIF() -IF(NOT DEFINED webuiconfdir) - set(webuiconfdir "${sysconfdir}/bareos-webui") -ENDIF() -IF(NOT DEFINED baseport) - set(baseport 9101) -ENDIF() - -set (dirport ${baseport}) -MATH(EXPR webuiport "${baseport} + 3") +if(NOT DEFINED sysconfdir) + set(sysconfdir ${CMAKE_INSTALL_FULL_SYSCONFDIR}) +endif() +if(NOT DEFINED confdir) + set(confdir "${sysconfdir}/bareos") +endif() +if(NOT DEFINED webuiconfdir) + set(webuiconfdir "${sysconfdir}/bareos-webui") +endif() +if(NOT DEFINED baseport) + set(baseport 9101) +endif() + +set(dirport ${baseport}) +math(EXPR webuiport "${baseport} + 3") # upcase variables for CONFIGURE_FILE set(SYSCONFDIR "${sysconfdir}") set(CONFDIR "${confdir}") set(WEBUICONFDIR "${webuiconfdir}") - -MESSAGE(" PHP is ${PHP} ") -MESSAGE(" Install system config files: ${sysconfdir} ") -MESSAGE(" Install Bareos config dir: ${confdir} ") -MESSAGE(" Install BareosWebui configdir: ${webuiconfdir} ") -MESSAGE(" VERSION_STRING: ${VERSION_STRING} ") -MESSAGE(" BAREOS_FULL_VERSION: ${BAREOS_FULL_VERSION} ") +message(" PHP is ${PHP} ") +message(" Install system config files: ${sysconfdir} ") +message(" Install Bareos config dir: ${confdir} ") +message(" Install BareosWebui configdir: ${webuiconfdir} ") +message(" VERSION_STRING: ${VERSION_STRING} ") +message(" BAREOS_FULL_VERSION: ${BAREOS_FULL_VERSION} ") message(" LocalBuildDefinitionsFile: ${BareosLocalBuildDefinitionsFile}") -IF (EXISTS ${sysconfdir}/httpd/conf.d) - SET(HTTPD_CONF ${sysconfdir}/httpd/conf.d) -ELSEIF (EXISTS ${sysconfdir}/apache2/conf.d) - SET(HTTPD_CONF ${sysconfdir}/apache2/conf.d) -ELSEIF (EXISTS ${sysconfdir}/apache/conf.d) - SET(HTTPD_CONF ${sysconfdir}/apache/conf.d) -ELSEIF (EXISTS ${sysconfdir}/apache2/conf-available) - SET(HTTPD_CONF ${sysconfdir}/apache2/conf-available) -ELSE() - SET(HTTPD_CONF ${sysconfdir}/httpd/conf.d) -ENDIF() - -CONFIGURE_FILE(config/autoload/global.php.in ${CMAKE_CURRENT_SOURCE_DIR}/config/autoload/global.php @ONLY) -CONFIGURE_FILE(install/directors.ini.in ${CMAKE_CURRENT_SOURCE_DIR}/install/directors.ini @ONLY) -CONFIGURE_FILE(install/configuration.ini.in ${CMAKE_CURRENT_SOURCE_DIR}/install/configuration.ini @ONLY) - -CONFIGURE_FILE(version.php.in ${CMAKE_CURRENT_SOURCE_DIR}/version.php @ONLY) -CONFIGURE_FILE(module/Application/view/layout/layout.phtml.in ${CMAKE_CURRENT_SOURCE_DIR}/module/Application/view/layout/layout.phtml @ONLY) -CONFIGURE_FILE(module/Application/view/layout/login.phtml.in ${CMAKE_CURRENT_SOURCE_DIR}/module/Application/view/layout/login.phtml @ONLY) - -SET(WEBUI_DIR ${SHARE_INSTALL_PREFIX}/bareos-webui) -SET(WEBUI_TESTS_DIR ${WEBUI_DIR}/tests/regress) -IF (PHP) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test @ONLY) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test-tls.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test-tls @ONLY) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test-tls.php.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test-tls.php @ONLY) -ELSE() - MESSAGE("PHP not found") -ENDIF() - -IF(NOT client-only) - INSTALL(FILES version.php init_autoloader.php DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui) - INSTALL(DIRECTORY tests config data module public vendor DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui) - - INSTALL(FILES install/bareos/bareos-dir.d/console/admin.conf.example DESTINATION ${confdir}/bareos-dir.d/console/) - INSTALL(FILES install/bareos/bareos-dir.d/profile/webui-admin.conf DESTINATION ${confdir}/bareos-dir.d/profile/) - INSTALL(FILES install/bareos/bareos-dir.d/profile/webui-limited.conf.example DESTINATION ${confdir}/bareos-dir.d/profile/) - INSTALL(FILES install/bareos/bareos-dir.d/profile/webui-readonly.conf DESTINATION ${confdir}/bareos-dir.d/profile/) - INSTALL(FILES install/apache/bareos-webui.conf DESTINATION ${HTTPD_CONF}/) - - INSTALL(FILES install/directors.ini DESTINATION ${webuiconfdir}) - INSTALL(FILES install/configuration.ini DESTINATION ${webuiconfdir}) -ENDIF() - +if(EXISTS ${sysconfdir}/httpd/conf.d) + set(HTTPD_CONF ${sysconfdir}/httpd/conf.d) +elseif(EXISTS ${sysconfdir}/apache2/conf.d) + set(HTTPD_CONF ${sysconfdir}/apache2/conf.d) +elseif(EXISTS ${sysconfdir}/apache/conf.d) + set(HTTPD_CONF ${sysconfdir}/apache/conf.d) +elseif(EXISTS ${sysconfdir}/apache2/conf-available) + set(HTTPD_CONF ${sysconfdir}/apache2/conf-available) +else() + set(HTTPD_CONF ${sysconfdir}/httpd/conf.d) +endif() + +configure_file( + config/autoload/global.php.in + ${CMAKE_CURRENT_SOURCE_DIR}/config/autoload/global.php @ONLY +) +configure_file( + install/directors.ini.in ${CMAKE_CURRENT_SOURCE_DIR}/install/directors.ini + @ONLY +) +configure_file( + install/configuration.ini.in + ${CMAKE_CURRENT_SOURCE_DIR}/install/configuration.ini @ONLY +) + +configure_file(version.php.in ${CMAKE_CURRENT_SOURCE_DIR}/version.php @ONLY) +configure_file( + module/Application/view/layout/layout.phtml.in + ${CMAKE_CURRENT_SOURCE_DIR}/module/Application/view/layout/layout.phtml @ONLY +) +configure_file( + module/Application/view/layout/login.phtml.in + ${CMAKE_CURRENT_SOURCE_DIR}/module/Application/view/layout/login.phtml @ONLY +) + +set(WEBUI_DIR ${SHARE_INSTALL_PREFIX}/bareos-webui) +set(WEBUI_TESTS_DIR ${WEBUI_DIR}/tests/regress) +if(PHP) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test.in + ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test @ONLY + ) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test-tls.in + ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test-tls + @ONLY + ) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test-tls.php.in + ${CMAKE_CURRENT_SOURCE_DIR}/tests/regress/webui-bsock-connection-test-tls.php + @ONLY + ) +else() + message("PHP not found") +endif() + +if(NOT client-only) + install(FILES version.php init_autoloader.php + DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui + ) + install(DIRECTORY tests config data module public vendor + DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui + ) + + install(FILES install/bareos/bareos-dir.d/console/admin.conf.example + DESTINATION ${confdir}/bareos-dir.d/console/ + ) + install(FILES install/bareos/bareos-dir.d/profile/webui-admin.conf + DESTINATION ${confdir}/bareos-dir.d/profile/ + ) + install(FILES install/bareos/bareos-dir.d/profile/webui-limited.conf.example + DESTINATION ${confdir}/bareos-dir.d/profile/ + ) + install(FILES install/bareos/bareos-dir.d/profile/webui-readonly.conf + DESTINATION ${confdir}/bareos-dir.d/profile/ + ) + install(FILES install/apache/bareos-webui.conf DESTINATION ${HTTPD_CONF}/) + + install(FILES install/directors.ini DESTINATION ${webuiconfdir}) + install(FILES install/configuration.ini DESTINATION ${webuiconfdir}) +endif() diff --git a/webui/cmake/BareosExtractVersionInfo.cmake b/webui/cmake/BareosExtractVersionInfo.cmake index 037d6627a02..5f3eaa819fa 100644 --- a/webui/cmake/BareosExtractVersionInfo.cmake +++ b/webui/cmake/BareosExtractVersionInfo.cmake @@ -24,31 +24,26 @@ if(NOT DEFINED VERSION_STRING) set(VERSION_STRING "${GIT_DESCRIBE_VERSION}") else() message( - FATAL_ERROR "VERSION_STRING not set, BareosVersion.cmake not found and no version data from git available." - ) + FATAL_ERROR + "VERSION_STRING not set, BareosVersion.cmake not found and no version data from git available." + ) endif() else() message(STATUS "Using version information from ${BareosVersionFile}") endif() endif() -string(REGEX MATCH - [0-9.a-zA-Z~]+ - BAREOS_FULL_VERSION - ${VERSION_STRING}) +string(REGEX MATCH [0-9.a-zA-Z~]+ BAREOS_FULL_VERSION ${VERSION_STRING}) if(BAREOS_FULL_VERSION STREQUAL "") message(FATAL_ERROR "BAREOS_FULL_VERSION is not set") endif() -string(REGEX MATCH - [0-9]+.[0-9]+.[0-9]+ - BAREOS_NUMERIC_VERSION - ${VERSION_STRING}) -string(REPLACE "\"" - "" - BAREOS_FULL_VERSION - ${BAREOS_FULL_VERSION}) +string(REGEX MATCH [0-9]+.[0-9]+.[0-9]+ BAREOS_NUMERIC_VERSION + ${VERSION_STRING} +) +string(REPLACE "\"" "" BAREOS_FULL_VERSION ${BAREOS_FULL_VERSION}) message(STATUS "BareosExtractVersionInfo: BAREOS_FULL_VERSION is " - ${BAREOS_FULL_VERSION}) + ${BAREOS_FULL_VERSION} +) diff --git a/webui/cmake/BareosLocalBuildDefinitions.cmake b/webui/cmake/BareosLocalBuildDefinitions.cmake index 69fb3e5da9b..3683ee9462e 100644 --- a/webui/cmake/BareosLocalBuildDefinitions.cmake +++ b/webui/cmake/BareosLocalBuildDefinitions.cmake @@ -18,5 +18,9 @@ # 02110-1301, USA. set(BareosComSubscriptionLink "https://www.bareos.com/en/Subscription.html") -set(BareosGetOfficialBinariesAndSupportOnBareosComMainPage "Get official binaries and support on bareos.com") -set(BareosGetOfficialBinariesAndSupportOnBareosComLoginPage "Get official binaries and support on bareos.com") +set(BareosGetOfficialBinariesAndSupportOnBareosComMainPage + "Get official binaries and support on bareos.com" +) +set(BareosGetOfficialBinariesAndSupportOnBareosComLoginPage + "Get official binaries and support on bareos.com" +) diff --git a/write_version_files.cmake b/write_version_files.cmake index f37f967ed0a..53244cb9263 100644 --- a/write_version_files.cmake +++ b/write_version_files.cmake @@ -17,9 +17,10 @@ cmake_minimum_required(VERSION 3.0) -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" - "${CMAKE_CURRENT_LIST_DIR}/core/cmake" - "${CMAKE_CURRENT_LIST_DIR}/webui/cmake") +set(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_LIST_DIR}/cmake" "${CMAKE_CURRENT_LIST_DIR}/core/cmake" + "${CMAKE_CURRENT_LIST_DIR}/webui/cmake" +) find_package(Git) include(BareosVersionFromGit) @@ -34,11 +35,18 @@ else() endif() set(version_file_header "# autogenerated by write_version_files.cmake") -set(version_file_contents "${version_file_header}\nset(VERSION_STRING \"${VERSION_STRING}\")\nset(VERSION_TIMESTAMP \"${VERSION_TIMESTAMP}\")\n") +set(version_file_contents + "${version_file_header}\nset(VERSION_STRING \"${VERSION_STRING}\")\nset(VERSION_TIMESTAMP \"${VERSION_TIMESTAMP}\")\n" +) -message(STATUS "Configuring source tree for version ${VERSION_STRING} with timestamp ${VERSION_TIMESTAMP}") +message( + STATUS + "Configuring source tree for version ${VERSION_STRING} with timestamp ${VERSION_TIMESTAMP}" +) foreach(subdir "core" "webui") - set(version_file_name "${CMAKE_CURRENT_LIST_DIR}/${subdir}/cmake/BareosVersion.cmake") + set(version_file_name + "${CMAKE_CURRENT_LIST_DIR}/${subdir}/cmake/BareosVersion.cmake" + ) message(STATUS "Writing ${version_file_name}") file(WRITE ${version_file_name} "${version_file_contents}") endforeach()