fixes to storage dir usage

kived · kived · commit 23a969b17d71 · 2016-04-21T21:51:22.000-05:00
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -97,6 +97,7 @@ def setup_dirs(self, storage_dir):
         self.build_dir = join(self.storage_dir, 'build')
         self.dist_dir = join(self.storage_dir, 'dists')
 
+    def ensure_dirs(self):
         ensure_dir(self.storage_dir)
         ensure_dir(self.build_dir)
         ensure_dir(self.dist_dir)
@@ -155,7 +156,7 @@ def ndk_dir(self):
     def ndk_dir(self, value):
         self._ndk_dir = value
 
-    def prepare_build_environment(self, storage_dir, user_sdk_dir, user_ndk_dir,
+    def prepare_build_environment(self, user_sdk_dir, user_ndk_dir,
                                   user_android_api, user_ndk_ver):
         '''Checks that build dependencies exist and sets internal variables
         for the Android SDK etc.
@@ -164,7 +165,7 @@ def prepare_build_environment(self, storage_dir, user_sdk_dir, user_ndk_dir,
 
         '''
 
-        self.setup_dirs(storage_dir)
+        self.ensure_dirs()
 
         if self._build_env_prepared:
             return
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -93,8 +93,7 @@ def require_prebuilt_dist(func):
     def wrapper_func(self, args):
         ctx = self.ctx
         ctx.set_archs(self._archs)
-        ctx.prepare_build_environment(storage_dir=self.storage_dir,
-                                      user_sdk_dir=self.sdk_dir,
+        ctx.prepare_build_environment(user_sdk_dir=self.sdk_dir,
                                       user_ndk_dir=self.ndk_dir,
                                       user_android_api=self.android_api,
                                       user_ndk_ver=self.ndk_version)
@@ -298,6 +297,7 @@ def __init__(self):
         if args.debug:
             logger.setLevel(logging.DEBUG)
         self.storage_dir = args.storage_dir
+        self.ctx.setup_dirs(self.storage_dir)
         self.sdk_dir = args.sdk_dir
         self.ndk_dir = args.ndk_dir
         self.android_api = args.android_api
@@ -423,7 +423,7 @@ def clean_dists(self, args):
         parser = argparse.ArgumentParser(
                 description="Delete any distributions that have been built.")
         args = parser.parse_args(args)
-        ctx = Context()
+        ctx = self.ctx
         if exists(ctx.dist_dir):
             shutil.rmtree(ctx.dist_dir)
 
@@ -438,7 +438,7 @@ def clean_builds(self, args):
         parser = argparse.ArgumentParser(
                 description="Delete all build files (but not download caches)")
         args = parser.parse_args(args)
-        ctx = Context()
+        ctx = self.ctx
         # if exists(ctx.dist_dir):
         #     shutil.rmtree(ctx.dist_dir)
         if exists(ctx.build_dir):
@@ -476,7 +476,7 @@ def clean_download_cache(self, args):
         parser = argparse.ArgumentParser(
                 description="Delete all download caches")
         args = parser.parse_args(args)
-        ctx = Context()
+        ctx = self.ctx
         if exists(ctx.packages_path):
             shutil.rmtree(ctx.packages_path)
 
@@ -641,7 +641,7 @@ def print_context_info(self, args):
         python-for-android will internally use for package building, along
         with information about where the Android SDK and NDK will be called
         from.'''
-        ctx = Context()
+        ctx = self.ctx
         for attribute in ('root_dir', 'build_dir', 'dist_dir', 'libs_dir',
                           'ccache', 'cython', 'sdk_dir', 'ndk_dir',
                           'ndk_platform', 'ndk_ver', 'android_api'):
@@ -661,7 +661,7 @@ def dists(self, args):
     def distributions(self, args):
         '''Lists all distributions currently available (i.e. that have already
         been built).'''
-        ctx = Context()
+        ctx = self.ctx
         dists = Distribution.get_distributions(ctx)
 
         if dists:
