Merge pull request #314 from n-kawauchi/manager_cmd

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

Author: n-ando

OpenRTM_aist/DefaultConfiguration.py

@@ -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
@@ -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",
@@ -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)

OpenRTM_aist/utils/rtcd/rtcd2_python3 OpenRTM_aist/utils/rtcd/rtcd2_pythonOpenRTM_aist/utils/rtcd/rtcd2_python3 renamed to OpenRTM_aist/utils/rtcd/rtcd2_python

@@ -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)

…nRTM_aist/utils/rtcprof/rtcprof2_python3 …enRTM_aist/utils/rtcprof/rtcprof2_pythonOpenRTM_aist/utils/rtcprof/rtcprof2_python3 renamed to OpenRTM_aist/utils/rtcprof/rtcprof2_python OpenRTM_aist/utils/rtcprof/rtcprof2_python3 renamed to OpenRTM_aist/utils/rtcprof/rtcprof2_python

@@ -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}/
 }
 

packages/deb/debian/rules

@@ -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