[cppyy] Move libcppyy.so to <LIBDIR>/cppyy/libcppyy.so

.github/workflows/root-ci.yml

@@ -602,7 +602,7 @@ jobs:
 
       - name: CTest in post-install test project
         working-directory: ${{ env.POST_INSTALL_DIR }}
-        run: ctest -j $(nproc)
+        run: ctest --output-on-failure -j $(nproc)
 
   event_file:
     # For any event that is not a PR, the CI will always run. In PRs, the CI

bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt

@@ -73,7 +73,8 @@ endif()
 add_library(cppyy SHARED src/CPyCppyyPyModule.cxx)
 
 # Set the suffix to '.so' and the prefix to 'lib'
-set_target_properties(cppyy PROPERTIES  ${ROOT_LIBRARY_PROPERTIES})
+set_target_properties(cppyy PROPERTIES  ${ROOT_LIBRARY_PROPERTIES}
+  LIBRARY_OUTPUT_DIRECTORY ${localruntimedir}/cppyy)
 if(MSVC)
   target_link_libraries(cppyy PRIVATE CPyCppyy)
   set_target_properties(cppyy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
@@ -108,7 +109,7 @@ set_property(GLOBAL APPEND PROPERTY ROOT_EXPORTED_TARGETS cppyy)
 
 if(NOT MSVC)
   # Make sure that relative RUNPATH to main ROOT libraries is always correct.
-  ROOT_APPEND_LIBDIR_TO_INSTALL_RPATH(cppyy ${CMAKE_INSTALL_PYTHONDIR})
+  ROOT_APPEND_LIBDIR_TO_INSTALL_RPATH(cppyy ${CMAKE_INSTALL_PYTHONDIR}/cppyy)
   ROOT_APPEND_LIBDIR_TO_INSTALL_RPATH(CPyCppyy ${CMAKE_INSTALL_LIBDIR})
 endif()
 
@@ -119,9 +120,9 @@ install(TARGETS CPyCppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
                             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
 
 install(TARGETS cppyy EXPORT ${CMAKE_PROJECT_NAME}Exports
-                            RUNTIME DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries
-                            LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries
-                            ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR} COMPONENT libraries)
+                            RUNTIME DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries # Windows
+                            LIBRARY DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries
+                            ARCHIVE DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/cppyy COMPONENT libraries)
 
 file(COPY ${headers} DESTINATION ${CMAKE_BINARY_DIR}/include/CPyCppyy)
 

bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py

@@ -40,7 +40,7 @@
     'include',                # load and jit a header file
     'c_include',              # load and jit a C header file
     'load_library',           # load a shared library
     'nullptr',                # unique pointer representing NULL
     'sizeof',                 # size of a C++ type
     'typeid',                 # typeid of a C++ type
     'multi',                  # helper for multiple inheritance
@@ -64,27 +64,27 @@
     ispypy = False
 
 from . import _typemap
 from ._version import __version__
 
 # import separately instead of in the above try/except block for easier to
 # understand tracebacks
 if ispypy:
     from ._pypy_cppyy import *
 else:
     from ._cpython_cppyy import *
 
 
 #- allow importing from gbl --------------------------------------------------
 sys.modules['cppyy.gbl'] = gbl
 sys.modules['cppyy.gbl.std'] = gbl.std
 
 
 #- external typemap ----------------------------------------------------------
 _typemap.initialize(_backend)               # also creates (u)int8_t mapper
 
 try:
     gbl.std.int8_t  = gbl.int8_t            # ensures same _integer_ type
     gbl.std.uint8_t = gbl.uint8_t
 except (AttributeError, TypeError):
     pass
 
@@ -339,10 +339,20 @@
 
         apipath_extra = os.path.join(os.path.dirname(apipath), 'site', 'python'+ldversion)
         if not os.path.exists(os.path.join(apipath_extra, 'CPyCppyy')):
-            import glob, libcppyy
-            ape = os.path.dirname(libcppyy.__file__)
-          # a "normal" structure finds the include directory up to 3 levels up,
-          # ie. dropping lib/pythonx.y[md]/site-packages
+            import glob
+            import platform
+
+            if platform.system() == "Windows":
+                # Install locations are handled differently on Windows
+                import libcppyy
+
+                ape = os.path.dirname(libcppyy.__file__)
+            else:
+                import cppyy.libcppyy as libcppyy
+
+                ape = os.path.dirname(libcppyy.__file__)
+            # a "normal" structure finds the include directory up to 3 levels up,
+            # ie. dropping lib/pythonx.y[md]/site-packages
             for i in range(3):
                 if os.path.exists(os.path.join(ape, 'include')):
                     break

bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py

@@ -2,6 +2,7 @@
 """
 
 import ctypes
+import platform
 import sys
 
 from . import _stdcpp_fix
@@ -27,7 +28,11 @@
 except ImportError:
     c = None
 
-import libcppyy as _backend
+if platform.system() == "Windows":
+    # On Windows, the library has to be searched without prefix
+    import libcppyy as _backend
+else:
+    import cppyy.libcppyy as _backend
 
 if c is not None:
     _backend._cpp_backend = c

roottest/python/basic/PyROOT_datatypetest.py

@@ -37,9 +37,7 @@ def setup_class(cls):
         cls.datatypes = cppyy.load_reflection_info(cls.test_dct)
         cls.N = cppyy.gbl.N
         # In new Cppyy, nullptr can't be found in gbl.
-        # Take it from libcppyy (we could also use ROOT.nullptr)
-        import libcppyy
-        cls.nullptr = libcppyy.nullptr
+        cls.nullptr = cppyy._backend.nullptr
 
     def test01_load_reflection_cache(self):
         """Loading reflection info twice should result in the same object"""
@@ -580,7 +578,7 @@ def test09_global_builtin_types(self):
         raises(ValueError, setattr, gbl, 'g_uint',    -1)
         raises(ValueError, setattr, gbl, 'g_ulong',   -1)
         raises(ValueError, setattr, gbl, 'g_ulong64', -1)
-                        
+
     def test10_global_ptr(self):
         """Access of global objects through a pointer"""
 

roottest/python/basic/PyROOT_datatypetest_numpy.py

@@ -37,9 +37,7 @@ def setup_class(cls):
         cls.datatypes = cppyy.load_reflection_info(cls.test_dct)
         cls.N = cppyy.gbl.N
         # In new Cppyy, nullptr can't be found in gbl.
-        # Take it from libcppyy (we could also use ROOT.nullptr)
-        import libcppyy
-        cls.nullptr = libcppyy.nullptr
+        cls.nullptr = cppyy._backend.nullptr
 
     def test01_buffer_to_numpy(self):
         """Wrap buffer with NumPy array"""