optional support for symlinking bootstrap stuff

zworkb · zworkb · commit e7cb9c0bf596 · 2020-03-25T21:52:56.000+01:00
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -14,7 +14,7 @@
 from pythonforandroid.recipe import Recipe
 
 
-def copy_files(src_root, dest_root, override=True):
+def copy_files(src_root, dest_root, override=True, symlink=False):
     for root, dirnames, filenames in walk(src_root):
         for filename in filenames:
             subdir = normpath(root.replace(src_root, ""))
@@ -29,7 +29,10 @@ def copy_files(src_root, dest_root, override=True):
                 if override and os.path.exists(dest_file):
                     os.unlink(dest_file)
                 if not os.path.exists(dest_file):
-                    shutil.copy(src_file, dest_file)
+                    if symlink:
+                        os.symlink(src_file, dest_file)
+                    else:
+                        shutil.copy(src_file, dest_file)
             else:
                 os.makedirs(dest_file)
 
@@ -152,16 +155,8 @@ def prepare_build_dir(self):
         ]
         # now do a cumulative copy of all bootstrap dirs
         for bootstrap_dir in bootstrap_dirs:
-            copy_files(join(bootstrap_dir, 'build'), self.build_dir)
-
-        if self.ctx.symlink_java_src:
-            # XXX: has also to be generalized as for the copy stuff above
-            info('Symlinking java src instead of copying')
-            shprint(sh.rm, '-r', join(self.build_dir, 'src'))
-            shprint(sh.mkdir, join(self.build_dir, 'src'))
-            for dirn in listdir(join(self.bootstrap_dir, 'build', 'src')):
-                shprint(sh.ln, '-s', join(self.bootstrap_dir, 'build', 'src', dirn),
-                        join(self.build_dir, 'src'))
+            copy_files(join(bootstrap_dir, 'build'), self.build_dir, symlink=self.ctx.symlink_java_src)
+
         with current_directory(self.build_dir):
             with open('project.properties', 'w') as fileh:
                 fileh.write('target=android-{}'.format(self.ctx.android_api))
diff --git a/pythonforandroid/bootstraps/common/build/whitelist.txt b/pythonforandroid/bootstraps/common/build/whitelist.txt
@@ -1 +0,0 @@
-# put files here that you need to un-blacklist

Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-# put files here that you need to un-blacklist`