[pypy-svn] r59274 - pypy/branch/cbuild-refactor/pypy/translator/platform

[fijal at codespeak.net]

Author: fijal
Date: Mon Oct 20 18:43:38 2008
New Revision: 59274

Modified:
   pypy/branch/cbuild-refactor/pypy/translator/platform/__init__.py
   pypy/branch/cbuild-refactor/pypy/translator/platform/posix.py
   pypy/branch/cbuild-refactor/pypy/translator/platform/windows.py
Log:
move _compile_o_files to base class


Modified: pypy/branch/cbuild-refactor/pypy/translator/platform/__init__.py
==============================================================================
--- pypy/branch/cbuild-refactor/pypy/translator/platform/__init__.py	(original)
+++ pypy/branch/cbuild-refactor/pypy/translator/platform/__init__.py	Mon Oct 20 18:43:38 2008
@@ -57,6 +57,15 @@
         ofiles = self._compile_o_files(cfiles, eci, standalone)
         return self._finish_linking(ofiles, eci, outputfilename, standalone)
 
+    def _compile_o_files(self, cfiles, eci, standalone=True):
+        cfiles = [py.path.local(f) for f in cfiles]
+        cfiles += [py.path.local(f) for f in eci.separate_module_files]
+        compile_args = self._compile_args_from_eci(eci, standalone)
+        ofiles = []
+        for cfile in cfiles:
+            ofiles.append(self._compile_c_file(self.cc, cfile, compile_args))
+        return ofiles
+
     def execute(self, executable, args=None, env=None):
         returncode, stdout, stderr = _run_subprocess(str(executable), args,
                                                      env)

Modified: pypy/branch/cbuild-refactor/pypy/translator/platform/posix.py
==============================================================================
--- pypy/branch/cbuild-refactor/pypy/translator/platform/posix.py	(original)
+++ pypy/branch/cbuild-refactor/pypy/translator/platform/posix.py	Mon Oct 20 18:43:38 2008
@@ -37,15 +37,6 @@
         self._execute_c_compiler(cc, args, exe_name)
         return exe_name
 
-    def _compile_o_files(self, cfiles, eci, standalone=True):
-        cfiles = [py.path.local(f) for f in cfiles]
-        cfiles += [py.path.local(f) for f in eci.separate_module_files]
-        compile_args = self._compile_args_from_eci(eci, standalone)
-        ofiles = []
-        for cfile in cfiles:
-            ofiles.append(self._compile_c_file(self.cc, cfile, compile_args))
-        return ofiles
-
     def _preprocess_dirs(self, include_dirs):
         # hook for maemo
         return include_dirs

Modified: pypy/branch/cbuild-refactor/pypy/translator/platform/windows.py
==============================================================================
--- pypy/branch/cbuild-refactor/pypy/translator/platform/windows.py	(original)
+++ pypy/branch/cbuild-refactor/pypy/translator/platform/windows.py	Mon Oct 20 18:43:38 2008
@@ -82,15 +82,6 @@
         self._execute_c_compiler(cc, args, oname)
         return oname
 
-    def _compile_o_files(self, cfiles, eci, standalone=True):
-        cfiles = [py.path.local(f) for f in cfiles]
-        cfiles += [py.path.local(f) for f in eci.separate_module_files]
-        compile_args = self._compile_args_from_eci(eci, standalone)
-        ofiles = []
-        for cfile in cfiles:
-            ofiles.append(self._compile_c_file(self.cc, cfile, compile_args))
-        return ofiles
-
     def _link(self, cc, ofiles, link_args, standalone, exe_name):
         args = ['/nologo'] + [str(ofile) for ofile in ofiles] + link_args
         args += ['/out:%s' % (exe_name,)]