[openrtm-commit:01068] r569 - in branches/RELENG_1_1/OpenRTM-aist-Python: . packages/deb

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-05-01 10:27:36 +0900 (Wed, 01 May 2013)
New Revision: 569

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/
   branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
   branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/dpkg_build.sh
   branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
Log:
[merge,trunk] merged r565-r568 from trunk. setup.py and deb packaging scripts. 


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
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in	2013-04-30 13:45:57 UTC (rev 568)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/MANIFEST.in	2013-05-01 01:27:36 UTC (rev 569)
@@ -1,19 +1,9 @@
 include OpenRTM-aist.pth
 include MANIFEST.in
-include MANIFEST_examples.in
 include setup.py
 include README
-recursive-include OpenRTM_aist *.py *.pth *.conf *.sample README *.idl *.sh
-recursive-include OpenRTM_aist/RTM_IDL *.py *.idl
-recursive-include OpenRTM_aist/utils *.py *.idl *.conf
+recursive-include packages/deb *.sh copyright changelog rules README* control control.* files
+recursive-include installer *.rtf *.in *.wxs *.vbs *.bmp *.txt *.sh *.wxl *.cmd *.py
+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
-include OpenRTM_aist/ext/sdo/observer/setup.bat
-include OpenRTM_aist/ext/sdo/observer/test/setup.bat
-include OpenRTM_aist/utils/rtcd/rtcd_python
-include OpenRTM_aist/utils/rtcd/rtcd_python.bat
-include OpenRTM_aist/utils/rtcd/rtcd_python.exe
-include OpenRTM_aist/utils/rtcprof/rtcprof_python
-include OpenRTM_aist/utils/rtcprof/rtcprof_python.bat
-include OpenRTM_aist/docs/Makefile
-include OpenRTM_aist/docs/Doxyfile_jp
-include OpenRTM_aist/docs/Doxyfile_en

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/dpkg_build.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/dpkg_build.sh	2013-04-30 13:45:57 UTC (rev 568)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/packages/deb/dpkg_build.sh	2013-05-01 01:27:36 UTC (rev 569)
@@ -116,5 +116,9 @@
 cd $packagedir
 
 dpkg-buildpackage -W -us -uc -rfakeroot
+if test $? -ne 0; then
+  echo "dpkg-build failed"
+  exit -1
+fi
 
 mv $packagedir/../openrtm-aist* $packagedir/packages/

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/setup.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/setup.py	2013-04-30 13:45:57 UTC (rev 568)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/setup.py	2013-05-01 01:27:36 UTC (rev 569)
@@ -241,7 +241,7 @@
 #
 document_dir          = "OpenRTM_aist/docs"
 target_doc_dir        = "share/openrtm-" + pkg_shortver + "/docs/python"
-document_match_regex  = ".*\.(html|png|gif||css|hhc|hhp|hhk)$"
+document_match_regex  = ".*\.(css|gif|png|html||hhc|hhk|hhp)$"
 document_path         = os.path.normpath(current_dir + "/" + document_dir)
 
 
@@ -348,7 +348,7 @@
   for line in open(file_name, "r"):
     try:
       outdata = conv_encoding(line.rstrip('\r\n'), char_code)
-    except Exception as e:
+    except Exception, e:
       print "Exception cought in " + file_name + ": " + line
       print e
       outfd.close()
@@ -403,6 +403,8 @@
   """
   def exec_doxygen(cmd):
     # remove target dir
+    if os.path.exists(target_dir + "/html/index.html"):
+      return
     if os.path.exists(target_dir):
       shutil.rmtree(target_dir)
 
@@ -660,7 +662,6 @@
   # sub_command member attribute
   sub_commands = [
     ('clean_core', None),
-    ('clean_doc',  None),
     ('clean_example', None)
     ]
 
@@ -842,10 +843,12 @@
   def finalize_options(self):
     self.set_undefined_options('install_core_lib',
                                ('install_dir','install_dir'))
-    self.set_undefined_options('install_core',
-                               ('install_layout','install_layout'))
-    self.set_undefined_options('install_core',
-                               ('prefix_option','prefix_option'))
+    if hasattr(self, 'install_layout'):
+      self.set_undefined_options('install_core',
+                                 ('install_layout','install_layout'))
+    if hasattr(self, 'prefix_option'):
+      self.set_undefined_options('install_core',
+                                 ('prefix_option','prefix_option'))
     _install_egg_info.finalize_options(self)
 
 


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
/trunk/OpenRTM-aist-Python/setup.py:559
   + /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478
/trunk/OpenRTM-aist-Python/setup.py:559,565-568