[pypy-svn] r41319 - in pypy/dist/pypy: bin tool/build

[guido at codespeak.net]

Author: guido
Date: Mon Mar 26 12:14:17 2007
New Revision: 41319

Modified:
   pypy/dist/pypy/bin/buildserver.py
   pypy/dist/pypy/bin/startcompile.py
   pypy/dist/pypy/tool/build/compile.py
   pypy/dist/pypy/tool/build/multibuild.py
Log:
Some indentation, removed unused import, added print when zip downloading
starts (in compile.py).


Modified: pypy/dist/pypy/bin/buildserver.py
==============================================================================
--- pypy/dist/pypy/bin/buildserver.py	(original)
+++ pypy/dist/pypy/bin/buildserver.py	Mon Mar 26 12:14:17 2007
@@ -35,14 +35,14 @@
                     from pypy.tool.udir import udir
 
                     from pypy.config.pypyoption import get_pypy_config
-                    from pypy.translator.goal.translate import translate_optiondescr
+                    from pypy.translator.goal.translate import \
+                                                    translate_optiondescr
                     from pypy.tool.build.compileoption import combine_config
                     from pypy.config.config import Config
                     pypy_config = get_pypy_config()
                     translate_config = Config(translate_optiondescr)
-                    config = combine_config(pypy_config, translate_config, 'pypy',
-                                                    'pypy options')
-                    open('/tmp/compileinfo', 'w').write(repr(compileinfo))
+                    config = combine_config(pypy_config, translate_config,
+                                            'pypy', 'pypy options')
                     config.override(compileinfo)
 
                     targetpypystandalone.PyPyTarget.translateconfig = config

Modified: pypy/dist/pypy/bin/startcompile.py
==============================================================================
--- pypy/dist/pypy/bin/startcompile.py	(original)
+++ pypy/dist/pypy/bin/startcompile.py	Mon Mar 26 12:14:17 2007
@@ -3,7 +3,6 @@
 import autopath
 from pypy.tool.build import config
 from pypy.tool.build.compile import main, getrequest
-from py.execnet import SshGateway, PopenGateway
 
 request, foreground = getrequest(config)
 main(config, request, foreground)

Modified: pypy/dist/pypy/tool/build/compile.py
==============================================================================
--- pypy/dist/pypy/tool/build/compile.py	(original)
+++ pypy/dist/pypy/tool/build/compile.py	Mon Mar 26 12:14:17 2007
@@ -193,9 +193,10 @@
                 break
             time.sleep(POLLTIME)
         if error and error != 'None':
-            print 'error:', error
+            print 'error compiling:', error
             return (False, error)
         else:
+            print 'compilation finished successfully, downloading zip file'
             zipfile = py.path.local('pypy-%s.zip' % (reqid,))
             msa.save_zip(zipfile)
             print 'done, the result can be found in %s' % (zipfile,)

Modified: pypy/dist/pypy/tool/build/multibuild.py
==============================================================================
--- pypy/dist/pypy/tool/build/multibuild.py	(original)
+++ pypy/dist/pypy/tool/build/multibuild.py	Mon Mar 26 12:14:17 2007
@@ -38,7 +38,7 @@
     try:
         override_conf(config, opts)
     except:
-        return exe_name_from_options(newconfig.compile_config, opts), \
+        return exe_name_from_options(config.compile_config, opts), \
                "didn't configure"
     request, foreground = getrequest(config, sys.argv[3:])
     hasbuilt, message = main(config, request, True)