[pypy-svn] r57668 - in pypy/branch/cross-compilation/pypy: config rlib tool translator/c/test translator/tool translator/tool/test

[fijal at codespeak.net]

Author: fijal
Date: Thu Aug 28 20:03:24 2008
New Revision: 57668

Added:
   pypy/branch/cross-compilation/pypy/rlib/pyplatform.py
      - copied unchanged from r57665, pypy/branch/cross-compilation/pypy/tool/pyplatform.py
Removed:
   pypy/branch/cross-compilation/pypy/tool/pyplatform.py
Modified:
   pypy/branch/cross-compilation/pypy/config/translationoption.py
   pypy/branch/cross-compilation/pypy/translator/c/test/test_standalone.py
   pypy/branch/cross-compilation/pypy/translator/tool/cbuild.py
   pypy/branch/cross-compilation/pypy/translator/tool/test/test_cbuild.py
Log:
Move pyplatform from tool to rlib


Modified: pypy/branch/cross-compilation/pypy/config/translationoption.py
==============================================================================
--- pypy/branch/cross-compilation/pypy/config/translationoption.py	(original)
+++ pypy/branch/cross-compilation/pypy/config/translationoption.py	Thu Aug 28 20:03:24 2008
@@ -346,13 +346,19 @@
 ]
 
 def set_platform(config, platform):
-    if platform == 'maemo':
-        from pypy.translator.tool.cbuild import ExternalCompilationInfo
-        from pypy.tool.pyplatform import Maemo
-        # XXX evil hackery
-        func_defs = list(ExternalCompilationInfo.__init__.func_defaults)
-        func_defs[-1] = Maemo()
-        ExternalCompilationInfo.__init__.im_func.func_defaults = tuple(func_defs)
-    elif platform != 'host':
-        raise NotImplementedError('Platform = %s' % (platform,))
+    from pypy.rlib.pyplatform import Platform, Maemo
+    from pypy.translator.tool.cbuild import ExternalCompilationInfo
+    if isinstance(platform, str):
+        if platform == 'maemo':
+            platform = Maemo()
+        elif platform == 'host':
+            return
+        else:
+            raise NotImplementedError('Platform = %s' % (platform,))
+    assert isinstance(platform, Platform)
+    # XXX evil hackery
+    func_defs = list(ExternalCompilationInfo.__init__.func_defaults)
+    func_defs[-1] = platform
+    ExternalCompilationInfo.__init__.im_func.func_defaults = tuple(func_defs)
+
         

Modified: pypy/branch/cross-compilation/pypy/translator/c/test/test_standalone.py
==============================================================================
--- pypy/branch/cross-compilation/pypy/translator/c/test/test_standalone.py	(original)
+++ pypy/branch/cross-compilation/pypy/translator/c/test/test_standalone.py	Thu Aug 28 20:03:24 2008
@@ -227,7 +227,7 @@
     assert "  ll_strtod.o" in makefile
 
 def test_cross_compilation():
-    from pypy.tool.pyplatform import Platform
+    from pypy.rlib.pyplatform import Platform
     from pypy.config.translationoption import set_platform
 
     class X(Platform):

Modified: pypy/branch/cross-compilation/pypy/translator/tool/cbuild.py
==============================================================================
--- pypy/branch/cross-compilation/pypy/translator/tool/cbuild.py	(original)
+++ pypy/branch/cross-compilation/pypy/translator/tool/cbuild.py	Thu Aug 28 20:03:24 2008
@@ -9,7 +9,7 @@
 log = py.log.Producer("cbuild")
 py.log.setconsumer("cbuild", ansi_log)
 from pypy.tool.udir import udir
-from pypy.tool.pyplatform import Platform
+from pypy.rlib.pyplatform import Platform
 
 debug = 0
 

Modified: pypy/branch/cross-compilation/pypy/translator/tool/test/test_cbuild.py
==============================================================================
--- pypy/branch/cross-compilation/pypy/translator/tool/test/test_cbuild.py	(original)
+++ pypy/branch/cross-compilation/pypy/translator/tool/test/test_cbuild.py	Thu Aug 28 20:03:24 2008
@@ -158,7 +158,7 @@
                        'dxowqbncpqympqhe-config')
 
     def test_platforms(self):
-        from pypy.tool.pyplatform import Maemo
+        from pypy.rlib.pyplatform import Maemo
         eci = ExternalCompilationInfo(platform=Maemo())
         eci2 = ExternalCompilationInfo()
         assert eci != eci2
@@ -168,7 +168,7 @@
         assert eci.merge(eci).platform == Maemo()
 
     def test_platform(self):
-        from pypy.tool.pyplatform import Platform
+        from pypy.rlib.pyplatform import Platform
         class Expected(Exception):
             pass
         
@@ -189,7 +189,7 @@
         assert eci.platform.execute() == 3
 
     def test_standalone_maemo(self):
-        from pypy.tool.pyplatform import Maemo
+        from pypy.rlib.pyplatform import Maemo
         # XXX skip if there is no scratchbox
         if not py.path.local('/scratchbox/login').check():
             py.test.skip("No scratchbox detected")