[pypy-svn] r73209 - pypy/trunk/pypy/translator/platform

[afa at codespeak.net]

Author: afa
Date: Wed Mar 31 14:38:29 2010
New Revision: 73209

Modified:
   pypy/trunk/pypy/translator/platform/__init__.py
   pypy/trunk/pypy/translator/platform/maemo.py
   pypy/trunk/pypy/translator/platform/posix.py
   pypy/trunk/pypy/translator/platform/windows.py
Log:
Now that CPython headers are no more needed, remove the "PC" include directory on windows.


Modified: pypy/trunk/pypy/translator/platform/__init__.py
==============================================================================
--- pypy/trunk/pypy/translator/platform/__init__.py	(original)
+++ pypy/trunk/pypy/translator/platform/__init__.py	Wed Mar 31 14:38:29 2010
@@ -114,9 +114,12 @@
             for line in stderr.splitlines():
                 log.WARNING(line)
 
-    
+    def _preprocess_include_dirs(self, include_dirs):
+        # hook for maemo
+        return include_dirs
+
     def _compile_args_from_eci(self, eci, standalone):
-        include_dirs = self._preprocess_dirs(eci.include_dirs)
+        include_dirs = self._preprocess_include_dirs(eci.include_dirs)
         args = self._includedirs(include_dirs)
         if standalone:
             extra = self.standalone_only

Modified: pypy/trunk/pypy/translator/platform/maemo.py
==============================================================================
--- pypy/trunk/pypy/translator/platform/maemo.py	(original)
+++ pypy/trunk/pypy/translator/platform/maemo.py	Wed Mar 31 14:38:29 2010
@@ -42,7 +42,7 @@
             self.copied_cache[dir_from] = new_dirpath
             return new_dirpath
     
-    def _preprocess_dirs(self, include_dirs):
+    def _preprocess_include_dirs(self, include_dirs):
         """ Tweak includedirs so they'll be available through scratchbox
         """
         res_incl_dirs = []

Modified: pypy/trunk/pypy/translator/platform/posix.py
==============================================================================
--- pypy/trunk/pypy/translator/platform/posix.py	(original)
+++ pypy/trunk/pypy/translator/platform/posix.py	Wed Mar 31 14:38:29 2010
@@ -45,10 +45,6 @@
                                  cwd=str(exe_name.dirpath()))
         return exe_name
 
-    def _preprocess_dirs(self, include_dirs):
-        # hook for maemo
-        return include_dirs
-
     def _pkg_config(self, lib, opt, default):
         try:
             ret, out, err = _run_subprocess("pkg-config", [lib, opt])
@@ -87,7 +83,7 @@
         m.cfiles = rel_cfiles
 
         rel_includedirs = [pypyrel(incldir) for incldir in
-                           self._preprocess_dirs(eci.include_dirs)]
+                           self._preprocess_include_dirs(eci.include_dirs)]
 
         m.comment('automatically generated makefile')
         definitions = [

Modified: pypy/trunk/pypy/translator/platform/windows.py
==============================================================================
--- pypy/trunk/pypy/translator/platform/windows.py	(original)
+++ pypy/trunk/pypy/translator/platform/windows.py	Wed Mar 31 14:38:29 2010
@@ -116,17 +116,6 @@
             # The following symbol is used in c/src/stack.h
             self.cflags.append('/DMAX_STACK_SIZE=%d' % (stack_size - 1024))
 
-        if hasattr(sys, 'exec_prefix'):
-            self.add_cpython_dirs = True
-        else:
-            # We are certainly running pypy-c
-            self.add_cpython_dirs = False
-
-    def _preprocess_dirs(self, include_dirs):
-        if self.add_cpython_dirs:
-            return include_dirs + (py.path.local(sys.exec_prefix).join('PC'),)
-        return include_dirs
-
     def _includedirs(self, include_dirs):
         return ['/I%s' % (idir,) for idir in include_dirs]