toolchain: update submodules fixes and copytree except of symlinking

thopiekar · thopiekar · commit 5074f2927d98 · 2015-09-06T21:44:22.000+02:00
* now updates the submodules better
* uses shutil.copytree to copy the git repo to the build dir
* always looks for updates on git
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -1390,8 +1390,10 @@ def report_hook(index, blksize, size):
             return target
         elif parsed_url.scheme in ('git',):
             if os.path.isdir(target):
-                with current_directory(self.get_build_dir(arch.arch)):
-                    shprint(sh.git, 'pull', '--all')
+                with current_directory(target):
+                    shprint(sh.git, 'pull')
+                    shprint(sh.git, 'pull', '--recurse-submodules')
+                    shprint(sh.git, 'submodule', 'update', '--recursive')
             else:
                 shprint(sh.git, 'clone', '--recursive', url, target)
             return target
@@ -1588,7 +1590,7 @@ def download(self):
             do_download = True
 
             marker_filename = '.mark-{}'.format(filename)
-            if exists(filename):
+            if exists(filename) and os.path.isfile(filename):
                 if not exists(marker_filename):
                     shprint(sh.rm, filename)
                 elif self.md5sum:
@@ -1680,7 +1682,7 @@ def unpack(self, arch):
                         raise Exception('Could not extract {} download, it must be .zip, '
                                         '.tar.gz or .tar.bz2')
                 elif os.path.isdir(extraction_filename):
-                    os.symlink(extraction_filename, directory_name)
+                    shutil.copytree(extraction_filename, directory_name)
                 else:
                     raise Exception('Given path is neither a file nor a directory: {}'.format(extraction_filename))
 
