Revision: 636
http://rpy.svn.sourceforge.net/rpy/?rev=636&view=rev
Author: lgautier
Date: 2008-08-20 14:09:47 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
- cut dead code
- (tentatively) fixed spurious Exception with -lblas #reported by Gabe
Modified Paths:
--------------
branches/rpy_nextgen/setup.py
Modified: branches/rpy_nextgen/setup.py
===================================================================
--- branches/rpy_nextgen/setup.py 2008-08-18 07:22:54 UTC (rev 635)
+++ branches/rpy_nextgen/setup.py 2008-08-20 14:09:47 UTC (rev 636)
@@ -58,8 +58,13 @@
if rconfig.startswith("WARNING"):
rconfig = rp.readline()
rconfig = rconfig.strip()
+ #sanity check of what is returned into rconfig
rconfig_m = re.match('^(-L.+) (-l.+)$', rconfig)
+ #cheap fix for the case -lblas is returned
+ #FIXME: clean/unify that at one point
if rconfig_m is None:
+ rconfig_m = re.match('^(-l.+)$', rconfig)
+ if rconfig_m is None:
# MacOSX
rconfig_m = re.match('^(-F.+) (-framework.+)$', rconfig)
if rconfig_m is None:
@@ -76,22 +81,8 @@
rversions.append(rversion)
def getRinterface_ext(RHOME, r_packversion):
- r_libs = [os.path.join(RHOME, 'lib'), os.path.join(RHOME, 'modules')]
-
- #f_in = open(os.path.join('rpy', 'rinterface', '__init__.py.in'), 'r')
- #f_out = open(os.path.join('rpy', 'rinterface', '__init__.py'), 'w')
- #f_out.write('# This file is automatically generated when installing
rpy2\n')
- #f_out.write('# For permanent changes, ' +\
- # 'edit __init__py.in in the source directory.\n\n')
+ r_libs = [os.path.join(RHOME, 'lib'), os.path.join(RHOME, 'modules')]
- #for row in f_in:
- # row = row.replace('%R_HOME%', RHOME)
- # f_out.write(row)
-
- #f_in.close()
- #f_out.close()
-
-
#FIXME: crude way (will break in many cases)
#check how to get how to have a configure step
define_macros = []
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
