ry-bot script

MarcToussaint · Nov 2, 2023 · 858c823 · 858c823
1 parent 459792f
commit 858c823
Show file tree

Hide file tree

Showing 8 changed files with 1,936 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -12,9 +12,9 @@ local-install:
 	+make -C build _robotic docstrings install
 
 local-clean:
-	-rm -R ${HOME}/.local/lib/python3.8/site-packages/robotic*
-	-rm ${HOME}/.local/lib/*rai*
-	-rm ${HOME}/.local/bin/*ry*
+	-rm -Rf ${HOME}/.local/lib/python3.8/site-packages/robotic*
+	-rm -f ${HOME}/.local/lib/*rai*
+	-rm -f ${HOME}/.local/bin/*ry*
 
 wheels:
 	$(eval id = $(shell _build_utils/run-docker.sh -d))

diff --git a/_build_utils/CMakeLists-docker.txt b/_build_utils/CMakeLists-docker.txt
@@ -174,10 +174,3 @@ get_property(_defs DIRECTORY PROPERTY COMPILE_DEFINITIONS)
 message(STATUS "[rai] compiler flags: " "${_defs}")
 
 ################################################################################
-
-add_custom_target(docstrings #ALL
-  DEPENDS _robotic
-  COMMAND ${PYTHON_EXECUTABLE} /opt/_internal/cpython-${PYBIND11_PYTHON_VERSION}.*/bin/pybind11-stubgen _robotic
-  COMMAND mv stubs/_robotic*/__init__.pyi _robotic.pyi)
-
-
diff --git a/_build_utils/CMakeLists-ubuntu.txt b/_build_utils/CMakeLists-ubuntu.txt
@@ -183,7 +183,7 @@ message(STATUS "[rai] compiler flags: " "${_defs}")
 
 add_custom_target(docstrings #ALL
   DEPENDS _robotic
-  COMMAND pybind11-stubgen _robotic
+  COMMAND env PYTHONPATH="." pybind11-stubgen --ignore-invalid=all _robotic
   COMMAND mv stubs/_robotic*/__init__.pyi _robotic.pyi)
 
 add_executable(kinEdit rai/bin/src_kinEdit/main.cpp)
@@ -206,7 +206,7 @@ install(
   DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE}/robotic)
 
 install(
-  FILES robotic/__init__.py robotic/version.py robotic/render.py #${CMAKE_BINARY_DIR}/_robotic.pyi
+  FILES robotic/__init__.py robotic/version.py robotic/render.py robotic/_robotic.pyi
   DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE}/robotic)
 
 install(
@@ -227,5 +227,5 @@ install(
   DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 install(
-  PROGRAMS robotic/ry-view
+  PROGRAMS robotic/ry-view robotic/ry-bot
   DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
diff --git a/_build_utils/build-wheels.sh b/_build_utils/build-wheels.sh
@@ -29,12 +29,8 @@ for ver in 8 9 10 11 6 7; do
     cmake -B build_wheel -DPYBIND11_PYTHON_VERSION=3.$ver .
     make -C build_wheel _robotic
 
-    echo -e "\n\n======== documenting (python version " $ver ") ========"
-    make -C build_wheel docstrings
-
     echo -e "\n\n======== build wheel (python version " $ver ") ========"
     cp -f build_wheel/_robotic.*3$ver*.so robotic/_robotic.so
-    cp -f build_wheel/stubs/_robotic*/__init__.pyi robotic/_robotic.pyi
     strip --strip-unneeded robotic/_robotic.so
     python3.$ver setup.py bdist_wheel
     #break