Merge branch 'pypy_builder'

plugins/python-build/bin/python-build

@@ -567,20 +567,35 @@ build_package_python() {
 }
 
 build_package_jython() {
-  {
-    build_package_copy
-    cd "${PREFIX_PATH}/bin"
-    ln -fs jython python
-  }
+  build_package_copy
+  { if [ -x "${PREFIX_PATH}/bin/jython" ] && [ ! -x "${PREFIX_PATH}/bin/python" ]; then
+      ( cd "${PREFIX_PATH}/bin" && ln -fs jython python )
+    fi
+  } >&4 2>&1
 }
 
 build_package_pypy() {
-  {
-    mkdir -p "$PREFIX_PATH"
-    cp -R . "$PREFIX_PATH"
-    cd "${PREFIX_PATH}/bin"
-    ln -fs pypy python
-  }
+  build_package_copy
+  { if [ -x "${PREFIX_PATH}/bin/pypy" ] && [ ! -x "${PREFIX_PATH}/bin/python" ]; then
+      ( cd "${PREFIX_PATH}/bin" && ln -fs pypy python )
+    fi
+  } >&4 2>&1
+}
+
+build_package_pypy_builder() {
+  if [ -f "rpython/bin/rpython" ]; then # pypy 2.x
+    python "rpython/bin/rpython" -Ojit "pypy/goal/targetpypystandalone.py" >&4 2>&1
+  elif [ -f "pypy/translator/goal/translate.py" ]; then # pypy 1.x
+    ( cd "pypy/translator/goal" && python "translate.py" --out=jit "targetpypystandalone.py" ) 1>&4 2>&1
+  else
+    echo "not a pypy source tree" 1>&3
+    return 1
+  fi
+  if [ -x "pypy-c" ] && [ ! -x "bin/pypy" ]; then
+    mkdir -p "bin"
+    mv -f "pypy-c" "bin/pypy"
+  fi
+  build_package_pypy
 }
 
 build_package_copy() {

plugins/python-build/share/python-build/pypy-2.0-dev

@@ -0,0 +1,3 @@
+install_hg "pypy-2.0-dev" "https://bitbucket.org/pypy/pypy" "release-2.0.x" "pypy_builder"
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/pypy-2.0-src

@@ -0,0 +1,3 @@
+install_package "pypy-2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-src.tar.bz2#4dc82e2240dd2b5be313119672988538" "pypy_builder"
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/pypy-2.0.1-src

@@ -0,0 +1,3 @@
+install_package "pypy-2.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-src.tar.bz2#34072be1eeb63f9d37cf387e58aae81d" "pypy_builder"
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/pypy-2.0.2-src

@@ -0,0 +1,3 @@
+install_package "pypy-2.0.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2#c26662e348159b460057548ddaf35333" "pypy_builder"
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/pypy-dev

@@ -0,0 +1,3 @@
+install_hg "pypy-dev" "https://bitbucket.org/pypy/pypy" "default" "pypy_builder"
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python