Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch:
Changeset: r46502:941ff313eede
Date: 2011-08-14 22:02 +0200
http://bitbucket.org/pypy/pypy/changeset/941ff313eede/
Log: An attempt to have the win32 buildbot use external libraries: expat,
zlib, bzip2, openssl.
diff --git a/pypy/rpython/tool/rffi_platform.py
b/pypy/rpython/tool/rffi_platform.py
--- a/pypy/rpython/tool/rffi_platform.py
+++ b/pypy/rpython/tool/rffi_platform.py
@@ -11,6 +11,7 @@
from pypy.translator.tool.cbuild import ExternalCompilationInfo
from pypy.translator.platform import CompilationError
from pypy.tool.udir import udir
+from pypy.tool.autopath import pypydir
from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, intmask
# ____________________________________________________________
@@ -699,6 +700,13 @@
# ____________________________________________________________
+PYPY_EXTERNAL_DIR = py.path.local(pypydir).join('..', '..')
+# XXX make this configurable
+if sys.platform == 'win32':
+ libdir = py.path.local('c:/buildslave/support') # on the bigboard buildbot
+ if libdir.exists():
+ PYPY_EXTERNAL_DIR = libdir
+
def configure_external_library(name, eci, configurations,
symbol=None, _cache={}):
"""try to find the external library.
@@ -740,11 +748,7 @@
if prefix and not os.path.isabs(prefix):
import glob
- # XXX make this a global option?
- from pypy.tool.autopath import pypydir
- external_dir = py.path.local(pypydir).join('..', '..')
-
- entries = glob.glob(str(external_dir.join(prefix + '*')))
+ entries = glob.glob(str(PYPY_EXTERNAL_DIR.join(prefix + '*')))
if entries:
# Get last version
prefix = sorted(entries)[-1]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
