Merge pull request #1098 from slaclab/pre-release

Release Candidate v6.8.0

Author: ruck314

CMakeLists.txt

@@ -72,38 +72,28 @@ if ( NOT NO_PYTHON )
       set(BOOST_ROOT $ENV{CONDA_PREFIX})
    endif()
 
-   # libboost_python3.7 style libraries
-   message("Looking for libboost_python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} Mode 1")
-   FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
-
-   # libboost_python3 style libraries
-   if (NOT Boost_FOUND)
-      message("Looking for libboost_python${Python3_VERSION_MAJOR} Mode 2")
-      FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS python${Python3_VERSION_MAJOR})
-   endif()
-
-   # libboost_python style libraries
-   if (NOT Boost_FOUND)
-      message("Looking for libboost_python Mode 3")
-      FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS system thread python)
-   endif()
-
-   # libboost_python-py37 style libraries
-   if (NOT Boost_FOUND)
-      message("Looking for libboost_python-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} Mode 4")
-      FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS python-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
-   endif()
-
-   # libboost_python3-py37 style libraries
-   if (NOT Boost_FOUND)
-      message("Looking for libboost_python3-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} Mode 5")
-      FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS python3-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
-   endif()
+   # Loop through potential Boost Python component names
+   set(BOOST_PYTHON_CANDIDATES
+       "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}"      # e.g. python38
+       "python${Python3_VERSION_MAJOR}"                              # e.g. python3
+       "python"                                                      # e.g. python
+       "python-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}"   # e.g. python-py38
+       "python3-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}"  # e.g. python3-py38
+   )
+
+   foreach(COMPONENT_NAME ${BOOST_PYTHON_CANDIDATES})
+       if(NOT Boost_FOUND)
+           message(STATUS "Checking for Boost component: ${COMPONENT_NAME}")
+           find_package(Boost QUIET COMPONENTS ${COMPONENT_NAME})
+       else()
+           break()
+       endif()
+   endforeach()
 
    # Nothing worked
    if (NOT Boost_FOUND)
       message("")
-      message(FATAL_ERROR "Failed to find boost libraries!")
+      message(FATAL_ERROR "Failed to find boost libraries! Tried: ${BOOST_PYTHON_CANDIDATES}")
    endif()
 
 else()
@@ -316,7 +306,7 @@ set(CONF_INCLUDE_DIRS ${CMAKE_INSTALL_INCLUDEDIR})
 
 # Setup configuration file
 if ((${ROGUE_INSTALL} STREQUAL "system") OR (${ROGUE_INSTALL} STREQUAL "conda"))
-   set(CONF_LIBRARIES PUBLIC rogue-core)
+   set(CONF_LIBRARIES rogue-core)
 else()
    if (APPLE)
       set(CONF_LIBRARIES ${CMAKE_INSTALL_LIBDIR}/librogue-core.${ROGUE_SOVER}.dylib)

conda-recipe/meta.yaml

@@ -15,6 +15,9 @@ requirements:
      - git
      - cmake
      - make
+     # Target CentOS 7 glibc (2.17) for maximum compatibility
+     # OR target Rocky 8 glibc (2.28) specifically
+     - sysroot_linux-64 2.28
    host:
      - boost
      - bzip2

docs/src/installing/build.rst

@@ -15,7 +15,7 @@ The following packages are required to build the rogue library:
 
 * cmake   >= 3.15
 * Boost   >= 1.58
-* python3 >= 3.7
+* python3 >= 3.9
 * bz2
 
 Package Manager Install
@@ -44,6 +44,7 @@ RHEL-based systems (E.g. Rocky 9)
    $ sudo dnf install -y cmake
    $ sudo dnf install -y python3
    $ sudo dnf install -y boost-devel
+   $ sudo dnf install -y boost-python3-devel
    $ sudo dnf install -y bzip2-devel
    $ sudo dnf install -y python3-pip
    $ sudo dnf install -y git

docs/src/installing/yocto.rst

@@ -36,8 +36,8 @@ You will want to replace the file `sources/meta-user/recipes-apps/rogue/rogue.bb
    # rogue recipe for Yocto
    #
 
-   ROGUE_VERSION = "6.6.1"
-   ROGUE_MD5SUM  = "0c0a5d4c32ab2cf5bca46edb92d9e13e"
+   ROGUE_VERSION = "6.7.0"
+   ROGUE_MD5SUM  = "51e6797e9f3fb61b22ad0804a471b760"
 
    SUMMARY = "Recipe to build Rogue"
    HOMEPAGE ="https://github.com/slaclab/rogue"

docs/src/pyrogue_tree/index.rst

@@ -8,7 +8,11 @@ The PyRogue Tree implements a tree structure for the hierarchical organization o
 
 .. toctree::
    :maxdepth: 1
-   :caption: Using Nodes In The PyRogue Tree:
+   :caption: Types Of Nodes In The PyRogue Tree:
 
    node/index
+   root/index
+   device/index
+   command/index
+   variable/index