[pypy-svn] r73535 - pypy/branch/cpython-extension/pypy/translator/platform

[afa at codespeak.net]

Author: afa
Date: Thu Apr  8 09:25:39 2010
New Revision: 73535

Modified:
   pypy/branch/cpython-extension/pypy/translator/platform/maemo.py
   pypy/branch/cpython-extension/pypy/translator/platform/posix.py
   pypy/branch/cpython-extension/pypy/translator/platform/windows.py
Log:
merge -r73532-73534 from trunk


Modified: pypy/branch/cpython-extension/pypy/translator/platform/maemo.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/translator/platform/maemo.py	(original)
+++ pypy/branch/cpython-extension/pypy/translator/platform/maemo.py	Thu Apr  8 09:25:39 2010
@@ -82,11 +82,12 @@
         # on the other hand, library lands in usual place...
         return []
 
-    def execute_makefile(self, path_to_makefile):
+    def execute_makefile(self, path_to_makefile, extra_opts=[]):
         if isinstance(path_to_makefile, GnuMakefile):
             path = path_to_makefile.makefile_dir
         else:
             path = path_to_makefile
-        log.execute('make in %s' % (path,))
-        returncode, stdout, stderr = _run_subprocess('/scratchbox/login', ['make', '-C', str(path)])
+        log.execute('make %s in %s' % (" ".join(extra_opts), path))
+        returncode, stdout, stderr = _run_subprocess(
+            '/scratchbox/login', ['make', '-C', str(path)] + extra_opts)
         self._handle_error(returncode, stdout, stderr, path.join('make'))

Modified: pypy/branch/cpython-extension/pypy/translator/platform/posix.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/translator/platform/posix.py	(original)
+++ pypy/branch/cpython-extension/pypy/translator/platform/posix.py	Thu Apr  8 09:25:39 2010
@@ -128,7 +128,8 @@
         else:
             path = path_to_makefile
         log.execute('make %s in %s' % (" ".join(extra_opts), path))
-        returncode, stdout, stderr = _run_subprocess(self.make_cmd, ['-C', str(path)] + extra_opts)
+        returncode, stdout, stderr = _run_subprocess(
+            self.make_cmd, ['-C', str(path)] + extra_opts)
         self._handle_error(returncode, stdout, stderr, path.join('make'))
 
 class Definition(object):

Modified: pypy/branch/cpython-extension/pypy/translator/platform/windows.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/translator/platform/windows.py	(original)
+++ pypy/branch/cpython-extension/pypy/translator/platform/windows.py	Thu Apr  8 09:25:39 2010
@@ -255,17 +255,17 @@
 
         return m
 
-    def execute_makefile(self, path_to_makefile):
+    def execute_makefile(self, path_to_makefile, extra_opts=[]):
         if isinstance(path_to_makefile, NMakefile):
             path = path_to_makefile.makefile_dir
         else:
             path = path_to_makefile
-        log.execute('make in %s' % (path,))
+        log.execute('make %s in %s' % (" ".join(extra_opts), path))
         oldcwd = path.chdir()
         try:
             returncode, stdout, stderr = _run_subprocess(
                 'nmake',
-                ['/nologo', '/f', str(path.join('Makefile'))])
+                ['/nologo', '/f', str(path.join('Makefile'))] + extra_opts)
         finally:
             oldcwd.chdir()