[openrtm-commit:02854] r880 - trunk/OpenRTM-aist-Python

openrtm @ openrtm.org openrtm @ openrtm.org
2017年 10月 3日 (火) 10:47:57 JST


Author: miyamoto
Date: 2017-10-03 10:47:57 +0900 (Tue, 03 Oct 2017)
New Revision: 880

Modified:
   trunk/OpenRTM-aist-Python/setup.py
Log:
[compat,bugfix,->RELENG_1_2] refs #4209

Modified: trunk/OpenRTM-aist-Python/setup.py
===================================================================
--- trunk/OpenRTM-aist-Python/setup.py	2017-10-03 00:47:12 UTC (rev 879)
+++ trunk/OpenRTM-aist-Python/setup.py	2017-10-03 01:47:57 UTC (rev 880)
@@ -182,6 +182,8 @@
   "OpenRTM_aist.RTM_IDL.SDOPackage",
   "OpenRTM_aist.RTM_IDL.SDOPackage__POA",
   "OpenRTM_aist.RTM_IDL.device_interfaces",
+  "OpenRTM_aist.RTM_IDL._GlobalIDL",
+  "OpenRTM_aist.RTM_IDL._GlobalIDL__POA",
   ]
 openrtm_ext_packages = [
   "OpenRTM_aist.ext",
@@ -222,10 +224,16 @@
 pkg_scripts_unix  = ['OpenRTM_aist/utils/rtcd/rtcd_python',
                      'OpenRTM_aist/utils/rtcprof/rtcprof_python']
 pkg_scripts_win32 = ['OpenRTM_aist/utils/rtcd/rtcd.py',
-                     'OpenRTM_aist/utils/rtcd/rtcd_python.exe',
+#                     'OpenRTM_aist/utils/rtcd/rtcd_python.exe',
                      'OpenRTM_aist/utils/rtcd/rtcd_python.bat',
                      'OpenRTM_aist/utils/rtcprof/rtcprof_python.py',
                      'OpenRTM_aist/utils/rtcprof/rtcprof_python.bat']
+
+
+pkg_data_files_unix  = []
+pkg_data_files_win32 = [("Scripts", ['OpenRTM_aist/utils/rtcd/rtcd_python.exe'])]
+
+
 #
 # ext modules
 #
@@ -985,9 +993,14 @@
 #
 if os_is() == "win32":
   pkg_scripts = pkg_scripts_win32
+  pkg_data_files = pkg_data_files_win32
 else:
   pkg_scripts = pkg_scripts_unix
+  pkg_data_files = pkg_data_files_unix
 
+
+
+
 #
 # example file list -> MyDistribution.example_files
 #
@@ -1047,6 +1060,7 @@
            package_dir      = {module_dir: module_dir},
            package_data     = pkg_package_data_files,
            scripts          = pkg_scripts,
+           data_files       = pkg_data_files,
            example_files    = pkg_example_files,
            document_files   = pkg_document_files,
            )



More information about the openrtm-commit mailing list