Author: Wim Lavrijsen <[email protected]>
Branch: reflex-support
Changeset: r62339:f4974f9f635f
Date: 2013-03-14 12:37 -0700
http://bitbucket.org/pypy/pypy/changeset/f4974f9f635f/
Log: fix for Issue1422: there should be no need for $ROOTSYS if root-
config is available
diff --git a/pypy/module/cppyy/capi/reflex_capi.py
b/pypy/module/cppyy/capi/reflex_capi.py
--- a/pypy/module/cppyy/capi/reflex_capi.py
+++ b/pypy/module/cppyy/capi/reflex_capi.py
@@ -9,18 +9,23 @@
srcpath = pkgpath.join("src")
incpath = pkgpath.join("include")
+import commands
+(config_stat, incdir) = commands.getstatusoutput("root-config --incdir")
+
if os.environ.get("ROOTSYS"):
- import commands
- (stat, incdir) = commands.getstatusoutput("root-config --incdir")
- if stat != 0: # presumably Reflex-only
+ if config_stat != 0: # presumably Reflex-only
rootincpath = [os.path.join(os.environ["ROOTSYS"], "include")]
rootlibpath = [os.path.join(os.environ["ROOTSYS"], "lib64"),
os.path.join(os.environ["ROOTSYS"], "lib")]
else:
rootincpath = [incdir]
rootlibpath = commands.getoutput("root-config --libdir").split()
else:
- rootincpath = []
- rootlibpath = []
+ if config_stat == 0:
+ rootincpath = [incdir]
+ rootlibpath = commands.getoutput("root-config --libdir").split()
+ else:
+ rootincpath = []
+ rootlibpath = []
def identify():
return 'Reflex'
diff --git a/pypy/module/cppyy/test/Makefile b/pypy/module/cppyy/test/Makefile
--- a/pypy/module/cppyy/test/Makefile
+++ b/pypy/module/cppyy/test/Makefile
@@ -7,7 +7,7 @@
ifeq ($(ROOTSYS),)
genreflex=genreflex
- cppflags=
+ cppflags=-I$(shell root-config --incdir) -L$(shell root-config --libdir)
else
genreflex=$(ROOTSYS)/bin/genreflex
ifeq ($(wildcard $(ROOTSYS)/include),) # standard locations used?
diff --git a/pypy/module/cppyy/test/test_pythonify.py
b/pypy/module/cppyy/test/test_pythonify.py
--- a/pypy/module/cppyy/test/test_pythonify.py
+++ b/pypy/module/cppyy/test/test_pythonify.py
@@ -6,6 +6,9 @@
test_dct = str(currpath.join("example01Dict.so"))
def setup_module(mod):
+ # force removal of ROOTSYS for this one test, which serves as a test itself
+ if os.getenv("ROOTSYS"):
+ os.unsetenv("ROOTSYS")
if sys.platform == 'win32':
py.test.skip("win32 not supported so far")
err = os.system("cd '%s' && make example01Dict.so" % currpath)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
