From e285f2e5b1665993f7ebb06eb922bdd97311cbf3 Mon Sep 17 00:00:00 2001 From: Josh Friend Date: Mon, 4 May 2015 10:35:34 -0400 Subject: [PATCH] use full path when installing a jar --- plugins/python-build/bin/python-build | 4 +++- plugins/python-build/share/python-build/jython-2.7.0 | 9 --------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index e27e8a22..2521c663 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -534,7 +534,9 @@ fetch_jar() { download_tarball "$package_url" "$package_filename" "$checksum" fi - { if $JAVA -jar ${package_name}.jar -s -d ${package_name}; then + # Must use full path to jar and destination directory: + # http://bugs.jython.org/issue2350 + { if $JAVA -jar $PWD/${package_name}.jar -s -d $PWD/${package_name}; then if [ -z "$KEEP_BUILD_PATH" ]; then rm -f "$package_filename" else diff --git a/plugins/python-build/share/python-build/jython-2.7.0 b/plugins/python-build/share/python-build/jython-2.7.0 index 6fa20ecb..b4f49716 100644 --- a/plugins/python-build/share/python-build/jython-2.7.0 +++ b/plugins/python-build/share/python-build/jython-2.7.0 @@ -1,15 +1,6 @@ require_java install_jar "jython-2.7.0" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.0/jython-installer-2.7.0.jar#b44352ece72382268a60e2848741c96609a91d796bb9a9c6ebeff62f0c12c9cf" jython -# Jython is supposed to install pip using ensurepip by default, but this does -# not appear to be working so we do it manually. -# -# pyenv's `ensurepip` downloads `get-pip.py` which isnt currently compatible -# with jython: http://bugs.jython.org/issue2302 -# -# Use the ensurepip module in jython to install the bundled pip instead: -"$PYTHON_BIN" -m ensurepip - case "$(pypy_architecture 2>/dev/null || true)" in "osx64"|"win32" ) # Jython does not seem to work properly on OSX/windows unless JAVA_HOME is set