[pypy-commit] pypy split-rpython: Using cdir instead of pypydir in pypy module when possible

[Aquana]

Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r59710:6fa7a8c8236b
Date: 2013-01-05 07:31 +0100
http://bitbucket.org/pypy/pypy/changeset/6fa7a8c8236b/

Log:	Using cdir instead of pypydir in pypy module when possible

diff --git a/pypy/module/_lsprof/interp_lsprof.py b/pypy/module/_lsprof/interp_lsprof.py
--- a/pypy/module/_lsprof/interp_lsprof.py
+++ b/pypy/module/_lsprof/interp_lsprof.py
@@ -11,14 +11,14 @@
 from rpython.rlib.rtimer import read_timestamp, _is_64_bit
 from rpython.rtyper.lltypesystem import rffi, lltype
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from pypy.conftest import pypydir
+from rpython.translator.translator import cdir
 from rpython.rlib.rarithmetic import r_longlong
 
 import time, sys
 
 # cpu affinity settings
 
-srcdir = py.path.local(pypydir).join('translator', 'c', 'src')
+srcdir = py.path.local(cdir).join('src')
 eci = ExternalCompilationInfo(
     separate_module_files=[srcdir.join('profiling.c')],
     export_symbols=['pypy_setup_profiling', 'pypy_teardown_profiling'])
diff --git a/pypy/module/_multibytecodec/c_codecs.py b/pypy/module/_multibytecodec/c_codecs.py
--- a/pypy/module/_multibytecodec/c_codecs.py
+++ b/pypy/module/_multibytecodec/c_codecs.py
@@ -1,7 +1,7 @@
 import py
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from pypy.conftest import pypydir
+from rpython.translator.translator import cdir
 
 UNICODE_REPLACEMENT_CHARACTER = u'\uFFFD'
 
@@ -15,7 +15,7 @@
         return 'EncodeDecodeError(%r, %r, %r)' % (self.start, self.end,
                                                   self.reason)
 
-srcdir = py.path.local(pypydir).join('translator', 'c')
+srcdir = py.path.local(cdir)
 
 codecs = [
     # _codecs_cn
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -10,6 +10,7 @@
 from rpython.rtyper.lltypesystem import ll2ctypes
 from rpython.rtyper.annlowlevel import llhelper
 from rpython.rlib.objectmodel import we_are_translated
+from rpython.translator.translator import cdir
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from rpython.translator.gensupp import NameManager
 from rpython.tool.udir import udir
@@ -48,7 +49,7 @@
 pypydir = py.path.local(pypydir)
 include_dir = pypydir / 'module' / 'cpyext' / 'include'
 source_dir = pypydir / 'module' / 'cpyext' / 'src'
-translator_c_dir = pypydir / 'translator' / 'c'
+translator_c_dir = py.path.local(cdir)
 include_dirs = [
     include_dir,
     translator_c_dir,
diff --git a/pypy/module/signal/interp_signal.py b/pypy/module/signal/interp_signal.py
--- a/pypy/module/signal/interp_signal.py
+++ b/pypy/module/signal/interp_signal.py
@@ -7,9 +7,9 @@
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rtyper.tool import rffi_platform
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.translator.translator import cdir
 import py
 import sys
-from pypy.conftest import pypydir
 from rpython.rlib import jit, rposix
 from rpython.rlib.rarithmetic import intmask, is_valid_int
 
@@ -41,7 +41,7 @@
 if sys.platform != 'win32':
     includes.append('sys/time.h')
 
-cdir = py.path.local(pypydir).join('translator', 'c')
+cdir = py.path.local(cdir)
 
 eci = ExternalCompilationInfo(
     includes = includes,
diff --git a/pypy/module/thread/ll_thread.py b/pypy/module/thread/ll_thread.py
--- a/pypy/module/thread/ll_thread.py
+++ b/pypy/module/thread/ll_thread.py
@@ -1,6 +1,7 @@
 
 from rpython.rtyper.lltypesystem import rffi, lltype, llmemory
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.translator.translator import cdir
 import py
 from rpython.rlib import jit, rgc
 from rpython.rlib.debug import ll_assert
@@ -13,7 +14,7 @@
     pass
 
 pypydir = py.path.local(pypydir)
-translator_c_dir = pypydir / 'translator' / 'c'
+translator_c_dir = py.path.local(cdir)
 
 eci = ExternalCompilationInfo(
     includes = ['src/thread.h'],