From db377d04cb3938a3d56f165afea87e709f43593d Mon Sep 17 00:00:00 2001 From: n-kawauchi Date: Wed, 24 Apr 2024 16:47:48 +0900 Subject: [PATCH] Supported changing the installation location of OpenRTM-aist.pth in the whl file. --- packages/deb/debian/rules | 2 +- packages/deb/dpkg_build.sh | 2 +- setup.cfg | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/deb/debian/rules b/packages/deb/debian/rules index d8f26886..0f7bb2d9 100644 --- a/packages/deb/debian/rules +++ b/packages/deb/debian/rules @@ -49,7 +49,7 @@ install: build (mkdir -p $(TARGET)/lib/python3/dist-packages) (cp -r $(CURDIR)/OpenRTM_aist $(TARGET)/lib/python3/dist-packages) (cp -r $(CURDIR)/OpenRTM_aist*.dist-info $(TARGET)/lib/python3/dist-packages) - (cp $(CURDIR)/bin/OpenRTM-aist.pth $(TARGET)/lib/python3/dist-packages) + (cp $(CURDIR)/OpenRTM-aist.pth $(TARGET)/lib/python3/dist-packages) # for openrtm2-python3-example package (mkdir -p $(TARGET_example)) diff --git a/packages/deb/dpkg_build.sh b/packages/deb/dpkg_build.sh index 7c586fd7..0492e412 100644 --- a/packages/deb/dpkg_build.sh +++ b/packages/deb/dpkg_build.sh @@ -117,6 +117,7 @@ extract_source() mkdir ${BUILD_ROOT} cp -r ../../examples ${BUILD_ROOT}/ cp -r ../../OpenRTM_aist* ${BUILD_ROOT}/ + cp ../../OpenRTM-aist.pth ${BUILD_ROOT}/ find ${BUILD_ROOT}/examples | grep -E "(/__pycache__$|\.pyc$|\.pyo$)" | xargs rm -rf find ${BUILD_ROOT}/examples -name "*.bat" | xargs rm -f rm ${BUILD_ROOT}/examples/rtc.conf.sample @@ -142,7 +143,6 @@ extract_source() rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcprof/*.bat rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcprof/rtcprof2_python3 cp -r ../../local/bin ${BUILD_ROOT}/ - chmod -x ${BUILD_ROOT}/bin/*.pth } create_files() diff --git a/setup.cfg b/setup.cfg index 9c86d27d..1381ec8c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,5 +16,4 @@ include_package_data = True scripts = OpenRTM_aist/utils/rtcd/rtcd2_python3 OpenRTM_aist/utils/rtcprof/rtcprof2_python3 - OpenRTM-aist.pth