build with andriod studio 2.2

kuri65536 · Jan 17, 2017 · 13c393c · 13c393c
1 parent 67bbc71
commit 13c393c
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 35 deletions.
diff --git a/android/Common/build.gradle b/android/Common/build.gradle
@@ -1,10 +1,9 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 

diff --git a/android/InterpreterForAndroid/build.gradle b/android/InterpreterForAndroid/build.gradle
@@ -1,10 +1,9 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 

diff --git a/android/Python3ForAndroid/README b/android/Python3ForAndroid/README
@@ -1,11 +1,26 @@
-Python 3 Interpreter For Android
+# Python 3 Interpreter For Android
+
+In order to build this project first you need to gradle build other projects,
+see settings.gradle:
 
-In order to build this project first you need to ant build this projects:
     Utils
     Common
     InterpreterForAndroid
 
-Copy the generated jar files (<project>/dist) into Python3ForAndroid/libs each time
-any of them is upgraded
-
 The Python3 build is still very incoherent.
+
+
+# setup
+
+1. edit local.properties to specify Android SDK.
+
+    `sdk.dir=/home/shinji/install/android-sdk`
+
+2. You also need to build ../python3-alpha by running
+
+    `NDK_PATH=/where/to/android-ndk make build`
+
+    in that folder.
+
+3. And then running python3.sh once it ended the build process.
+
diff --git a/android/Python3ForAndroid/build.gradle b/android/Python3ForAndroid/build.gradle
@@ -8,11 +8,10 @@ task genURL << {
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 

diff --git a/android/Python3ForAndroid/src/com/googlecode/python3forandroid/Python3Descriptor.java b/android/Python3ForAndroid/src/com/googlecode/python3forandroid/Python3Descriptor.java
@@ -53,17 +53,17 @@ protected String pathShlib() {
 
     @Override
     protected String pathEgg() {
-        return this.pathShlib() + "/python3.4/egg-info";
+        return this.pathShlib() + "/python3.6/egg-info";
     }
 
     @Override
     protected String pathSitepkgs() {
-        return this.pathShlib() + "/python3.4/site-packages";
+        return this.pathShlib() + "/python3.6/site-packages";
     }
 
     @Override
     protected String pathDynload() {
-        return this.pathShlib() + "/python3.4/lib-dynload";
+        return this.pathShlib() + "/python3.6/lib-dynload";
     }
 
   @Override
@@ -93,7 +93,7 @@ public String getName() {
 
   @Override
   public String getNiceName() {
-    return "Python 3.4.3";
+    return "Python 3.6.0";
   }
 
   @Override

diff --git a/android/Python3ForAndroid/src/com/googlecode/python3forandroid/Python3Main.java b/android/Python3ForAndroid/src/com/googlecode/python3forandroid/Python3Main.java
@@ -35,11 +35,11 @@
  * the module contains shared libraries (*.so) then the module is unpacked into data, other installs
  * in extras.
  * 
- * Typically, these will be /data/data/com.googlecode.pythonforandroid/files/python/lib/python3.4
+ * Typically, these will be /data/data/com.googlecode.python3forandroid/files/python/lib/python3.6
  * and /sdcard/com.googlecode.pythonforandroid/extras respectively.
  * 
  * Egg files are just copied into
- * /data/data/com.googlecode.pythonforandroid/files/python/lib/python3.4
+ * /data/data/com.googlecode.python3forandroid/files/python/lib/python3.6
  * 
  * @author Damon
  * @author Robbie Matthews (rjmatthews62@gmail.com)

diff --git a/android/PythonCommon/build.gradle b/android/PythonCommon/build.gradle
@@ -1,10 +1,9 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 

diff --git a/android/PythonForAndroid/README b/android/PythonForAndroid/README
@@ -1,13 +1,22 @@
-Python Interpreter For Android
+# Python Interpreter For Android
+
+In order to build this project first you need to gradle build other projects,
+see settings.gradle:
 
-In order to build this project first you need to ant build this projects:
     Utils
     Common
     InterpreterForAndroid
 
-Copy the generated jar files (<project>/dist) into PythonForAndroid/libs each time
-any of them is upgraded
 
-You also need to build ../python-build by running build.sh in that folder and
-then running standalone_python.sh once it ended the build process
+# setup
+
+1. edit local.properties to specify Android SDK.
+
+    `sdk.dir=/home/shinji/install/android-sdk`
+
+2. You also need to build ../python-build by running
+
+    `NDK_PATH=/where/to/android-ndk make build` in that folder.
+
+3. And then running python2.sh once it ended the build process.
 
diff --git a/android/PythonForAndroid/build.gradle b/android/PythonForAndroid/build.gradle
@@ -8,11 +8,10 @@ task genURL << {
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 

diff --git a/android/Utils/build.gradle b/android/Utils/build.gradle
@@ -1,10 +1,9 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }