Author: Maciej Fijalkowski <[email protected]> Branch: extradoc Changeset: r378:b505e6f833ef Date: 2013-02-28 20:03 +0200 http://bitbucket.org/pypy/pypy.org/changeset/b505e6f833ef/
Log: merge diff --git a/download.html b/download.html --- a/download.html +++ b/download.html @@ -79,7 +79,9 @@ <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux64-libc2.13.tar.bz2";>Linux binary (64bit) (libc 2.13)</a></li> <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux-armel.tar.bz2";>Linux ARM binary</a></li> <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-osx64.tar.bz2";>Mac OS/X binary (64bit)</a></li> -<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-win32.zip";>Windows binary (32bit)</a> (you need the <a class="reference external" href="http://www.microsoft.com/en-us/download/details.aspx?id=5582";>VS 2008 runtime library installer vcredist_x86.exe</a>. <em>Updated:</em> the previous version required another runtime)</li> +<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1.1-win32.zip";>Windows binary (32bit)</a> (you need the <a class="reference external" href="http://www.microsoft.com/en-us/download/details.aspx?id=5582";>VS 2008 runtime library +installer vcredist_x86.exe</a>. <em>Updated again:</em> the previous version +required two runtime libs)</li> </ul> </div> <div class="section" id="id7"> @@ -148,10 +150,12 @@ </li> <li><p class="first">Enter the <tt class="docutils literal">goal</tt> directory:</p> <pre class="literal-block"> -cd pypy/pypy/translator/goal +cd pypy/pypy/translator/goal # release 2.0-beta-1 +cd pypy/pypy/goal # current trunk </pre> </li> -<li><p class="first">Run the <tt class="docutils literal">translate.py</tt> script. Here are the common combinations +<li><p class="first">Run the <tt class="docutils literal">translate.py</tt> script (called <tt class="docutils literal">rpython.py</tt> in the current +trunk). Here are the common combinations of options (works also with <tt class="docutils literal">python</tt> instead of <tt class="docutils literal">pypy</tt>):</p> <pre class="literal-block"> pypy translate.py -Ojit # get the JIT version @@ -159,6 +163,10 @@ pypy translate.py -O2 --sandbox # get the sandbox version pypy translate.py -Ojit --backend=cli # only for branch/cli-jit </pre> +<p>Or with the current trunk:</p> +<pre class="literal-block"> +../../rpython/bin/rpython -Ojit # or -O2, etc. +</pre> </li> <li><p class="first">Enjoy Mandelbrot <tt class="docutils literal"><span class="pre">:-)</span></tt> It takes on the order of half an hour to finish the translation, and 2.x GB of RAM on a 32-bit system @@ -209,7 +217,7 @@ a1505520c063c591b218e5cd3436b111 pypy-2.0-beta1-linux-armel.tar.bz2 5aa2e4eee1c3dab86e5cec237776ced3 pypy-2.0-beta1-linux.tar.bz2 2802a06cd19ac86930b63afdd837c32f pypy-2.0-beta1-osx64.tar.bz2 -e46e1c20da6a2d15e34a6ef9afca311f pypy-2.0-beta1-win32.zip +a34dcd53537aaba0bed69d47f492ac73 pypy-2.0-beta1.1-win32.zip 201d2cce2557e40c784473b471ee1b6b pypy-1.9-linux64.tar.bz2 1a08c88642434fc2e0e4256d351f48db pypy-1.9-linux.tar.bz2 aad9c4b7b827583e37fe8ae0f7cfe0ff pypy-1.9-osx64.tar.bz2 @@ -223,7 +231,7 @@ 5682358c775e90dbc3636dbb0f6158675ecf5357 pypy-2.0-beta1-linux-armel.tar.bz2 ede5788f282072bc410019fb26c732f55f0b33ff pypy-2.0-beta1-linux.tar.bz2 e4938fdf33072e457fee6cb22798ec08b5a01978 pypy-2.0-beta1-osx64.tar.bz2 -d456efdbe2e66cff8410d9e69dda88b16e212c9e pypy-2.0-beta1-win32.zip +152ab10da55ed9f8c8a21b5cb4e67ee2ff4005fa pypy-2.0-beta1.1-win32.zip 51be6b7b802a5239a759e04ae9595082e17c4c70 pypy-1.9-linux64.tar.bz2 1bc5d2467039b954f9b7395b3ee1b8407ce1c057 pypy-1.9-linux.tar.bz2 825e15724419fbdb6fe215eeea044f9181883c90 pypy-1.9-osx64.tar.bz2 diff --git a/source/download.txt b/source/download.txt --- a/source/download.txt +++ b/source/download.txt @@ -52,14 +52,16 @@ * `Linux binary (64bit) (libc 2.13)`__ * `Linux ARM binary`__ * `Mac OS/X binary (64bit)`__ -* `Windows binary (32bit)`__ (you need the `VS 2008 runtime library installer vcredist_x86.exe`_. *Updated:* the previous version required another runtime) +* `Windows binary (32bit)`__ (you need the `VS 2008 runtime library + installer vcredist_x86.exe`_. *Updated again:* the previous version + required two runtime libs) .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux.tar.bz2 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux64-libc2.15.tar.bz2 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux64-libc2.13.tar.bz2 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-linux-armel.tar.bz2 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-osx64.tar.bz2 -.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1-win32.zip +.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-beta1.1-win32.zip .. _`VS 2008 runtime library installer vcredist_x86.exe`: http://www.microsoft.com/en-us/download/details.aspx?id=5582 1.9 @@ -154,9 +156,11 @@ 3. Enter the ``goal`` directory:: - cd pypy/pypy/translator/goal + cd pypy/pypy/translator/goal # release 2.0-beta-1 + cd pypy/pypy/goal # current trunk -4. Run the ``translate.py`` script. Here are the common combinations +4. Run the ``translate.py`` script (called ``rpython.py`` in the current + trunk). Here are the common combinations of options (works also with ``python`` instead of ``pypy``):: pypy translate.py -Ojit # get the JIT version @@ -164,6 +168,10 @@ pypy translate.py -O2 --sandbox # get the sandbox version pypy translate.py -Ojit --backend=cli # only for branch/cli-jit + Or with the current trunk:: + + ../../rpython/bin/rpython -Ojit # or -O2, etc. + 5. Enjoy Mandelbrot ``:-)`` It takes on the order of half an hour to finish the translation, and 2.x GB of RAM on a 32-bit system and 4.x GB on 64-bit systems. (Do not start a translation on a @@ -222,7 +230,7 @@ a1505520c063c591b218e5cd3436b111 pypy-2.0-beta1-linux-armel.tar.bz2 5aa2e4eee1c3dab86e5cec237776ced3 pypy-2.0-beta1-linux.tar.bz2 2802a06cd19ac86930b63afdd837c32f pypy-2.0-beta1-osx64.tar.bz2 - e46e1c20da6a2d15e34a6ef9afca311f pypy-2.0-beta1-win32.zip + a34dcd53537aaba0bed69d47f492ac73 pypy-2.0-beta1.1-win32.zip 201d2cce2557e40c784473b471ee1b6b pypy-1.9-linux64.tar.bz2 1a08c88642434fc2e0e4256d351f48db pypy-1.9-linux.tar.bz2 aad9c4b7b827583e37fe8ae0f7cfe0ff pypy-1.9-osx64.tar.bz2 @@ -237,7 +245,7 @@ 5682358c775e90dbc3636dbb0f6158675ecf5357 pypy-2.0-beta1-linux-armel.tar.bz2 ede5788f282072bc410019fb26c732f55f0b33ff pypy-2.0-beta1-linux.tar.bz2 e4938fdf33072e457fee6cb22798ec08b5a01978 pypy-2.0-beta1-osx64.tar.bz2 - d456efdbe2e66cff8410d9e69dda88b16e212c9e pypy-2.0-beta1-win32.zip + 152ab10da55ed9f8c8a21b5cb4e67ee2ff4005fa pypy-2.0-beta1.1-win32.zip 51be6b7b802a5239a759e04ae9595082e17c4c70 pypy-1.9-linux64.tar.bz2 1bc5d2467039b954f9b7395b3ee1b8407ce1c057 pypy-1.9-linux.tar.bz2 825e15724419fbdb6fe215eeea044f9181883c90 pypy-1.9-osx64.tar.bz2 _______________________________________________ pypy-commit mailing list [email protected] http://mail.python.org/mailman/listinfo/pypy-commit
