[recipe-lib] Make libxslt a library recipe and ...

also make the imports from the right module

Author: opacam

pythonforandroid/recipes/libxslt/__init__.py

@@ -1,5 +1,6 @@
 from pythonforandroid.recipe import Recipe
-from pythonforandroid.toolchain import shprint, shutil, current_directory
+from pythonforandroid.util import current_directory
+from pythonforandroid.logger import shprint
 from os.path import exists, join
 import sh
 
@@ -9,16 +10,14 @@ class LibxsltRecipe(Recipe):
     url = 'http://xmlsoft.org/sources/libxslt-{version}.tar.gz'
     depends = ['libxml2']
     patches = ['fix-dlopen.patch']
+    built_libraries = {
+        'libxslt.a': 'libxslt/.libs',
+        'libexslt.a': 'libexslt/.libs'
+    }
 
     call_hostpython_via_targetpython = False
 
-    def should_build(self, arch):
-        return not exists(
-            join(self.get_build_dir(arch.arch),
-                 'libxslt', '.libs', 'libxslt.a'))
-
-    def build_arch(self, arch):
-        super(LibxsltRecipe, self).build_arch(arch)
+    def do_build_libs(self, arch):
         env = self.get_recipe_env(arch)
         build_dir = self.get_build_dir(arch.arch)
         with current_directory(build_dir):
@@ -45,11 +44,6 @@ def build_arch(self, arch):
                     _env=env)
             shprint(sh.make, "V=1", _env=env)
 
-            shutil.copyfile('libxslt/.libs/libxslt.a',
-                            join(self.ctx.libs_dir, 'libxslt.a'))
-            shutil.copyfile('libexslt/.libs/libexslt.a',
-                            join(self.ctx.libs_dir, 'libexslt.a'))
-
     def get_recipe_env(self, arch):
         env = super(LibxsltRecipe, self).get_recipe_env(arch)
         env['CONFIG_SHELL'] = '/bin/bash'