SF.net SVN: matplotlib: [4241] trunk/matplotlib

[<ds...@us...>]

Revision: 4241
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4241&view=rev
Author:   dsdale
Date:     2007-11-12 15:38:12 -0800 (Mon, 12 Nov 2007)

Log Message:
-----------
expose verbose build option in setup.cfg

Modified Paths:
--------------
    trunk/matplotlib/setup.cfg.template
    trunk/matplotlib/setup.py
    trunk/matplotlib/setupext.py

Modified: trunk/matplotlib/setup.cfg.template
===================================================================
--- trunk/matplotlib/setup.cfg.template	2007-11-12 23:29:44 UTC (rev 4240)
+++ trunk/matplotlib/setup.cfg.template	2007-11-12 23:38:12 UTC (rev 4241)
@@ -7,8 +7,10 @@
 [status]
 # To suppress display of the dependencies and their versions
 # at the top of the build log, uncomment the following line:
+#suppress = True
 #
-#suppress = True
+# Uncomment to insert lots of diagnostic prints in extension code
+#verbose = True
 
 [provide_packages]
 # By default, matplotlib checks for a few dependencies and 

Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py	2007-11-12 23:29:44 UTC (rev 4240)
+++ trunk/matplotlib/setup.py	2007-11-12 23:38:12 UTC (rev 4241)
@@ -7,9 +7,6 @@
 setup.cfg.template for more information.
 """
 
-
-VERBOSE = False # insert lots of diagnostic prints in extension code
-
 # This dict will be updated as we try to select the best option during
 # the build process. However, values in setup.cfg will be used, if 
 # defined.
@@ -186,7 +183,7 @@
     build_image(ext_modules, packages)
 
 for mod in ext_modules:
-    if VERBOSE:
+    if options['verbose']:
         mod.extra_compile_args.append('-DVERBOSE')
 
 print_raw("")

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2007-11-12 23:29:44 UTC (rev 4240)
+++ trunk/matplotlib/setupext.py	2007-11-12 23:38:12 UTC (rev 4241)
@@ -99,6 +99,7 @@
 
 # matplotlib build options, which can be altered using setup.cfg
 options = {'display_status': True, 
+           'verbose': False, 
            'provide_pytz': 'auto', 
            'provide_dateutil': 'auto', 
            'provide_configobj': 'auto', 
@@ -117,9 +118,13 @@
 if os.path.exists("setup.cfg"):
     config = ConfigParser.SafeConfigParser()
     config.read("setup.cfg")
+
     try: options['display_status'] = not config.getboolean("status", "suppress")
     except: pass
 
+    try: options['verbose'] = not config.getboolean("status", "verbose")
+    except: pass
+
     try: options['provide_pytz'] = config.getboolean("provide_packages", "pytz")
     except: options['provide_pytz'] = 'auto'
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.