Merge branch 'master' into dev/pstorz/master/python3-documentation

bareos · Sep 25, 2020 · 2313cf3 · 2313cf3
2 parents 4a6e270 + b297102
commit 2313cf3
Show file tree

Hide file tree

Showing 142 changed files with 3,764 additions and 1,772 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -173,6 +173,7 @@ Simone Caronni
 Stefan Reddig
 Stefan Warten
 Stephan Duehr
+Stev Dubau
 Sébastien Marchal
 Thomas Duemesnil
 Thomas Glatthor

diff --git a/core/cmake/BareosFindAllLibraries.cmake b/core/cmake/BareosFindAllLibraries.cmake
@@ -22,86 +22,103 @@ if(${SYSTEMD_FOUND})
   set(HAVE_SYSTEMD 1)
 endif()
 
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  set(HAVE_PYTHON 1)
+  set(Python2_FOUND 1)
+  set(Python2_EXT_SUFFIX ".dll")
+
+  set(Python3_FOUND 1)
+  set(Python3_EXT_SUFFIX ".pyd")
+
+  # Python Plugins currently cannot be built for Solaris
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  set(HAVE_PYTHON 0)
+  set(Python2_FOUND 0)
+  set(Python3_FOUND 0)
+
+else()
   if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
     message(STATUS "CMake too old for FindPython2/3, using FindPythonInterp")
     set(Python2_FOUND FALSE)
     set(Python3_FOUND FALSE)
-    set( Python_ADDITIONAL_VERSIONS 2.6 2.7)
+    set(Python_ADDITIONAL_VERSIONS 2.6 2.7)
     find_package(PythonInterp)
     find_package(PythonLibs)
     message(STATUS "Found PYTHON_VERSION_MAJOR" ${PYTHON_VERSION_MAJOR})
-    if (PYTHON_VERSION_MAJOR EQUAL 2)
+    if(PYTHON_VERSION_MAJOR EQUAL 2)
       set(Python2_FOUND ${PYTHONLIBS_FOUND})
       set(Python2_LIBRARIES ${PYTHON_LIBRARIES})
       set(Python2_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
       set(Python2_EXECUTABLE ${PYTHON_EXECUTABLE})
 
-    elseif (PYTHON_VERSION_MAJOR EQUAL 3)
+    elseif(PYTHON_VERSION_MAJOR EQUAL 3)
       set(Python3_FOUND ${PYTHONLIBS_FOUND})
       set(Python3_LIBRARIES ${PYTHON_LIBRARIES})
       set(Python3_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
       set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
     endif()
 
-    set( Python_ADDITIONAL_VERSIONS 3.6 3.7 3.8 3.9)
+    set(Python_ADDITIONAL_VERSIONS 3.6 3.7 3.8 3.9)
     find_package(PythonInterp)
     find_package(PythonLibs)
     message(STATUS "Found PYTHON_VERSION_MAJOR" ${PYTHON_VERSION_MAJOR})
 
-    if (PYTHON_VERSION_MAJOR EQUAL 2)
+    if(PYTHON_VERSION_MAJOR EQUAL 2)
       set(Python2_FOUND ${PYTHONLIBS_FOUND})
       set(Python2_LIBRARIES ${PYTHON_LIBRARIES})
       set(Python2_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
       set(Python2_EXECUTABLE ${PYTHON_EXECUTABLE})
-    elseif (PYTHON_VERSION_MAJOR EQUAL 3)
+    elseif(PYTHON_VERSION_MAJOR EQUAL 3)
       set(Python3_FOUND ${PYTHONLIBS_FOUND})
       set(Python3_LIBRARIES ${PYTHON_LIBRARIES})
       set(Python3_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
       set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
     endif()
 
   else()
-    find_package (Python2 COMPONENTS Interpreter Development)
-    find_package (Python3 COMPONENTS Interpreter Development)
+    find_package(Python2 COMPONENTS Interpreter Development)
+    find_package(Python3 COMPONENTS Interpreter Development)
   endif()
 
   if(${Python2_FOUND} OR ${Python3_FOUND})
     set(HAVE_PYTHON 1)
   endif()
 
   if(${Python2_FOUND})
-    set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE} PARENT_SCOPE)
-    set(Python2_EXECUTABLE ${Python2_EXECUTABLE} PARENT_SCOPE)
-      execute_process(
-        COMMAND ${Python2_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
-        OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake
-     )
-   include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake)
+    set(PYTHON_EXECUTABLE
+        ${Python2_EXECUTABLE}
+        PARENT_SCOPE
+    )
+    set(Python2_EXECUTABLE
+        ${Python2_EXECUTABLE}
+        PARENT_SCOPE
+    )
+    execute_process(
+      COMMAND ${Python2_EXECUTABLE}
+              ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
+      OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake
+    )
+    include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake)
   endif()
 
   if(${Python3_FOUND})
-    set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} PARENT_SCOPE)
-    set(Python3_EXECUTABLE ${Python3_EXECUTABLE} PARENT_SCOPE)
-      execute_process(
-        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
-        OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake
-     )
-   include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
+    set(PYTHON_EXECUTABLE
+        ${Python3_EXECUTABLE}
+        PARENT_SCOPE
+    )
+    set(Python3_EXECUTABLE
+        ${Python3_EXECUTABLE}
+        PARENT_SCOPE
+    )
+    execute_process(
+      COMMAND ${Python3_EXECUTABLE}
+              ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
+      OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake
+    )
+    include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
   endif()
-
-else() # windows
-    set(HAVE_PYTHON 1)
-    set(Python2_FOUND 1)
-    set(Python2_EXT_SUFFIX ".dll")
-
-    set(Python3_FOUND 1)
-    set(Python3_EXT_SUFFIX ".pyd")
 endif()
 
-
-
-
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   include(FindPostgreSQL)
 endif()
@@ -123,14 +140,18 @@ endif()
 include(BareosFindLibraryAndHeaders)
 
 bareosfindlibraryandheaders(
-  "vixDiskLib" "vixDiskLib.h" "/usr/lib/vmware-vix-disklib-distrib;/usr/lib/vmware-vix-disklib"
+  "vixDiskLib" "vixDiskLib.h"
+  "/usr/lib/vmware-vix-disklib-distrib;/usr/lib/vmware-vix-disklib"
 )
 
 # check for structmember physicalSectorSize in struct VixDiskLibCreateParams
 if(VIXDISKLIB_FOUND)
   include(CheckStructHasMember)
-  CHECK_STRUCT_HAS_MEMBER("VixDiskLibCreateParams" physicalSectorSize
-    ${VIXDISKLIB_INCLUDE_DIRS}/vixDiskLib.h VIXDISKLIBCREATEPARAMS_HAS_PHYSICALSECTORSIZE)
+  check_struct_has_member(
+    "VixDiskLibCreateParams" physicalSectorSize
+    ${VIXDISKLIB_INCLUDE_DIRS}/vixDiskLib.h
+    VIXDISKLIBCREATEPARAMS_HAS_PHYSICALSECTORSIZE
+  )
 endif()
 
 if(VIXDISKLIB_FOUND)
@@ -141,21 +162,23 @@ if(VIXDISKLIB_FOUND)
      OR (NOT DEFINED vmware_folder)
   )
     string(
-      CONCAT
-        MSG
-        "VMware Vix Disklib was found. To enable the vmware plugin test, "
-        "please provide the required information:"
-        "example:"
-        " -Dvmware_user=Administrator@vsphere.local "
-        " -Dvmware_password=\"@one2threeBareos\" "
-        " -Dvmware_vm_name=testvm1 "
-        " -Dvmware_datacenter=mydc1 "
-        " -Dvmware_folder=\"/webservers\" "
-        " -Dvmware_server=139.178.73.195"
+      CONCAT MSG
+             "VMware Vix Disklib was found. To enable the vmware plugin test, "
+             "please provide the required information:"
+             "example:"
+             " -Dvmware_user=Administrator@vsphere.local "
+             " -Dvmware_password=\"@one2threeBareos\" "
+             " -Dvmware_vm_name=testvm1 "
+             " -Dvmware_datacenter=mydc1 "
+             " -Dvmware_folder=\"/webservers\" "
+             " -Dvmware_server=139.178.73.195"
     )
     message(WARNING ${MSG})
   else()
-    set(enable_vmware_test 1 PARENT_SCOPE)
+    set(enable_vmware_test
+        1
+        PARENT_SCOPE
+    )
   endif()
 elseif(
   (DEFINED vmware_server)
@@ -165,7 +188,8 @@ elseif(
   OR (DEFINED vmware_folder)
 )
   message(
-    FATAL_ERROR "vmware options were set but VMware Vix Disklib was not found. Cannot run vmware tests."
+    FATAL_ERROR
+      "vmware options were set but VMware Vix Disklib was not found. Cannot run vmware tests."
   )
 endif()
 

diff --git a/core/platforms/debian/CMakeLists.txt b/core/platforms/debian/CMakeLists.txt
@@ -63,24 +63,27 @@ macro(bareos_install_sql_files_to_dbconfig_common)
     DB_CONFIG_COMMON "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}
   )
 
-  install(
-    DIRECTORY
-    DESTINATION
-      "${CMAKE_INSTALL_FULL_DATAROOTDIR}/dbconfig-common/data/bareos-database-common/install/"
-  )
+  if(DB_CONFIG_COMMON_BAREOS_DB_NAME STREQUAL "postgresql")
+    install(
+      DIRECTORY
+      DESTINATION
+        "${CMAKE_INSTALL_FULL_DATAROOTDIR}/dbconfig-common/data/bareos-database-common/install/"
+    )
+
+    install(
+      FILES
+        "${CMAKE_SOURCE_DIR}/core/src/cats/ddl/creates/${DB_CONFIG_COMMON_BAREOS_DB_NAME}.sql"
+      DESTINATION
+        "${CMAKE_INSTALL_FULL_DATAROOTDIR}/dbconfig-common/data/bareos-database-common/install/"
+      RENAME "${DB_CONFIG_COMMON_DEBIAN_DB_NAME}"
+    )
+  endif()
+
   install(
     DIRECTORY
     DESTINATION
       "${CMAKE_INSTALL_FULL_DATAROOTDIR}/dbconfig-common/data/bareos-database-common/upgrade/${DB_CONFIG_COMMON_DEBIAN_DB_NAME}/"
   )
-
-  install(
-    FILES
-      "${CMAKE_SOURCE_DIR}/core/src/cats/ddl/creates/${DB_CONFIG_COMMON_BAREOS_DB_NAME}.sql"
-    DESTINATION
-      "${CMAKE_INSTALL_FULL_DATAROOTDIR}/dbconfig-common/data/bareos-database-common/install/"
-    RENAME "${DB_CONFIG_COMMON_DEBIAN_DB_NAME}"
-  )
   file(
     GLOB
     SQLFILES

diff --git a/core/platforms/win32/clientdialog.ini b/core/platforms/win32/clientdialog.ini
@@ -112,20 +112,3 @@ Right=290
 Top=71
 Bottom=84
 
-
-[Field 15]
-Type=Label
-Text=Bacula compatibility
-Left=10
-Right=90
-Top=128
-Bottom=136
-
-[Field 16]
-Type=Checkbox
-Text=compatible (new bareos features cannot be used)
-Left=100
-Right=290
-Top=128
-Bottom=136
-State=0