Update as needed by the recent(ish) PyPy/RPython split.

This was less painful than I expected.

configure

@@ -12,7 +12,7 @@ converge_date=`date '+%Y/%m/%d %H:%M:%S'`
 abs_top_srcdir=`pwd`
 
 prefix=""
-rpython_opt="jit"
+rpython_opt="Ojit"
 while [ $# -ge 1 ]; do
     case $1 in
         --prefix=*  ) prefix=`echo $1 | sed "s/--prefix=//g"`; shift;;
@@ -45,19 +45,19 @@ elif [ $? -ne 0 ]; then
 fi
 echo $PYTHON
 
-echo -n "Checking for RPython translate.py... "
+echo -n "Checking for RPython... "
 if [ "X$PYPY_SRC" != "X" ]; then
-    TRANSLATE_PY=$PYPY_SRC/pypy/translator/goal/translate.py
-    if [ ! -f $TRANSLATE_PY ]; then
-        TRANSLATE_PY=""
+    RPYTHON=$PYPY_SRC/rpython/bin/rpython
+    if [ ! -f $RPYTHON ]; then
+        RPYTHON=""
     fi
 fi
 
-if [ "X$TRANSLATE_PY" = "X" ]; then
+if [ "X$RPYTHON" = "X" ]; then
     echo "not found (try setting \$PYPY_SRC to the root of the PyPy source distribution)."
     exit 1
 fi
-echo $TRANSLATE_PY
+echo $RPYTHON
 
 operating_system=`uname -s`
 machine_type=`uname -m`
@@ -150,6 +150,7 @@ xml2_configd=`dirname $xml2_configp`
 cnds="$cnds `dirname $xml2_configd`/lib"
 for dir in $cnds ; do
 	cnd=$dir/libxml2.a
+    echo $cnd
 	if [ -f $cnd ]; then
 		libxml2_a=$cnd
 		break
@@ -232,7 +233,7 @@ if rewrite:
 EOF
 for p_in in `find . -name "*.in"`; do
     p=`echo $p_in | sed "s/.in$//g"`
-    $PYTHON $rewriter $p_in $p "@abs_top_srcdir@" "$abs_top_srcdir" "@PYTHON@" "$PYTHON" "@TRANSLATE_PY@" "$TRANSLATE_PY" "@RPYTHON_OPT@" "$rpython_opt" "@INSTALL@" "$INSTALL" "@prefix@" "$prefix" "@bindir@" "$prefix/bin" "@datadir@" "$prefix/share" "@libdir@" "$prefix/lib" "@INSTALL@" "$abs_top_srcdir/install.sh" "@CONVERGE_VERSION@" "$converge_version" "@CONVERGE_DATE@"  "$converge_date" "@PLATFORM@" "$operating_system" "@EXEC_EXT@" "$exec_ext" "@DIR_SEP@" "$DIR_SEP" "@LIBPCRE_INCLUDE_DIRS@" "$libpcre_include_dirs" "@LIBPCRE_LIBRARY_DIRS@" "$libpcre_library_dirs" "@LIBPCRE_LIBRARIES@" "$libpcre_libraries" "@LIBPCRE_LINK_FLAGS@" "$libpcre_link_flags" "@LIBPCRE_A@" "$libpcre_a" "@LIBXML2_INCLUDE_DIRS@" "$libxml2_include_dirs" "@LIBXML2_LIBRARY_DIRS@" "$libxml2_library_dirs" "@LIBXML2_LIBRARIES@" "$libxml2_libraries" "@LIBXML2_LINK_FLAGS@" "$libxml2_link_flags" "@LIBXML2_A@" "$libxml2_a" "@NO_ASMGCC_HACK@" "$no_asmgcc_hack"
+    $PYTHON $rewriter $p_in $p "@abs_top_srcdir@" "$abs_top_srcdir" "@PYTHON@" "$PYTHON" "@RPYTHON@" "$RPYTHON" "@RPYTHON_OPT@" "$rpython_opt" "@INSTALL@" "$INSTALL" "@prefix@" "$prefix" "@bindir@" "$prefix/bin" "@datadir@" "$prefix/share" "@libdir@" "$prefix/lib" "@INSTALL@" "$abs_top_srcdir/install.sh" "@CONVERGE_VERSION@" "$converge_version" "@CONVERGE_DATE@"  "$converge_date" "@PLATFORM@" "$operating_system" "@EXEC_EXT@" "$exec_ext" "@DIR_SEP@" "$DIR_SEP" "@LIBPCRE_INCLUDE_DIRS@" "$libpcre_include_dirs" "@LIBPCRE_LIBRARY_DIRS@" "$libpcre_library_dirs" "@LIBPCRE_LIBRARIES@" "$libpcre_libraries" "@LIBPCRE_LINK_FLAGS@" "$libpcre_link_flags" "@LIBPCRE_A@" "$libpcre_a" "@LIBXML2_INCLUDE_DIRS@" "$libxml2_include_dirs" "@LIBXML2_LIBRARY_DIRS@" "$libxml2_library_dirs" "@LIBXML2_LIBRARIES@" "$libxml2_libraries" "@LIBXML2_LINK_FLAGS@" "$libxml2_link_flags" "@LIBXML2_A@" "$libxml2_a" "@NO_ASMGCC_HACK@" "$no_asmgcc_hack"
 done
 echo
 rm -f $rewriter

vm/Builtins.py

@@ -18,8 +18,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from pypy.rlib import debug, jit, objectmodel, rarithmetic, rweakref
-from pypy.rpython.lltypesystem import lltype, rffi
+from rpython.rlib import debug, jit, objectmodel, rarithmetic, rweakref
+from rpython.rtyper.lltypesystem import lltype, rffi
 
 NUM_BUILTINS = 41
 

vm/Bytecode.py

@@ -18,8 +18,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from pypy.rlib import jit
-from pypy.rpython.lltypesystem import lltype, rffi
+from rpython.rlib import jit
+from rpython.rtyper.lltypesystem import lltype, rffi
 
 from Target import *
 from VM import *

vm/Makefile.in

@@ -1,12 +1,12 @@
 PYTHON=@PYTHON@
-TRANSLATE_PY=@TRANSLATE_PY@
+RPYTHON=@RPYTHON@
 INSTALL=@INSTALL@
 bindir=@bindir@
 
 all: converge
 
 converge: *.py Modules/*.py
-	${PYTHON} ${TRANSLATE_PY} --opt=@RPYTHON_OPT@ @NO_ASMGCC_HACK@ --output=converge main.py
+	${PYTHON} ${RPYTHON} -@RPYTHON_OPT@ @NO_ASMGCC_HACK@ --output=converge main.py
 
 install:
 	${INSTALL} -d ${DESTDIR}${bindir}

vm/Modules/Con_Array.py

@@ -20,9 +20,9 @@
 
 
 import sys
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from Builtins import *
 from Core import *
 

vm/Modules/Con_C_Platform_Exec.py

@@ -20,10 +20,10 @@
 
 
 import os
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.rlib import rarithmetic, rposix
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.rlib import rarithmetic, rposix
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from Builtins import *
 
 

vm/Modules/Con_C_Platform_Host.py

@@ -19,7 +19,7 @@
 # IN THE SOFTWARE.
 
 
-from pypy.rlib import rsocket
+from rpython.rlib import rsocket
 from Builtins import *
 
 

vm/Modules/Con_C_Time.py

@@ -19,10 +19,10 @@
 # IN THE SOFTWARE.
 
 
-from pypy.rlib import rarithmetic
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rlib import rarithmetic
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from Builtins import *
 
 

vm/Modules/Con_Curses.py

@@ -20,9 +20,9 @@
 
 
 import sys
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from Builtins import *
 
 

vm/Modules/Con_PCRE.py

@@ -19,10 +19,10 @@
 # IN THE SOFTWARE.
 
 
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.rlib.rsre import rsre_re
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.rlib.rsre import rsre_re
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 import Config
 from Builtins import *
 from Core import *

vm/Modules/Con_POSIX_File.py

@@ -20,10 +20,10 @@
 
 
 import os
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.rlib import rarithmetic, rposix
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.rlib import rarithmetic, rposix
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from Builtins import *
 import Stdlib_Modules
 

vm/Modules/Con_Random.py

@@ -20,9 +20,9 @@
 
 
 import sys
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 import Config
 from Builtins import *
 

vm/Modules/libXML2.py

@@ -19,11 +19,11 @@
 # IN THE SOFTWARE.
 
 
-from pypy.rlib import rarithmetic, objectmodel
-from pypy.rpython.lltypesystem import llmemory, lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.rpython.annlowlevel import llhelper
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rlib import rarithmetic, objectmodel
+from rpython.rtyper.lltypesystem import llmemory, lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.rtyper.annlowlevel import llhelper
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from Builtins import *
 from Core import *
 import Config, Target

vm/Target.py

@@ -19,8 +19,8 @@
 # IN THE SOFTWARE.
 
 
-from pypy.rlib.jit import *
-from pypy.rpython.lltypesystem import lltype, rffi
+from rpython.rlib.jit import *
+from rpython.rtyper.lltypesystem import lltype, rffi
 
 import sys
 

vm/VM.py

@@ -22,8 +22,8 @@
 import os, sys
 
 from pypy.config.pypyoption import get_pypy_config
-from pypy.rlib import debug, jit, objectmodel
-from pypy.rpython.lltypesystem import lltype, llmemory, rffi
+from rpython.rlib import debug, jit, objectmodel
+from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
 
 from Core import *
 import Builtins, Target

vm/main.py

@@ -19,19 +19,19 @@
 # IN THE SOFTWARE.
 
 
+import os, sys
+sys.path.append(os.getenv("PYPY_SRC"))
+print sys.path
 try:
     import pypy
 except:
-    import os, sys
     sys.setrecursionlimit(20000)
-    sys.path.append(os.getenv("PYPY_SRC"))
 
-from pypy.config.config import Config
-from pypy.rlib import rarithmetic, rposix
-from pypy.rlib.jit import *
-from pypy.rpython.lltypesystem import lltype, rffi
-from pypy.rpython.tool import rffi_platform as platform
-from pypy.translator.tool.cbuild import ExternalCompilationInfo
+from rpython.rlib import rarithmetic, rposix
+from rpython.rlib.jit import *
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper.tool import rffi_platform as platform
+from rpython.translator.tool.cbuild import ExternalCompilationInfo
 import os, os.path, sys
 import Builtins, Bytecode, Config, Stdlib_Modules, VM
 
@@ -370,7 +370,7 @@ def target(driver, args):
 
 
 def jitpolicy(driver):
-    from pypy.jit.codewriter.policy import JitPolicy
+    from rpython.jit.codewriter.policy import JitPolicy
     return JitPolicy()
 
 if __name__ == "__main__":