Skip to content
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

マネージャー関連コマンド名の変更 #314

Merged
merged 1 commit into from
May 27, 2024
Merged

マネージャー関連コマンド名の変更 #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 5 additions & 12 deletions OpenRTM_aist/DefaultConfiguration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
lang = "Python"
elif os.name == "posix":
cpp_suffixes = "so"
supported_languages = "C++, Python, Python3, Java"
lang = "Python3"
supported_languages = "C++, Python, Java"
lang = "Python"
else:
cpp_suffixes = "dylib"
supported_languages = "C++, Python, Python3, Java"
lang = "Python3"
supported_languages = "C++, Python, Java"
lang = "Python"

##
# @if jp
Expand Down Expand Up @@ -90,7 +90,7 @@
"manager.auto_shutdown_duration", "20.0",
"manager.termination_waittime", "1.0",
"manager.name", "manager",
"manager.command", "rtcd_python",
"manager.command", "rtcd2_python",
"manager.nameservers", "default",
"manager.language", lang,
"manager.components.naming_policy", "process_unique",
Expand All @@ -112,10 +112,3 @@
"manager.modules.Python.load_paths", "",
"manager.modules.Java.load_paths", ""]

if os.name != "nt":
python3_config = [
"manager.modules.Python3.manager_cmd", "rtcd2_python3",
"manager.modules.Python3.profile_cmd", "rtcprof2_python3",
"manager.modules.Python3.suffixes", "py",
"manager.modules.Python3.load_paths", ""]
default_config.extend(python3_config)
0 OpenRTM_aist/utils/rtcd/rtcd2_python3 → OpenRTM_aist/utils/rtcd/rtcd2_python
View file
Open in desktop
File renamed without changes.
0 OpenRTM_aist/utils/rtcprof/rtcprof2_python3 → OpenRTM_aist/utils/rtcprof/rtcprof2_python
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/deb/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ install: build

# for openrtm2-python3 package
(mkdir -p $(TARGET)/bin)
(cp $(CURDIR)/bin/rtc*2_python3 $(TARGET)/bin)
(cp $(CURDIR)/bin/rtc*2_python $(TARGET)/bin)
(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)
Expand Down
4 changes: 2 additions & 2 deletions packages/deb/dpkg_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ extract_source()
rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcd/README
rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcd/*.conf
rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcd/*.bat
rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcd/rtcd2_python3
rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcd/rtcd2_python
rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcprof/*.bat
rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcprof/rtcprof2_python3
rm ${BUILD_ROOT}/OpenRTM_aist/utils/rtcprof/rtcprof2_python
cp -r ../../local/bin ${BUILD_ROOT}/
}

Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ zip_safe = True
include_package_data = True

scripts =
OpenRTM_aist/utils/rtcd/rtcd2_python3
OpenRTM_aist/utils/rtcprof/rtcprof2_python3
OpenRTM_aist/utils/rtcd/rtcd2_python
OpenRTM_aist/utils/rtcprof/rtcprof2_python

Loading