From: Daira Hopwood <daira@jacaranda.org>
Date: Sat, 29 Mar 2014 00:41:33 +0000 (+0000)
Subject: setup.py: include data files in package_data= with paths relative to src/allmydata... 
X-Git-Tag: allmydata-tahoe-1.10.1a1~193^2
X-Git-Url: https://git.rkrishnan.org/architecture.txt?a=commitdiff_plain;h=refs%2Fpull%2F87%2Fhead;p=tahoe-lafs%2Ftahoe-lafs.git

setup.py: include data files in package_data= with paths relative to src/allmydata/web.
Remove packages= entries and unneeded __init__.py files for those subdirectories.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/setup.py b/setup.py
index fe52383b..9a3321f9 100644
--- a/setup.py
+++ b/setup.py
@@ -443,18 +443,17 @@ setup(name=APPNAME,
                 'allmydata.test',
                 'allmydata.util',
                 'allmydata.web',
-                'allmydata.web.static',
-                'allmydata.web.static.css',
                 'allmydata.windows',
                 'buildtest'],
       classifiers=trove_classifiers,
       test_suite="allmydata.test",
       install_requires=install_requires,
       tests_require=tests_require,
-      package_data={"allmydata.web": ["*.xhtml"],
-                    "allmydata.web.static": ["*.js", "*.png", "*.css"],
-                    "allmydata.web.static.css": ["*.css"],
-                    "allmydata.web.static.img": ["*.png"],
+      package_data={"allmydata.web": ["*.xhtml",
+                                      "static/*.js", "static/*.png", "static/*.css",
+                                      "static/img/*.png",
+                                      "static/css/*.css",
+                                      ]
                     },
       setup_requires=setup_requires,
       entry_points = { 'console_scripts': [ 'tahoe = allmydata.scripts.runner:run' ] },
diff --git a/src/allmydata/web/static/__init__.py b/src/allmydata/web/static/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/allmydata/web/static/css/__init__.py b/src/allmydata/web/static/css/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/allmydata/web/static/img/__init__.py b/src/allmydata/web/static/img/__init__.py
deleted file mode 100644
index e69de29b..00000000