diff --git a/README.md b/README.md index d11bc21b..8fa6fd36 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,8 @@ Instruction for installation ### How to install 1. Download sl4a apk 2. Download py4a apk -3. Download py4a zips, [interpreter - python_r28.zip](../../releases/download/r28/python_r28.zip), - [modules - python_extras_r26.zip](../../releases/download/r26/python_extras_r28.zip), +3. Download py4a zips, [interpreter - python_r29.zip](../../releases/download/r29/python_r29.zip), + [modules - python_extras_r29.zip](../../releases/download/r29/python_extras_r29.zip), [sample scripts - python_scripts_r26.zip](../../releases/download/r26/python_scripts_r26.zip). 4. Enable "Unknown Sources" in your device settings. 5. Open 1. apk to install. (sl4a) @@ -59,6 +59,7 @@ Instruction for installation 8. push 3. zips to device's /sdcard/com.googlecode.pythonforandroid. (be sure /sdcard path to fit your device.) 9. Click "Local install" to check zips and install python binaries. +9. Click "Local install" to install these zips. 10. Launch sl4a, Select 'Menu' >> 'View' >> 'Interpreters' and Select 'Python 2.7.?'. 11. Python will be launched, have fun! diff --git a/android/PythonCommon/src/com/googlecode/android_scripting/pythoncommon/PythonMain.java b/android/PythonCommon/src/com/googlecode/android_scripting/pythoncommon/PythonMain.java index ecd01e25..311853ab 100644 --- a/android/PythonCommon/src/com/googlecode/android_scripting/pythoncommon/PythonMain.java +++ b/android/PythonCommon/src/com/googlecode/android_scripting/pythoncommon/PythonMain.java @@ -934,6 +934,7 @@ public File doSelectZip(ArrayList seq, final String title) { if (seq.size() < 2) { return seq.get(0); // there is only one file, good case! } + // BUG: not work well, 2017/01/17 // show users to select zip. final CharSequence[] items = seq.toArray(new CharSequence[seq.size()]); parent.runOnUiThread(new Runnable() { diff --git a/python-build/LATEST_VERSION b/python-build/LATEST_VERSION index 24f25421..7f6b8281 100644 --- a/python-build/LATEST_VERSION +++ b/python-build/LATEST_VERSION @@ -1 +1 @@ -r28 +r29 diff --git a/python-build/LATEST_VERSION_EXTRA b/python-build/LATEST_VERSION_EXTRA index 24f25421..7f6b8281 100644 --- a/python-build/LATEST_VERSION_EXTRA +++ b/python-build/LATEST_VERSION_EXTRA @@ -1 +1 @@ -r28 +r29 diff --git a/python-build/openssl/Makefile b/python-build/openssl/Makefile index b36c8b64..308643cb 100644 --- a/python-build/openssl/Makefile +++ b/python-build/openssl/Makefile @@ -12,7 +12,7 @@ export ANDROID_DEV=$(ANDROID_SYSROOT)/usr # export PATH=$(ANDROID_TOOLCHAIN):$(PATH) OPENSSL_SERIES := 1.0.2 -OPENSSL_RELEASE := d +OPENSSL_RELEASE := j OPENSSL_VERSION := $(OPENSSL_SERIES)$(OPENSSL_RELEASE) OPENSSL_DIR = openssl-$(OPENSSL_VERSION) OPENSSL_SRC = openssl-$(OPENSSL_VERSION).tar.gz @@ -56,7 +56,11 @@ clean: make -C .build_x86 clean $(OPENSSL_SRC): - wget https://www.openssl.org/source/old/$(OPENSSL_SERIES)/$(OPENSSL_SRC) + if ! wget \ + wget https://www.openssl.org/source/$(OPENSSL_SRC); \ + then \ + https://www.openssl.org/source/old/$(OPENSSL_SERIES)/$(OPENSSL_SRC); \ + fi wget https://wiki.openssl.org/images/7/70/Setenv-android.sh # setup arch depended variables: arm @@ -77,9 +81,9 @@ $(OPENSSL_BIN_arm): \ $(OPENSSL_BIN_arm): .build_armeabi/Makefile ./showenv.sh cd $(dir $<); perl $(perlopt) Makefile.org - cd $(dir $<); ./Configure $(__PIE_CFLAGS) android no-asm shared no-ssl2 no-ssl3 no-comp no-hw no-engine \ + cd $(dir $<); ./Configure $(__PIE_CFLAGS) android no-asm shared no-ssl2 no-ssl3 no-comp no-hw \ --openssldir=$(PREFIX)/share --prefix=$(PREFIX) - # make -C $(dir $<) depend + make -C $(dir $<) depend make -C $(dir $<) all make -C $(dir $<) install_sw