Revision: 499
http://rpy.svn.sourceforge.net/rpy/?rev=499&view=rev
Author: lgautier
Date: 2008-04-19 13:10:21 -0700 (Sat, 19 Apr 2008)
Log Message:
-----------
- cut out un-necessary dependencies
- made setup.py run with Win32
Modified Paths:
--------------
branches/rpy_nextgen/setup.py
Modified: branches/rpy_nextgen/setup.py
===================================================================
--- branches/rpy_nextgen/setup.py 2008-04-19 15:28:47 UTC (rev 498)
+++ branches/rpy_nextgen/setup.py 2008-04-19 20:10:21 UTC (rev 499)
@@ -1,9 +1,7 @@
import os, os.path, sys, shutil, re, itertools
from distutils.core import setup, Extension
-from subprocess import Popen, PIPE
-
#FIXME: still needed ?
try:
import ctypes
@@ -16,11 +14,13 @@
RHOMES = os.getenv('RHOMES')
if RHOMES is None:
- RHOMES = Popen(["R", "RHOME"], stdout=PIPE).communicate()[0].strip()
+
+ RHOMES = os.popen("R RHOME").readlines()
#Twist if 'R RHOME' spits out a warning
- if RHOMES.startswith("WARNING"):
- i = RHOMES.find(os.linesep)
- RHOMES = RHOMES[i:]
+ if RHOMES[0].startswith("WARNING"):
+ RHOMES = RHOMES[1]
+ else:
+ RHOMES = RHOMES[0]
RHOMES = [RHOMES, ]
else:
RHOMES = RHOMES.split(os.pathsep)
@@ -28,7 +28,11 @@
def get_rversion(RHOME):
r_exec = os.path.join(RHOME, 'bin', 'R')
- rp = os.popen(r_exec+' --version')
+ # Twist if Win32
+ if sys.platform=="win32":
+ rp = os.popen3('"'+r_exec+'" --version')[2]
+ else:
+ rp = os.popen('"'+r_exec+'" --version')
rversion = rp.readline()
#Twist if 'R RHOME' spits out a warning
if rversion.startswith("WARNING"):
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 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
