[pypy-svn] r79573 - pypy/extradoc/pypy.org/source

Fri Nov 26 18:08:58 CET 2010

Author: arigo
Date: Fri Nov 26 18:08:56 2010
New Revision: 79573

Modified:
   pypy/extradoc/pypy.org/source/download.txt
Log:
Prepare for the 1.4 release.


Modified: pypy/extradoc/pypy.org/source/download.txt
==============================================================================

--- pypy/extradoc/pypy.org/source/download.txt	(original)
+++ pypy/extradoc/pypy.org/source/download.txt	Fri Nov 26 18:08:56 2010
@@ -15,8 +15,7 @@
  * Download                         
                                                  
    * `Default (with a JIT Compiler)`_
-   * `Sandboxed version`_                        
-   * `Stackless version`_                        
+   * `Other versions (without a JIT)`_
                                                  
  * `Installing`_ (optional)                      
  * `Building from source`_                       
@@ -27,8 +26,8 @@
 -------------------------------
 
 These binaries include a Just-in-Time compiler.  They only work on
-CPUs that have the SSE2_ instruction set (most of
-them do, nowadays).
+x86 CPUs that have the SSE2_ instruction set (most of
+them do, nowadays), or on x86-64 CPUs.
 
 * `Linux binary (32bit)`__
 * `Linux binary (64bit)`__
@@ -45,57 +44,43 @@
 If your CPU is really old, it may not have SSE2.  In this case, you need
 to translate_ yourself with the option ``--jit-backend=x86-without-sse2``.
 
-.. _`Sandboxed version`:
+.. _`Other versions (without a JIT)`:
 
-"Sandbox" version
+Other versions
 -------------------------------
 
-A special safe version.  Read the docs about sandboxing_.  These
-binaries work on 32-bit `x86 (IA-32)`_ CPUs as well as `x86-64`_ CPUs
-in the 32-bit compatibility mode.
+The other versions of PyPy are:
 
-* `Linux binary`__
-* `Mac OS/X binary`__
+* No JIT: A version without the JIT.  Consumes a bit less memory
+  and may be faster on short-running scripts.
 
-.. __: http://pypy.org/download/pypy-1.2-linux-sandbox.bz2
-.. __: http://pypy.org/download/pypy-1.2-osx-sandbox.bz2
+* Stackless: Provides Stackless_ extensions, as well as greenlets_.
+  It is not possible right now to combine Stackless features with the JIT.
+    
+* Sandboxing: A special safe version.  Read the docs about sandboxing_.
+  (It is also possible to translate_ a version that includes both
+  sandboxing and the JIT compiler, although as the JIT is relatively
+  complicated, this reduces a bit the level of confidence we can put in
+  the result.)
+
+These versions are not officially part of the release 1.4, which focuses
+on the JIT.  You can find prebuilt binaries for them on our
+`nightly build`_ or with the `older releases`_, or translate_ them yourself.
 
-It is also possible to translate_ a version that includes both
-sandboxing and the JIT compiler, although as the JIT is relatively
-complicated, this reduce a bit the level of confidence we can put in
-the result.
+.. _`nightly build`: http://buildbot.pypy.org/nightly/trunk/
+.. _`older releases`: http://pypy.org/download/
 
-The Windows need testing and careful reviewing; `contact us`_!
-
-.. _`Stackless version`:
-
-"Stackless" version
--------------------------------
-
-Provides Stackless_ extensions, as well as greenlets_.  These
-binaries work on 32-bit `x86 (IA-32)`_ CPUs as well as `x86-64`_ CPUs
-in the 32-bit compatibility mode.
-
-* `Linux binary`__
-* `Windows binary`__
-
-.. __: http://pypy.org/download/pypy-1.4-linux-stackless.tar.bz2
-.. __: http://pypy.org/download/pypy-1.4-win32-stackless.zip
-
-It is not possible right now to combine Stackless features with the JIT.
 
 Installing
 -------------------------------
 
 All versions are packaged in a ``tar.bz2`` or ``zip`` file.  When
-uncompressed, they run in-place.  On Linux or Mac OS/X, they can also be
-installed by manually moving the files::
-
-    /usr/bin/pypy     # or pypy-nojit etc.
-    /usr/share/pypy-1.4/lib-python/*
-    /usr/share/pypy-1.4/pypy/*
-
-You can also install it to ``/usr/local/bin`` and ``/usr/local/share``.
+uncompressed, they run in-place.  For now you can uncompress them
+either somewhere in your home directory or, say, in ``/opt``, and
+if you want, put a symlink from somewhere like
+``/usr/local/bin/pypy`` to ``/path/to/pypy-1.4/bin/pypy``.  Do
+not move or copy the executable ``pypy`` outside the tree --- put
+a symlink to it, otherwise it will not find its libraries.
 
 
 .. _translate:
@@ -117,12 +102,6 @@
 
      svn co http://codespeak.net/svn/pypy/trunk pypy-trunk
 
-   Windows users trying the zip file are expected to use MSVC.
-   The trunk version contains fixes to support MinGW32.  More
-   information on `our dev site`__.
-
-   .. __: http://codespeak.net/pypy/trunk/pypy/doc/windows.html
-
 2. Make sure you installed the dependencies.  See the list here__.
 
    .. __: http://codespeak.net/pypy/dist/pypy/doc/getting-started-python.html#translating-the-pypy-python-interpreter
@@ -141,8 +120,13 @@
      python translate.py -Ojit --backend=cli  # only for branch/cli-jit
 
 5. Enjoy Mandelbrot ``:-)``  It takes on the order of one hour to
-   finish the translation, and 1.3 GB of RAM on a 32-bit system.
-   (Do not start a translation on a machine with 1GB or less!)
+   finish the translation, and 1.2 GB of RAM on a 32-bit system
+   and 2.4 GB on 64-bit systems.  (Do not start a translation on a
+   machine with insufficient RAM!  It will just swap forever.)
+
+6. Once you have a PyPy, it is recommended to use it to do further
+   translations, instead of using CPython.  It is twice as fast,
+   but uses a bit more RAM (1.7-2.0 GB on 32-bit, 3.0 GB on 64-bit).
 
 .. _`x86 (IA-32)`: http://en.wikipedia.org/wiki/IA-32
 .. _`x86-64`: http://en.wikipedia.org/wiki/X86-64

