cmake: install platlib into a subdir of build-base dir

distutils' install command installs all stuff under $build-base, which
includes the temporary files. and rpm packaging does not like::
  Installed (but unpackaged) file(s)
and to support both py2 and py3, we should encode the python version
into the path, otherwise the built files will be overwritten.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
index 75f17c99e0c5ae32aaeafa63352ed8cad12b33e4..40cea274e5a336592d67d230ae6f63cbec5a796a 100644 (file)
--- a/cmake/modules/AddCephTest.cmake
+++ b/cmake/modules/AddCephTest.cmake
@@ -13,7 +13,7 @@ function(add_ceph_test test_name test_path)
     CEPH_BUILD_DIR=${CMAKE_BINARY_DIR}
     LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
     PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH}
-    PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules:${CMAKE_SOURCE_DIR}/src/pybind
+    PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.${PYTHON_VERSION_MAJOR}:${CMAKE_SOURCE_DIR}/src/pybind
     CEPH_BUILD_VIRTUALENV=${CEPH_BUILD_VIRTUALENV})
   # none of the tests should take more than 1 hour to complete
   set_property(TEST

diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
index 5ddc8fbc9725a8a13230a85db86bdfaf224c9905..277f31067ea5b0af81679275e01a1385777b5d1b 100644 (file)
--- a/cmake/modules/Distutils.cmake
+++ b/cmake/modules/Distutils.cmake
@@ -47,7 +47,7 @@ function(distutils_add_cython_module name src)
     CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
     CFLAGS=\"-iquote${CMAKE_SOURCE_DIR}/src/include\"
     ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
-    build --build-base ${CYTHON_MODULE_DIR} --build-platlib ${CYTHON_MODULE_DIR} --verbose
+    build --build-base ${CYTHON_MODULE_DIR} --build-platlib ${CYTHON_MODULE_DIR}/lib.${PYTHON_VERSION_MAJOR} --verbose
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ${src})
 endfunction(distutils_add_cython_module)
@@ -71,7 +71,7 @@ function(distutils_install_cython_module name)
            CPPFLAGS=\"-iquote${CMAKE_SOURCE_DIR}/src/include\"
            LDFLAGS=\"-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\"
            ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
-           build --build-base ${CYTHON_MODULE_DIR} --build-platlib ${CYTHON_MODULE_DIR} --verbose
+           build --build-base ${CYTHON_MODULE_DIR} --build-platlib ${CYTHON_MODULE_DIR}/lib.${PYTHON_VERSION_MAJOR} --verbose
            build_ext --cython-c-in-temp --build-temp ${CMAKE_CURRENT_BINARY_DIR} --cython-include-dirs ${PROJECT_SOURCE_DIR}/src/pybind/rados
            install \${options} --single-version-externally-managed --record /dev/null
            egg_info --egg-base ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/src/ceph.in b/src/ceph.in
index 54e738cc6a4d7fa044fc4f027939ec95471ea1c7..a6ba4e6bbd2e6e0b51f5df0203623dc28512d9f7 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -66,12 +66,16 @@ def respawn_in_path(lib_path, pybind_path, pythonlib_path):
     sys.path.insert(0, os.path.join(MYDIR, pybind_path))
     sys.path.insert(0, os.path.join(MYDIR, pythonlib_path))
 
+def get_pythonlib_dir():
+    """Returns the name of a distutils build directory"""
+    return "lib.{version[0]}".format(version=sys.version_info)
+
 if MYDIR.endswith('src') and \
    os.path.exists(os.path.join(MYDIR, '.libs')) and \
    os.path.exists(os.path.join(MYDIR, 'pybind')) and \
    os.path.exists(os.path.join(MYDIR, 'build')):
 
-    python_libpath = os.path.join(MYDIR, 'build')
+    python_libpath = os.path.join(MYDIR, 'build', get_pythonlib_dir())
     respawn_in_path(os.path.join(MYDIR, '.libs'), 'pybind', python_libpath)
     if 'PATH' in os.environ and MYDIR not in os.environ['PATH']:
         os.environ['PATH'] += ':' + MYDIR
@@ -92,7 +96,9 @@ elif os.path.exists(os.path.join(os.getcwd(), "CMakeCache.txt")) \
         lib_path = os.path.join(os.getcwd(), "lib")
         bin_path = os.path.join(os.getcwd(), "bin")
         pybind_path = os.path.join(src_path, "src", "pybind")
-        pythonlib_path = os.path.join(lib_path, "cython_modules")
+        pythonlib_path = os.path.join(lib_path,
+                                      "cython_modules",
+                                      get_pythonlib_dir())
 
         respawn_in_path(lib_path, pybind_path, pythonlib_path)
 

diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am
index 0431f028e052912950e274f2a8d33226664a718e..386f45c6ffab917955b7ef2d94043e3f1e9b933c 100644 (file)
--- a/src/pybind/cephfs/Makefile.am
+++ b/src/pybind/cephfs/Makefile.am
@@ -23,7 +23,7 @@ cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h
        fi ; \
        cd $(srcdir)/pybind/cephfs; $(PY_DISTUTILS) build \
        --build-base $(shell readlink -f $(builddir))/build \
-       --build-platlib $(shell readlink -f $(builddir))/build \
+       --build-platlib $(shell readlink -f $(builddir))/build/lib.2 \
        install \
        $$options $$root \
        --single-version-externally-managed \

diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am
index a61b25293ddf24ec01a2ca7ba017e0658798254d..57bcc8412ccd463e7a243843291c3cc802bc103c 100644 (file)
--- a/src/pybind/rados/Makefile.am
+++ b/src/pybind/rados/Makefile.am
@@ -23,7 +23,7 @@ rados-pybind-install-exec: ${srcdir}/ceph_ver.h
        fi ; \
        cd $(srcdir)/pybind/rados; $(PY_DISTUTILS) build \
        --build-base $(shell readlink -f $(builddir))/build \
-       --build-platlib $(shell readlink -f $(builddir))/build \
+       --build-platlib $(shell readlink -f $(builddir))/build/lib.2 \
        install \
        $$options $$root \
        --single-version-externally-managed \

diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am
index 866e4d87cf4f8a565c617e658038f5be85519f12..27de18ea4f61359bfd98a21a5400ffd9d903a1ed 100644 (file)
--- a/src/pybind/rbd/Makefile.am
+++ b/src/pybind/rbd/Makefile.am
@@ -23,7 +23,7 @@ rbd-pybind-install-exec: ${srcdir}/ceph_ver.h
        fi ; \
        cd $(srcdir)/pybind/rbd; $(PY_DISTUTILS) build \
        --build-base $(shell readlink -f $(builddir))/build \
-       --build-platlib $(shell readlink -f $(builddir))/build \
+       --build-platlib $(shell readlink -f $(builddir))/build/lib.2 \
        install \
        $$options $$root \
        --single-version-externally-managed \