Only install scripts in the all-in-one-apk version, setup PYTHONUSERBASE so .pth files are been found

Naranjo Manuel Francisco · Naranjo Manuel Francisco · commit f1e62734f151 · 2011-05-26T08:50:52.000-03:00
diff --git a/android/PythonForAndroid/src/com/googlecode/pythonforandroid/PythonDescriptor.java b/android/PythonForAndroid/src/com/googlecode/pythonforandroid/PythonDescriptor.java
@@ -37,13 +37,16 @@ public class PythonDescriptor extends Sl4aHostedInterpreter {
   private static final String ENV_LD = "LD_LIBRARY_PATH";
   private static final String ENV_EXTRAS = "PY4A_EXTRAS";
   private static final String ENV_EGGS = "PYTHON_EGG_CACHE";
+  private static final String ENV_USERBASE="PYTHONUSERBASE";
   private static final String BASE_URL = "http://python-for-android.googlecode.com/";
   private static final int LATEST_VERSION = -1;
-  private boolean offline = false;
-  private int cache_version = -1;
-  private int cache_extras_version = -1;
   private int cache_scripts_version = -1;
 
+  @Override
+  public int getVersion() {
+    return 16;
+  }
+
   @Override
   public String getBaseInstallUrl() {
     return BASE_URL + "/files/";
@@ -70,7 +73,7 @@ public boolean hasExtrasArchive() {
   }
 
   public boolean hasScriptsArchive() {
-    return !offline;
+    return true;
   }
 
   private int __resolve_version(String what) {
@@ -88,31 +91,6 @@ private int __resolve_version(String what) {
     return LATEST_VERSION;
   }
 
-  public int getVersion() {
-    cache_version = __resolve_version("");
-    return cache_version;
-  }
-
-  public int getVersion(boolean usecache) {
-    if (usecache && cache_version > -1) {
-      return cache_version;
-    }
-    return this.getVersion();
-  }
-
-  @Override
-  public int getExtrasVersion() {
-    cache_extras_version = __resolve_version("_extra");
-    return cache_extras_version;
-  }
-
-  public int getExtrasVersion(boolean usecache) {
-    if (usecache && cache_extras_version > -1) {
-      return cache_extras_version;
-    }
-    return this.getExtrasVersion();
-  }
-
   @Override
   public int getScriptsVersion() {
     cache_scripts_version = __resolve_version("_scripts");
@@ -160,21 +138,13 @@ private String getTemp() {
   public Map<String, String> getEnvironmentVariables(Context context) {
     Map<String, String> values = new HashMap<String, String>();
     values.put(ENV_HOME, getHome(context));
-    values.put(ENV_LD, new File(getHome(context), "python/lib").getAbsolutePath());
-    values.put(ENV_PATH, new File(getHome(context), "python/lib/python2.6/python.zip/python") + ":"
-        + new File(getHome(context), "python/lib/python2.6/lib-dynload"));
-    values.put(ENV_EGGS,
-        new File(getHome(context), "python/lib/python2.6/lib-dynload").getAbsolutePath());
+    values.put(ENV_LD, new File(getHome(context), "lib").getAbsolutePath());
+    values.put(ENV_PATH, new File(getHome(context), "lib/python2.6/python.zip/python") + ":"
+        + new File(getHome(context), "lib/python2.6/lib-dynload"));
+    values.put(ENV_EGGS, new File(getHome(context), "lib/python2.6/lib-dynload").getAbsolutePath());
     values.put(ENV_EXTRAS, getExtrasRoot());
+    values.put(ENV_USERBASE, getHome(context));
     values.put(ENV_TEMP, getTemp());
     return values;
   }
-
-  public void setOffline(boolean offline) {
-    this.offline = offline;
-  }
-
-  public boolean getOffline() {
-    return offline;
-  }
 }
