Skip to content

[CNOID] Consider python version in cnoid file #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThomasDuvinage wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[CNOID] Consider python version in cnoid file #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e32d55
[CNOID] Consider python version in cnoid file
ThomasDuvinage Aug 5, 2024
93c6fc0
[CNOID] Consider python version of chorenoid
ThomasDuvinage Aug 6, 2024
3d7fc55
[CI] Add python version check
ThomasDuvinage Aug 7, 2024
ef5bf98
[CMake] Add ENABLE_PYTHON3 option (default OFF) and update python ver…
ThomasDuvinage Aug 7, 2024
02ccee2
[CMake] Consider choreonoid/choreonoid#41 to get the Python version u…
ThomasDuvinage Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ jobs:
catkin-test-args: --no-deps
build-packages: multi_contact_controller
test-packages: multi_contact_controller
- name: Check python
run: |
set -e
set -x
python -c "from distutils import sysconfig; print(sysconfig.get_config_var(\"VERSION\"))"
- name: Run simulation
if: env.RUN_SIMULATION_STEPS == 'true'
# https://github.com/jrl-umi3218/lipm_walking_controller/blob/b564d655388ae6a6725c504e5c74a62192e58c7c/.github/workflows/build.yml#L64-L92
Expand Down
23 changes: 23 additions & 0 deletions cnoid/project/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
if(NOT ${CHOREONOID_USE_PYTHON2})
execute_process(
COMMAND python3 -c "import sysconfig; print(sysconfig.get_config_var(\"VERSION\"))"
OUTPUT_VARIABLE PYTHON_VERSION
RESULT_VARIABLE PYTHON_VERSION_SUCCESS
OUTPUT_STRIP_TRAILING_WHITESPACE)
else()
execute_process(
COMMAND python2 -c "from distutils import sysconfig; print(sysconfig.get_config_var(\"VERSION\"))"
OUTPUT_VARIABLE PYTHON_VERSION
RESULT_VARIABLE PYTHON_VERSION_SUCCESS
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
if(NOT PYTHON_VERSION_SUCCESS STREQUAL 0)
execute_process(
COMMAND python -c "from distutils import sysconfig; print(sysconfig.get_config_var(\"VERSION\"))"
OUTPUT_VARIABLE PYTHON_VERSION
RESULT_VARIABLE PYTHON_VERSION_SUCCESS
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
message("-- Python version detected: ${PYTHON_VERSION}")

set(MCC_CNOID_CONFIG_FILE_LIST
rtc.conf.choreonoid
robot.conf
RobotHardware.conf
PDcontroller.conf.choreonoid
PDgains_sim.dat
)

foreach(CNOID_CONFIG_FILE IN LISTS MCC_CNOID_CONFIG_FILE_LIST)
execute_process(COMMAND cmake -E create_symlink
"${HRPSYSBASE_PREFIX}/share/hrpsys/samples/JVRC1/${CNOID_CONFIG_FILE}"
Expand Down
2 changes: 1 addition & 1 deletion cnoid/project/MCC_JVRC1_SampleField.in.cnoid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ OpenRTM:
"deleteUnmanagedRTCsOnStartingSimulation": true
Python:
"moduleSearchPath":
- @HRPSYSBASE_PREFIX@/lib/python2.7/dist-packages/hrpsys
- @HRPSYSBASE_PREFIX@/lib/python@PYTHON_VERSION@/dist-packages/hrpsys
viewAreas:
-
type: embedded
Expand Down