[pypy-svn] r57387 - in pypy/dist/pypy: config doc/config translator/goal

arigo at codespeak.net arigo at codespeak.net
Mon Aug 18 10:16:37 CEST 2008


Author: arigo
Date: Mon Aug 18 10:16:36 2008
New Revision: 57387

Modified:
   pypy/dist/pypy/config/pypyoption.py
   pypy/dist/pypy/doc/config/objspace.allworkingmodules.txt
   pypy/dist/pypy/translator/goal/targetpypystandalone.py
Log:
Enable --allworkingmodules by default from targetpypystandalone.


Modified: pypy/dist/pypy/config/pypyoption.py
==============================================================================
--- pypy/dist/pypy/config/pypyoption.py	(original)
+++ pypy/dist/pypy/config/pypyoption.py	Mon Aug 18 10:16:36 2008
@@ -131,12 +131,15 @@
         for modname in all_modules]),
 
     BoolOption("allworkingmodules", "use as many working modules as possible",
+               # NB. defaults to False for py.py and tests, but
+               # targetpypystandalone suggests True, which can be overridden
+               # with --no-allworkingmodules.
                default=False,
                cmdline="--allworkingmodules",
                suggests=[("objspace.usemodules.%s" % (modname, ), True)
                              for modname in working_modules
                              if modname in all_modules],
-               negation=False),
+               negation=True),
 
     BoolOption("geninterp", "specify whether geninterp should be used",
                cmdline=None,

Modified: pypy/dist/pypy/doc/config/objspace.allworkingmodules.txt
==============================================================================
--- pypy/dist/pypy/doc/config/objspace.allworkingmodules.txt	(original)
+++ pypy/dist/pypy/doc/config/objspace.allworkingmodules.txt	Mon Aug 18 10:16:36 2008
@@ -1,2 +1,5 @@
 This option enables the usage of all modules that are known to be working well
 and that translate without problems.
+
+Note that this option is set to True by default by targetpypystandalone.py.
+To force it to False, use ``--no-allworkingmodules``.

Modified: pypy/dist/pypy/translator/goal/targetpypystandalone.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetpypystandalone.py	(original)
+++ pypy/dist/pypy/translator/goal/targetpypystandalone.py	Mon Aug 18 10:16:36 2008
@@ -132,6 +132,15 @@
         # expose the following variables to ease debugging
         global space, entry_point
 
+        # not really clean, but setting the default of allworkingmodules
+        # to True has two problems: it doesn't implies its suggests (the
+        # config machinery doesn't handle that case), and we don't want
+        # allworkingmodules to be enabled for all spaces by default
+        # (e.g. in py.py or in tests).  Auto-generated helps report the
+        # default of allworkingmodules to be False, though, which is a
+        # bit annoying.
+        config.objspace.suggest(allworkingmodules=True)
+
         if config.translation.thread:
             config.objspace.usemodules.thread = True
         elif config.objspace.usemodules.thread:



More information about the Pypy-commit mailing list