vlc recipe procompiled aar bundle handling improved

ibobalo · ibobalo · commit d1f165481f00 · 2015-10-29T11:29:06.000+02:00
diff --git a/pythonforandroid/recipes/vlc/__init__.py b/pythonforandroid/recipes/vlc/__init__.py
@@ -14,37 +14,42 @@ class VlcRecipe(Recipe):
     port_git = 'http://git.videolan.org/git/vlc-ports/android.git'
     vlc_git = 'http://git.videolan.org/git/vlc.git'
     ENV_LIBVLC_AAR = 'LIBVLC_AAR'
+    aars = {} # for future use of multiple arch
 
     def prebuild_arch(self, arch):
         super(VlcRecipe, self).prebuild_arch(arch)
         build_dir = self.get_build_dir(arch.arch)
         port_dir = join(build_dir, 'vlc-port-android')
-        aar_path = join(port_dir, 'libvlc', 'build', 'outputs', 'aar')
-        aar = environ.get(self.ENV_LIBVLC_AAR,
-                   join(aar_path, 'libvlc-{}.aar'.format(self.version)))
-        if not exists(aar):
-            if environ.has_key(''):
-                warning("Error: libvlc-<ver>.aar bundle not found in {}".format(aar))
+        if self.ENV_LIBVLC_AAR in environ:
+            self.aars[arch] = aar = environ.get(self.ENV_LIBVLC_AAR)
+            if not exists(aar):
+                warning("Error: libvlc-<ver>.aar bundle " \
+                           "not found in {}".format(aar))
                 info("check {} environment!".format(self.ENV_LIBVLC_AAR))
-                raise Exception("vlc .aar bundle not found by path specified in {}".format(self.ENV_LIBVLC_AAR))
-            warning("set path to precompiled libvlc-<ver>.aar bundle in {} environment!".format(self.ENV_LIBVLC_AAR))
-            info("libvlc-<ver>.aar for android not found!")
-            info("should build from sources at {}".format(port_dir))
+                exit(1)
+        else:
+            aar_path = join(port_dir, 'libvlc', 'build', 'outputs', 'aar')
+            self.aars[arch] = aar = join(aar_path, 'libvlc-{}.aar'.format(self.version))
+            warning("HINT: set path to precompiled libvlc-<ver>.aar bundle " \
+                        "in {} environment!".format(self.ENV_LIBVLC_AAR))
+            info("libvlc-<ver>.aar should build " \
+                        "from sources at {}".format(port_dir))
             if not exists(join(port_dir, 'compile.sh')):
-                info("clone vlc port for android sources from {}".format(self.port_git))
-                shprint(sh.git, 'clone', self.port_git, port_dir)
+                info("clone vlc port for android sources from {}".format(
+                            self.port_git))
+                shprint(sh.git, 'clone', self.port_git, port_dir,
+                            _tail=20, _critical=True)
             vlc_dir = join(port_dir, 'vlc')
             if not exists(join(vlc_dir, 'Makefile.am')):
                 info("clone vlc sources from {}".format(self.vlc_git))
-                shprint(sh.git, 'clone', self.vlc_git, vlc_dir)
+                shprint(sh.git, 'clone', self.vlc_git, vlc_dir,
+                            _tail=20, _critical=True)
 
     def build_arch(self, arch):
         super(VlcRecipe, self).build_arch(arch)
         build_dir = self.get_build_dir(arch.arch)
         port_dir = join(build_dir, 'vlc-port-android')
-        aar_path = join(port_dir, 'libvlc', 'build', 'outputs', 'aar')
-        aar = environ.get(self.ENV_LIBVLC_AAR,
-                   join(aar_path, 'libvlc-{}.aar'.format(self.version)))
+        aar = self.aars[arch]
         if not exists(aar):
             with current_directory(port_dir):
                 env = dict(environ)
@@ -55,9 +60,11 @@ def build_arch(self, arch):
                 })
                 info("compiling vlc from sources")
                 debug("environment: {}".format(env))
-                if not exists(join(port_dir, 'bin', 'VLC-debug.apk')):
-                     shprint(sh.Command('./compile.sh'), _env=env, _tail=50, _critical=True)
-                shprint(sh.Command('./compile-libvlc.sh'), _env=env, _tail=50, _critical=True)
+                if not exists(join('bin', 'VLC-debug.apk')):
+                     shprint(sh.Command('./compile.sh'), _env=env,
+                                  _tail=50, _critical=True)
+                shprint(sh.Command('./compile-libvlc.sh'), _env=env,
+                            _tail=50, _critical=True)
         shprint(sh.cp, '-a', aar, self.ctx.aars_dir)
 
 recipe = VlcRecipe()
