Added data_files to package_data instead

inclement · inclement · commit 8a1209208d2e · 2015-10-04T14:33:33.000+01:00
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 
 from setuptools import setup, find_packages
 from os import walk
-from os.path import join, dirname
+from os.path import join, dirname, sep
 import os
 import glob
 
@@ -20,16 +20,18 @@ def recursively_include(results, directory, patterns):
             if not any([glob.fnmatch.fnmatch(fn, pattern) for pattern in patterns]):
                 continue
             filename = join(root, fn)
-            directory = root
+            directory = 'pythonforandroid'
             if directory not in results:
                 results[directory] = []
-            results[directory].append(filename)
+            results[directory].append(join(*filename.split(sep)[1:]))
 
-data_files = {}
-recursively_include(data_files, 'pythonforandroid/recipes', ['*.patch', ])
-recursively_include(data_files, 'pythonforandroid/bootstraps',
+recursively_include(package_data, 'pythonforandroid/recipes', ['*.patch', ])
+recursively_include(package_data, 'pythonforandroid/bootstraps',
                     ['*.properties', '*.xml', '*.java', '*.tmpl', '*.txt', '*.png'])
 
+# package_data.update(data_files)
+print('package_data is', package_data)
+
 
 setup(name='python-for-android',
       version='0.2',
@@ -64,5 +66,4 @@ def recursively_include(results, directory, patterns):
           ],
       packages=packages,
       package_data=package_data,
-      data_files=data_files.items(),
       )
