Revision: 8113
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8113&view=rev
Author: efiring
Date: 2010-02-06 23:44:28 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Let setup.cfg customize the base directory for libs and includes
Modified Paths:
--------------
trunk/matplotlib/setup.cfg.template
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setup.cfg.template
===================================================================
--- trunk/matplotlib/setup.cfg.template 2010-02-06 22:30:12 UTC (rev 8112)
+++ trunk/matplotlib/setup.cfg.template 2010-02-06 23:44:28 UTC (rev 8113)
@@ -4,6 +4,11 @@
[egg_info]
tag_svn_revision = 1
+[directories]
+# Uncomment to override the default basedir in setupext.py.
+# This can be a single directory or a space-delimited list of directories.
+#basedirlist = /usr
+
[status]
# To suppress display of the dependencies and their versions
# at the top of the build log, uncomment the following line:
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2010-02-06 22:30:12 UTC (rev 8112)
+++ trunk/matplotlib/setupext.py 2010-02-06 23:44:28 UTC (rev 8113)
@@ -119,7 +119,8 @@
'build_macosx': 'auto',
'build_image': True,
'build_windowing': True,
- 'backend': None}
+ 'backend': None,
+ 'basedirlist': None}
defines = [
('PY_ARRAY_UNIQUE_SYMBOL', 'MPL_ARRAY_API'),
@@ -161,7 +162,16 @@
try: options['backend'] = config.get("rc_options", "backend")
except: pass
+ try: options['basedirlist'] = config.get("directories", "basedirlist")
+ except: pass
+# For get_base_flags:
+if options['basedirlist']:
+ basedirlist = options['basedirlist'].split()
+else:
+ basedirlist = basedir[sys.platform]
+print "basedirlist is:", basedirlist
+
if options['display_status']:
def print_line(char='='):
print char * 76
@@ -331,10 +341,10 @@
def add_base_flags(module):
incdirs = filter(os.path.exists,
- [os.path.join(p, 'include') for p in
basedir[sys.platform] ])
+ [os.path.join(p, 'include') for p in basedirlist ])
libdirs = filter(os.path.exists,
- [os.path.join(p, 'lib') for p in
basedir[sys.platform] ]+
- [os.path.join(p, 'lib64') for p in
basedir[sys.platform] ] )
+ [os.path.join(p, 'lib') for p in basedirlist ]+
+ [os.path.join(p, 'lib64') for p in basedirlist ] )
module.include_dirs.extend(incdirs)
module.include_dirs.append('.')
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
