Moved build stuff to new build.py, and cleaned up

inclement · inclement · commit 618714f6f57a · 2015-12-11T00:24:50.000Z
diff --git a/pythonforandroid/logger.py b/pythonforandroid/logger.py
@@ -9,6 +9,10 @@
 from colorama import Style as Colo_Style, Fore as Colo_Fore
 
 
+# monkey patch to show full output
+sh.ErrorReturnCode.truncate_cap = 999999
+
+
 class LevelDifferentiatingFormatter(logging.Formatter):
     def format(self, record):
         if record.levelno > 30:
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -263,9 +263,6 @@ def get_build_dir(self, arch):
         '''Given the arch name, returns the directory where the
         downloaded/copied package will be built.'''
 
-        # if self.url is not None:
-        #     return join(self.get_build_container_dir(arch),
-        #                 get_directory(self.versioned_url))
         return join(self.get_build_container_dir(arch), self.name)
 
     def get_recipe_dir(self):
@@ -346,8 +343,6 @@ def unpack(self, arch):
             shprint(sh.mkdir, '-p', build_dir)
             shprint(sh.rmdir, build_dir)
             ensure_dir(build_dir)
-            # shprint(sh.ln, '-s', user_dir,
-            #         join(build_dir, get_directory(self.versioned_url)))
             shprint(sh.git, 'clone', user_dir, self.get_build_dir(arch))
             return
 
diff --git a/pythonforandroid/recipes/freetype/__init__.py b/pythonforandroid/recipes/freetype/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchARM
+from pythonforandroid.toolchain import Recipe, shprint, current_directory, ArchARM
 from os.path import exists, join, realpath
 from os import uname
 import glob
diff --git a/pythonforandroid/recipes/harfbuzz/__init__.py b/pythonforandroid/recipes/harfbuzz/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchARM
+from pythonforandroid.toolchain import Recipe, shprint, current_directory, ArchARM
 from os.path import exists, join, realpath
 from os import uname
 import glob
diff --git a/pythonforandroid/recipes/hostpython2/__init__.py b/pythonforandroid/recipes/hostpython2/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, info, warning
+from pythonforandroid.toolchain import Recipe, shprint, current_directory, info, warning
 from os.path import join, exists
 from os import chdir
 import sh
diff --git a/pythonforandroid/recipes/hostpython3/__init__.py b/pythonforandroid/recipes/hostpython3/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, info, warning
+from pythonforandroid.toolchain import Recipe, shprint, current_directory, info, warning
 from os.path import join, exists
 from os import chdir
 import sh
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchARM
+from pythonforandroid.toolchain import Recipe, shprint, current_directory, ArchARM
 from os.path import exists, join
 from os import uname
 import glob
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
diff --git a/pythonforandroid/util.py b/pythonforandroid/util.py
