[openrtm-commit:01975] r710 - in branches/RELENG_1_1/OpenRTM-aist-Python: . OpenRTM_aist installer/install_scripts

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-05-26 19:25:37 +0900 (Thu, 26 May 2016)
New Revision: 710

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/
   branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py
   branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh
   branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
Log:
[merge] r705-707 have been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497
/branches/work/OpenRTM-aist-Python:504-542
/trunk/OpenRTM-aist-Python:662,702
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497
/branches/work/OpenRTM-aist-Python:504-542
/trunk/OpenRTM-aist-Python:662,702,705-707

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in	2016-05-24 08:49:25 UTC (rev 709)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in	2016-05-26 10:25:37 UTC (rev 710)
@@ -10,3 +10,4 @@
 recursive-include OpenRTM_aist *.conf *.exe *.idl *.py *.pth *.sh
 recursive-include OpenRTM_aist *.bat *.exe *.sample README
 recursive-include OpenRTM_aist/docs *.css *.gif *.png *.html *.hhc *.hhk *.hhp
+prune OpenRTM_aist/examples/NXTRTC
\ No newline at end of file

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py	2016-05-24 08:49:25 UTC (rev 709)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/ExtTrigExecutionContext.py	2016-05-26 10:25:37 UTC (rev 710)
@@ -75,7 +75,7 @@
     return
 
 
-  def __del__(self):
+  def __del__(self, Task=OpenRTM_aist.Task):
     self._rtcout.RTC_TRACE("ExtTrigExecutionContext.__del__()")
     guard = OpenRTM_aist.ScopedLock(self._svcmutex)
     self._svc = False
@@ -393,6 +393,16 @@
 
     return RTC.RTC_OK
 
+  # virtual RTC::ReturnCode_t onStopping();
+  def onStopping(self):
+    guard = OpenRTM_aist.ScopedLock(self._svcmutex)
+    self._svc = False
+    del guard
+    
+    # stop thread
+    self.tick()
+    
+    return RTC.RTC_OK
 
   ##
   # @brief onWaitingActivated() template function

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh	2016-05-24 08:49:25 UTC (rev 709)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh	2016-05-26 10:25:37 UTC (rev 710)
@@ -63,7 +63,7 @@
 # コードネーム取得
 #---------------------------------------
 check_codename () {
-    cnames="sarge etch lenny squeeze wheezy"
+    cnames="sarge etch lenny squeeze wheezy jessie"
     for c in $cnames; do
 	if test -f "/etc/apt/sources.list"; then
 	    res=`grep $c /etc/apt/sources.list`

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/setup.py	2016-05-24 08:49:25 UTC (rev 709)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/setup.py	2016-05-26 10:25:37 UTC (rev 710)
@@ -280,13 +280,16 @@
 # <prefix>/share/openrtm-1.1/examples/python/SimpleIO/ConsoleIn.py
 #
 #------------------------------------------------------------
-def create_filelist(start_path, subs_path, target_path, regex_match):
+def create_filelist(start_path, subs_path, target_path, regex_match, 
+not_included_modules=[]):
   filelist = []
   temp_hash = {}
   if start_path[-1] != "/": start_path += "/"
   if subs_path[-1] != "/": subs_path += "/"
   import re
   for root, dirs, files in os.walk(start_path):
+    if root.replace("\\","/") in not_included_modules:
+      continue
     for filename in files:
       if re.match(regex_match, filename):
         subdir = re.sub(subs_path, "", root)
@@ -965,7 +968,8 @@
 pkg_example_files   = create_filelist(example_dir,
                                       example_dir,
                                       target_example_dir,
-                                      example_match_regex)
+                                      example_match_regex,
+                                      ["OpenRTM_aist/examples/NXTRTC"])
 
 
 #


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478,488-497
/branches/work/OpenRTM-aist-Python/setup.py:505-509
   + /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478,488-497
/branches/work/OpenRTM-aist-Python/setup.py:505-509
/trunk/OpenRTM-aist-Python/setup.py:705-707