[openrtm-commit:01066] r567 - trunk/OpenRTM-aist-Python

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-04-30 22:34:31 +0900 (Tue, 30 Apr 2013)
New Revision: 567

Modified:
   trunk/OpenRTM-aist-Python/MANIFEST.in
   trunk/OpenRTM-aist-Python/setup.py
Log:
Now clean_doc command is not sub-command of clean command. MANIFEST.in has been updated to include package build scripts.

Modified: trunk/OpenRTM-aist-Python/MANIFEST.in
===================================================================
--- trunk/OpenRTM-aist-Python/MANIFEST.in	2013-04-29 08:56:25 UTC (rev 566)
+++ trunk/OpenRTM-aist-Python/MANIFEST.in	2013-04-30 13:34:31 UTC (rev 567)
@@ -1,19 +1,8 @@
 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 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: trunk/OpenRTM-aist-Python/setup.py
===================================================================
--- trunk/OpenRTM-aist-Python/setup.py	2013-04-29 08:56:25 UTC (rev 566)
+++ trunk/OpenRTM-aist-Python/setup.py	2013-04-30 13:34:31 UTC (rev 567)
@@ -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)
 
 
@@ -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)
     ]