[pypy-commit] pypy default: Merged in tilarids/pypy (pull request #140)

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r62576:cc4bf5491933
Date: 2013-03-20 13:49 -0700
http://bitbucket.org/pypy/pypy/changeset/cc4bf5491933/

Log:	Merged in tilarids/pypy (pull request #140) Updated getting-started-
	dev.rst doc and fixed some broken links

diff --git a/pypy/doc/getting-started-dev.rst b/pypy/doc/getting-started-dev.rst
--- a/pypy/doc/getting-started-dev.rst
+++ b/pypy/doc/getting-started-dev.rst
@@ -107,8 +107,7 @@
 
 There is a small-to-medium demo showing the translator and the annotator::
 
-    cd demo
-    ../rpython/translator/goal/translate.py --view --annotate bpnn.py
+    python bin/rpython --view --annotate translator/goal/bpnn.py
 
 This causes ``bpnn.py`` to display itself as a call graph and class
 hierarchy.  Clicking on functions shows the flow graph of the particular
@@ -119,7 +118,7 @@
 To turn this example to C code (compiled to the executable ``bpnn-c``),
 type simply::
 
-    ../rpython/translator/goal/translate.py bpnn.py
+    python bin/rpython translator/goal/bpnn.py
 
 
 Translating Full Programs
@@ -129,8 +128,7 @@
 ``rpython/translator/goal``. Examples for this are a slightly changed version of
 Pystone::
 
-    cd rpython/translator/goal
-    python translate.py targetrpystonedalone
+    python bin/rpython translator/goal/targetrpystonedalone
 
 This will produce the executable "targetrpystonedalone-c".
 
@@ -138,6 +136,17 @@
 interpreter`_. There is also an FAQ about how to set up this process for `your
 own interpreters`_.
 
+There are several environment variables you can find useful while playing with the RPython:
+
+``PYPY_USESSION_DIR``
+    RPython uses temporary session directories to store files that are generated during the 
+    translation process(e.g., translated C files). ``PYPY_USESSION_DIR`` serves as a base directory for these session
+    dirs. The default value for this variable is the system's temporary dir.
+
+``PYPY_USESSION_KEEP``
+    By default RPython keeps only the last ``PYPY_USESSION_KEEP`` (defaults to 3) session dirs inside ``PYPY_USESSION_DIR``. 
+    Increase this value if you want to preserve C files longer (useful when producing lots of lldebug builds).
+
 .. _`your own interpreters`: faq.html#how-do-i-compile-my-own-interpreters
 
 .. _`start reading sources`: 
diff --git a/pypy/doc/jit/pyjitpl5.rst b/pypy/doc/jit/pyjitpl5.rst
--- a/pypy/doc/jit/pyjitpl5.rst
+++ b/pypy/doc/jit/pyjitpl5.rst
@@ -13,7 +13,7 @@
 implemented.  It's helpful to have an understanding of how the `RPython translation
 toolchain`_ works before digging into the sources.
 
-Almost all JIT specific code is found in pypy/jit subdirectories.  Translation
+Almost all JIT specific code is found in rpython/jit subdirectories.  Translation
 time code is in the codewriter directory.  The metainterp directory holds
 platform independent code including the the tracer and the optimizer.  Code in
 the backend directory is responsible for generating machine code.
@@ -175,7 +175,7 @@
 
 * `Tracing the Meta-Level: PyPy's Tracing JIT Compiler`__
 
-.. __: http://codespeak.net/svn/pypy/extradoc/talk/icooolps2009/bolz-tracing-jit-final.pdf
+.. __: https://bitbucket.org/pypy/extradoc/src/tip/talk/icooolps2009/bolz-tracing-jit-final.pdf
 
 as well as the `blog posts with the JIT tag.`__
 
diff --git a/rpython/bin/translatorshell.py b/rpython/bin/translatorshell.py
--- a/rpython/bin/translatorshell.py
+++ b/rpython/bin/translatorshell.py
@@ -25,6 +25,8 @@
 """
 
 import os, sys
+sys.path.insert(0, os.path.dirname(os.path.dirname(
+                       os.path.dirname(os.path.realpath(__file__)))))
 
 from rpython.translator.interactive import Translation
 from rpython.rtyper.rtyper import *
diff --git a/rpython/tool/udir.py b/rpython/tool/udir.py
--- a/rpython/tool/udir.py
+++ b/rpython/tool/udir.py
@@ -12,7 +12,7 @@
 #
 #    $PYPY_USESSION_DIR/usession-$PYPY_USESSION_BASENAME-$USER
 #
-# The default value for $PYPY_USESSION_DIR is the system tmp.
+# The default value for $PYPY_USESSION_DIR is the system's tmp.
 # The default value for $PYPY_USESSION_BASENAME is the name
 # of the current Mercurial branch.
 #
diff --git a/rpython/translator/goal/bpnn.py b/rpython/translator/goal/bpnn.py
--- a/rpython/translator/goal/bpnn.py
+++ b/rpython/translator/goal/bpnn.py
@@ -27,7 +27,6 @@
 import math
 import time
 
-import autopath
 from rpython.rlib import rrandom
 
 PRINT_IT = True