[openrtm-commit:00182] r413 - trunk/OpenRTM-aist-Python
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 6月 16日 (木) 15:56:10 JST
Author: kurihara
Date: 2011-06-16 15:56:10 +0900 (Thu, 16 Jun 2011)
New Revision: 413
Modified:
trunk/OpenRTM-aist-Python/setup.py
Log:
r402 merged.
Modified: trunk/OpenRTM-aist-Python/setup.py
===================================================================
--- trunk/OpenRTM-aist-Python/setup.py 2011-06-16 06:01:09 UTC (rev 412)
+++ trunk/OpenRTM-aist-Python/setup.py 2011-06-16 06:56:10 UTC (rev 413)
@@ -260,6 +260,11 @@
#self.manifest = "MANIFEST"
self.use_defaults = 0
self.force_manifest = 1
+ stub_dirs = ["SimpleService","SimpleService__POA"]
+
+ for dir_ in stub_dirs:
+ if not os.path.isdir(os.path.join(os.getcwd(),"OpenRTM_aist","examples","SimpleService",dir_)):
+ os.mkdir(os.path.join(os.getcwd(),"OpenRTM_aist","examples","SimpleService",dir_))
else:
self.use_defaults = 0
self.force_manifest = 1
@@ -339,29 +344,44 @@
"NXTRTC",
"SeqIO",
"SimpleIO",
- {"SimpleService":["_GlobalIDL","_GlobalIDL__POA"]},
+ {"SimpleService":["SimpleService","SimpleService__POA"]},
"Slider_and_Motor",
"TkLRFViewer",
"TkJoyStick"]
example_data_files = []
+simpleservice_path = glob.glob(os.path.join("OpenRTM_aist", "examples", "SimpleService"))[0]
+simpleservice_path += "/SimpleService/__init__.py"
+example_data_files.append((os.path.join(example_sitedir, "SimpleService", "SimpleService"),
+ [simpleservice_path]))
+
+simpleservice__poa_path = glob.glob(os.path.join("OpenRTM_aist", "examples", "SimpleService"))[0]
+simpleservice__poa_path += "/SimpleService__POA/__init__.py"
+example_data_files.append((os.path.join(example_sitedir, "SimpleService", "SimpleService__POA"),
+ [simpleservice__poa_path]))
+
+simpleservice_idl_path = glob.glob(os.path.join("OpenRTM_aist", "examples", "SimpleService"))[0]
+simpleservice_idl_path += "/MyService_idl.py"
+example_data_files.append((os.path.join(example_sitedir, "SimpleService"),
+ [simpleservice_idl_path]))
+
for ex in example_dir:
if isinstance(ex, str):
py_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples", ex, "*.py"))
- conf_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples",ex,"*.conf"))
- idl_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples",ex,"*.idl"))
+ conf_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples", ex, "*.conf"))
+ idl_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples", ex, "*.idl"))
if py_path_:
for pp_ in py_path_:
- example_data_files.append((os.path.join(example_sitedir, ex),[pp_]))
+ example_data_files.append((os.path.join(example_sitedir, ex), [pp_]))
if conf_path_:
for cp_ in conf_path_:
- example_data_files.append((os.path.join(example_sitedir, ex),[cp_]))
+ example_data_files.append((os.path.join(example_sitedir, ex), [cp_]))
if idl_path_:
for ip_ in idl_path_:
- example_data_files.append((os.path.join(example_sitedir, ex),[ip_]))
+ example_data_files.append((os.path.join(example_sitedir, ex), [ip_]))
elif isinstance(ex, dict):
vals_ = ex.values()
@@ -369,35 +389,44 @@
if isinstance(vals_, list):
if isinstance(vals_[0], list):
for val_ in vals_[0]:
- stub_path_ = glob.glob(os.path.join("OpenRTM_aist","examples",
- key_, val_,"*.py"))
+ stub_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples",
+ key_, val_, "*.py"))
if stub_path_:
for sp_ in stub_path_:
- example_data_files.append((os.path.join(example_sitedir, key_, val_),[sp_]))
+ example_data_files.append((os.path.join(example_sitedir, key_, val_), [sp_]))
elif isinstance(vals_[0], str):
- stub_path_ = glob.glob(os.path.join("OpenRTM_aist","examples",
- key_, vals_[0],"*.py"))
+ stub_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples",
+ key_, vals_[0], "*.py"))
if stub_path_:
for sp_ in stub_path_:
- example_data_files.append((os.path.join(example_sitedir, key_, vals_[0]),[sp_]))
+ example_data_files.append((os.path.join(example_sitedir, key_, vals_[0]), [sp_]))
- py_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples",key_, "*.py"))
- conf_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples",key_,"*.conf"))
- idl_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples",key_,"*.idl"))
+ py_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples", key_, "*.py"))
+ conf_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples", key_, "*.conf"))
+ idl_path_ = glob.glob(os.path.join("OpenRTM_aist", "examples", key_, "*.idl"))
if py_path_:
for pp_ in py_path_:
- example_data_files.append((os.path.join(example_sitedir, key_),[pp_]))
+ example_data_files.append((os.path.join(example_sitedir, key_), [pp_]))
if conf_path_:
for cp_ in conf_path_:
- example_data_files.append((os.path.join(example_sitedir, key_),[cp_]))
+ example_data_files.append((os.path.join(example_sitedir, key_), [cp_]))
if idl_path_:
for ip_ in idl_path_:
- example_data_files.append((os.path.join(example_sitedir, key_),[ip_]))
+ example_data_files.append((os.path.join(example_sitedir, key_), [ip_]))
win32_packages = ["OpenRTM_aist",
"OpenRTM_aist.RTM_IDL",
+ "OpenRTM_aist.RTM_IDL.OpenRTM",
+ "OpenRTM_aist.RTM_IDL.OpenRTM__POA",
+ "OpenRTM_aist.RTM_IDL.RTC",
+ "OpenRTM_aist.RTM_IDL.RTC__POA",
+ "OpenRTM_aist.RTM_IDL.RTM",
+ "OpenRTM_aist.RTM_IDL.RTM__POA",
+ "OpenRTM_aist.RTM_IDL.SDOPackage",
+ "OpenRTM_aist.RTM_IDL.SDOPackage__POA",
+ "OpenRTM_aist.RTM_IDL.device_interfaces",
"OpenRTM_aist.examples.AutoControl",
"OpenRTM_aist.examples.Composite",
"OpenRTM_aist.examples.ConfigSample",
@@ -482,6 +511,7 @@
examples_install = False
cwd_ = os.getcwd()
+
if cwd_.find("OpenRTM-aist-Python-example-1.0.0") != -1 or \
cwd_.find("openrtm-aist-python-example-1.0.0") != -1:
@@ -584,8 +614,8 @@
scripts= ['OpenRTM_aist/utils/rtcprof/rtcprof_python.bat',
'OpenRTM_aist/utils/rtcd/rtcd_python.bat',
'OpenRTM_aist/utils/rtcd/rtcd_python.exe'],
- data_files = win32_data_files,
- script_args = ["sdist", "--format=zip"])
+ data_files = win32_data_files)
+# script_args = ["sdist", "--format=zip"])
except Exception, e:
log.error("Error: %s", e)
Property changes on: trunk/OpenRTM-aist-Python/setup.py
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-412
openrtm-commit メーリングリストの案内