diff --git a/compat.html b/compat.html index fbe333452c3174b850f010a68f428beefcd5814c_Y29tcGF0Lmh0bWw=..33ecaf6f033feabdb1a03e948d978f5688ef41a0_Y29tcGF0Lmh0bWw= 100644 --- a/compat.html +++ b/compat.html @@ -59,7 +59,7 @@ your build system, it might work out of the box or will be slightly harder.</p> <p>Standard library modules supported by PyPy, in alphabetical order:</p> <ul class="simple"> -<li><tt class="docutils literal">__builtin__, __pypy__, _ast, _bisect, _codecs, _collections, _ffi, _file, _hashlib, _io, _locale, _lsprof, _md5, _minimal_curses, _multiprocessing, _pickle_support, _random, _rawffi, _sha, _socket, _sre, _ssl, _stackless, _warnings, _weakref, _winreg, array, binascii, bz2, cStringIO, clr, cmath, cpyext, crypt, errno, exceptions, fcntl, gc, imp, itertools, marshal, math, micronumpy, mmap, operator, oracle, parser, posix, pyexpat, pypyjit, rbench, rctime, select, signal, struct, symbol, sys, termios, thread, time, token, unicodedata, zipimport, zlib</tt></li> +<li><tt class="docutils literal">__builtin__, __pypy__, _ast, _bisect, _codecs, _collections, _ffi, _hashlib, _io, _locale, _lsprof, _md5, _minimal_curses, _multiprocessing, _random, _rawffi, _sha, _socket, _sre, _ssl, _warnings, _weakref, _winreg, array, binascii, bz2, cStringIO, clr, cmath, cpyext, crypt, errno, exceptions, fcntl, gc, imp, itertools, marshal, math, mmap, operator, oracle, parser, posix, pyexpat, select, signal, struct, symbol, sys, termios, thread, time, token, unicodedata, zipimport, zlib</tt></li> </ul> <p>Supported, but written in pure-python:</p> <ul class="simple"> diff --git a/download.html b/download.html index fbe333452c3174b850f010a68f428beefcd5814c_ZG93bmxvYWQuaHRtbA==..33ecaf6f033feabdb1a03e948d978f5688ef41a0_ZG93bmxvYWQuaHRtbA== 100644 --- a/download.html +++ b/download.html @@ -97,8 +97,7 @@ </ul> <p>These versions are not officially part of the release 1.5, which focuses on the JIT. You can find prebuilt binaries for them on our -<a class="reference external" href="http://buildbot.pypy.org/nightly/trunk/">nightly build</a> or in the <a class="reference external" href="http://pypy.org/download/">release</a> binaries, or <a class="reference internal" href="#translate">translate</a> them -yourself.</p> +<a class="reference external" href="http://buildbot.pypy.org/nightly/trunk/">nightly build</a>, or <a class="reference internal" href="#translate">translate</a> them yourself.</p> </div> <div class="section" id="installing"> <h1>Installing</h1> @@ -137,9 +136,9 @@ <pre class="literal-block"> pypy translate.py -Ojit # get the JIT version pypy translate.py -O2 # get the no-jit version -pypy translate.py --sandbox # get the sandbox version -pypy translate.py --stackless # get the stackless version +pypy translate.py -O2 --sandbox # get the sandbox version +pypy translate.py -O2 --stackless # get the stackless version pypy translate.py -Ojit --backend=cli # only for branch/cli-jit </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 @@ -142,9 +141,9 @@ pypy translate.py -Ojit --backend=cli # only for branch/cli-jit </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 1.7 GB of RAM on a 32-bit system -and 3.0 GB on 64-bit systems. (Do not start a translation on a +finish the translation, and 2 GB of RAM on a 32-bit system +and 4 GB on 64-bit systems. (Do not start a translation on a machine with insufficient RAM! It will just swap forever.)</p> </li> </ol> @@ -170,8 +169,9 @@ 1fb62a813978c2581e9e09debad6b116 pypy-1.4.1-linux64.tar.bz2 8584c4e8c042f5b661fcfffa0d9b8a25 pypy-1.4.1-osx.tar.bz2 769b3fb134944ee8c22ad0834970de3b pypy-1.4.1-osx64.tar.bz2 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx pypy-1.5-win32.zip ebbbb156b1eb842e9e65d909ed5f9f6d pypy-1.4.1-src.tar.bz2 6e2366377ad2f0c583074d3ba6f60d064549bef2 pypy-1.4.1-linux.tar.bz2 1cfd53343e19264905a00d2ffcf83e03e39dcbb3 pypy-1.4.1-linux64.tar.bz2 961470e7510c47b8f56e6cc6da180605ba058cb6 pypy-1.4.1-osx.tar.bz2 8e2830bef80b93f4d3c016b972fbdf7bcd403abc pypy-1.4.1-osx64.tar.bz2 @@ -173,8 +173,9 @@ ebbbb156b1eb842e9e65d909ed5f9f6d pypy-1.4.1-src.tar.bz2 6e2366377ad2f0c583074d3ba6f60d064549bef2 pypy-1.4.1-linux.tar.bz2 1cfd53343e19264905a00d2ffcf83e03e39dcbb3 pypy-1.4.1-linux64.tar.bz2 961470e7510c47b8f56e6cc6da180605ba058cb6 pypy-1.4.1-osx.tar.bz2 8e2830bef80b93f4d3c016b972fbdf7bcd403abc pypy-1.4.1-osx64.tar.bz2 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx pypy-1.5-win32.zip 922a8815377fe2e0c015338fa8b28ae16bf8c840 pypy-1.4.1-src.tar.bz2 </pre> </div> diff --git a/features.html b/features.html index fbe333452c3174b850f010a68f428beefcd5814c_ZmVhdHVyZXMuaHRtbA==..33ecaf6f033feabdb1a03e948d978f5688ef41a0_ZmVhdHVyZXMuaHRtbA== 100644 --- a/features.html +++ b/features.html @@ -58,7 +58,7 @@ <div class="section" id="speed"> <h1>Speed</h1> <p>Our <a class="reference external" href="download.html#with-a-jit-compiler">main executable</a> comes with a Just-in-Time compiler. It is -<a class="reference external" href="http://bit.ly/fhSlfk">really fast</a> in running most benchmarks. <a class="reference external" href="download.html#with-a-jit-compiler">Try it out!</a></p> +<a class="reference external" href="http://speed.pypy.org/">really fast</a> in running most benchmarks. <a class="reference external" href="download.html#with-a-jit-compiler">Try it out!</a></p> </div> <div class="section" id="sandboxing"> <h1>Sandboxing</h1> diff --git a/howtohelp.html b/howtohelp.html index fbe333452c3174b850f010a68f428beefcd5814c_aG93dG9oZWxwLmh0bWw=..33ecaf6f033feabdb1a03e948d978f5688ef41a0_aG93dG9oZWxwLmh0bWw= 100644 --- a/howtohelp.html +++ b/howtohelp.html @@ -50,7 +50,7 @@ <p>Here are some ideas to help PyPy development:</p> <ul class="simple"> <li>use pypy for your projects and provide detailed <a class="reference external" href="contact.html">feedback</a></li> -<li>help implement Python2.6, 2.7 or 3.x features</li> +<li>talk to us about how to support Python 3.x</li> <li>write blog posts or tweets about your experiences</li> <li>help porting to new platforms</li> <li><a class="reference external" href="contact.html">contact</a> us and get involved</li> diff --git a/js/detect.js b/js/detect.js index fbe333452c3174b850f010a68f428beefcd5814c_anMvZGV0ZWN0Lmpz..33ecaf6f033feabdb1a03e948d978f5688ef41a0_anMvZGV0ZWN0Lmpz 100644 --- a/js/detect.js +++ b/js/detect.js @@ -2,6 +2,11 @@ $(document).ready(function() { var download_url, download_text; if (navigator.platform.indexOf('Linux') != -1) { - download_url = 'download/pypy-1.4.1-linux.tar.bz2'; - download_text = 'Download linux x86 bin'; + if (navigator.platform.indexOf('64') != -1) { + download_url = 'download/pypy-1.5-linux64.tar.bz2'; + download_text = 'Download linux x86-64 bin'; + } else { + download_url = 'download/pypy-1.5-linux.tar.bz2'; + download_text = 'Download linux x86 bin (32 bit)'; + } } else if (navigator.platform.indexOf('Win') != -1) { @@ -7,4 +12,4 @@ } else if (navigator.platform.indexOf('Win') != -1) { - download_url = 'download/pypy-1.4.1-win32.zip'; + download_url = 'download/pypy-1.5-win32.zip'; download_text = 'Download Windows x86 bin'; } else if (navigator.platform.indexOf('Mac') != 1) { @@ -9,7 +14,12 @@ download_text = 'Download Windows x86 bin'; } else if (navigator.platform.indexOf('Mac') != 1) { - download_url = 'download/pypy-1.4.1-osx.tar.bz2'; - downloat_text = 'Download Mac OS X 10.6 bin'; + if (navigator.platform.indexOf('64') != -1) { + download_url = 'download/pypy-1.5-osx64.tar.bz2'; + downloat_text = 'Download Mac OS X 10.6 bin (64 bit)'; + } else { + download_url = 'download/pypy-1.5-osx.tar.bz2'; + downloat_text = 'Download Mac OS X 10.6 bin (32 bit)'; + } } else { download_url = "download.html"; download_text = "Download page"; diff --git a/source/download.txt b/source/download.txt index fbe333452c3174b850f010a68f428beefcd5814c_c291cmNlL2Rvd25sb2FkLnR4dA==..33ecaf6f033feabdb1a03e948d978f5688ef41a0_c291cmNlL2Rvd25sb2FkLnR4dA== 100644 --- a/source/download.txt +++ b/source/download.txt @@ -77,7 +77,6 @@ These versions are not officially part of the release 1.5, which focuses on the JIT. You can find prebuilt binaries for them on our -`nightly build`_ or in the `release`_ binaries, or translate_ them -yourself. +`nightly build`_, or translate_ them yourself. .. _`nightly build`: http://buildbot.pypy.org/nightly/trunk/ @@ -82,6 +81,5 @@ .. _`nightly build`: http://buildbot.pypy.org/nightly/trunk/ -.. _`release`: http://pypy.org/download/ Installing @@ -127,8 +125,8 @@ pypy translate.py -Ojit # get the JIT version pypy translate.py -O2 # get the no-jit version - pypy translate.py --sandbox # get the sandbox version - pypy translate.py --stackless # get the stackless version + pypy translate.py -O2 --sandbox # get the sandbox version + pypy translate.py -O2 --stackless # get the stackless version pypy translate.py -Ojit --backend=cli # only for branch/cli-jit 5. Enjoy Mandelbrot ``:-)`` It takes on the order of half an hour to @@ -132,8 +130,8 @@ pypy translate.py -Ojit --backend=cli # only for branch/cli-jit 5. Enjoy Mandelbrot ``:-)`` It takes on the order of half an hour to - finish the translation, and 1.7 GB of RAM on a 32-bit system - and 3.0 GB on 64-bit systems. (Do not start a translation on a + finish the translation, and 2 GB of RAM on a 32-bit system + and 4 GB on 64-bit systems. (Do not start a translation on a machine with insufficient RAM! It will just swap forever.) Notes: @@ -170,9 +168,10 @@ 1fb62a813978c2581e9e09debad6b116 pypy-1.4.1-linux64.tar.bz2 8584c4e8c042f5b661fcfffa0d9b8a25 pypy-1.4.1-osx.tar.bz2 769b3fb134944ee8c22ad0834970de3b pypy-1.4.1-osx64.tar.bz2 + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx pypy-1.5-win32.zip ebbbb156b1eb842e9e65d909ed5f9f6d pypy-1.4.1-src.tar.bz2 6e2366377ad2f0c583074d3ba6f60d064549bef2 pypy-1.4.1-linux.tar.bz2 1cfd53343e19264905a00d2ffcf83e03e39dcbb3 pypy-1.4.1-linux64.tar.bz2 961470e7510c47b8f56e6cc6da180605ba058cb6 pypy-1.4.1-osx.tar.bz2 8e2830bef80b93f4d3c016b972fbdf7bcd403abc pypy-1.4.1-osx64.tar.bz2 @@ -173,7 +172,8 @@ ebbbb156b1eb842e9e65d909ed5f9f6d pypy-1.4.1-src.tar.bz2 6e2366377ad2f0c583074d3ba6f60d064549bef2 pypy-1.4.1-linux.tar.bz2 1cfd53343e19264905a00d2ffcf83e03e39dcbb3 pypy-1.4.1-linux64.tar.bz2 961470e7510c47b8f56e6cc6da180605ba058cb6 pypy-1.4.1-osx.tar.bz2 8e2830bef80b93f4d3c016b972fbdf7bcd403abc pypy-1.4.1-osx64.tar.bz2 + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx pypy-1.5-win32.zip 922a8815377fe2e0c015338fa8b28ae16bf8c840 pypy-1.4.1-src.tar.bz2 diff --git a/source/features.txt b/source/features.txt index fbe333452c3174b850f010a68f428beefcd5814c_c291cmNlL2ZlYXR1cmVzLnR4dA==..33ecaf6f033feabdb1a03e948d978f5688ef41a0_c291cmNlL2ZlYXR1cmVzLnR4dA== 100644 --- a/source/features.txt +++ b/source/features.txt @@ -30,7 +30,7 @@ .. _`main executable`: download.html#with-a-jit-compiler .. _`Try it out!`: download.html#with-a-jit-compiler -.. _`really fast`: http://bit.ly/fhSlfk +.. _`really fast`: http://speed.pypy.org/ Sandboxing -------------------- diff --git a/source/howtohelp.txt b/source/howtohelp.txt index fbe333452c3174b850f010a68f428beefcd5814c_c291cmNlL2hvd3RvaGVscC50eHQ=..33ecaf6f033feabdb1a03e948d978f5688ef41a0_c291cmNlL2hvd3RvaGVscC50eHQ= 100644 --- a/source/howtohelp.txt +++ b/source/howtohelp.txt @@ -10,7 +10,7 @@ * use pypy for your projects and provide detailed feedback_ -* help implement Python2.6, 2.7 or 3.x features +* talk to us about how to support Python 3.x * write blog posts or tweets about your experiences