r14356 - in /branches/gui_testing: ./ scons/manuals.py sconstruct -- August 11, 2011 - 15:48

Author: bugman
Date: Thu Aug 11 15:48:54 2011
New Revision: 14356

URL: http://svn.gna.org/viewcvs/relax?rev=14356&view=rev
Log:
Merged revisions 14354-14355 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r14354 | bugman | 2011-08-11 15:46:58 +0200 (Thu, 11 Aug 2011) | 3 lines
  
  The sconstruct script is only executed when it is the main loaded module or 
if launched by scons.
........
  r14355 | bugman | 2011-08-11 15:48:27 +0200 (Thu, 11 Aug 2011) | 5 lines
  
  Improved the list of modules and packages used in the epydoc documentation.
  
  The files and directories which are not python modules or packages are now 
properly skipped.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/scons/manuals.py
    branches/gui_testing/sconstruct

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 11 15:48:54 2011
@@ -1,1 +1,1 @@
-/1.3:1-14352
+/1.3:1-14355

Modified: branches/gui_testing/scons/manuals.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/scons/manuals.py?rev=14356&r1=14355&r2=14356&view=diff
==============================================================================
--- branches/gui_testing/scons/manuals.py (original)
+++ branches/gui_testing/scons/manuals.py Thu Aug 11 15:48:54 2011
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006, 2009 Edward d'Auvergne                                 
 #
+# Copyright (C) 2006-2011 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -23,7 +23,7 @@
 
 # Import statements.
 from glob import glob
-from os import F_OK, access, chdir, getcwd, path, remove, rename, sep, system
+from os import F_OK, access, chdir, getcwd, listdir, path, remove, rename, 
sep, system
 import sys
 
 from version import version
@@ -93,7 +93,7 @@
 
     # exclude
     #   The list of objects to exclude.
-    exclude = ['sample_scripts', 'scripts']
+    exclude = ['graphics', 'sample_scripts', 'scripts']
 
     # output
     #   The type of output that should be generated.  Should be one
@@ -246,8 +246,16 @@
     for name in exclude:
         epydoc_cmd = epydoc_cmd + ' --exclude=' + name
 
-    # Document all code!
-    epydoc_cmd = epydoc_cmd + ' *'
+    # All the files of the current directory.
+    blacklist = ['README', 'relax.bat']
+    files = listdir(getcwd())
+    for file in files:
+        # Blacklisted.
+        if file in blacklist:
+            continue
+
+        # Otherwise add it.
+        epydoc_cmd = "%s %s" % (epydoc_cmd, file)
 
 
     # Execute Epydoc.

Modified: branches/gui_testing/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/sconstruct?rev=14356&r1=14355&r2=14356&view=diff
==============================================================================
--- branches/gui_testing/sconstruct (original)
+++ branches/gui_testing/sconstruct Thu Aug 11 15:48:54 2011
@@ -571,4 +571,5 @@
 
 
 # Execute the main class.
-Main()
+if __name__ in ['__main__', 'SCons.Script']:
+    Main()