diff options
author | Calum Lind <calumlind+deluge@gmail.com> | 2015-09-04 19:43:06 +0100 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2015-09-04 19:43:32 +0100 |
commit | caf35bcdf470c3c59fbde1d47126e06d74c3e10a (patch) | |
tree | de14e2f507205e8a4e22c4c6ff0fe44e4ccaad6b | |
parent | d898ba93333d1427ee3fe45c75aaba6dac4f123b (diff) | |
download | deluge-caf35bcdf470c3c59fbde1d47126e06d74c3e10a.tar.gz deluge-caf35bcdf470c3c59fbde1d47126e06d74c3e10a.tar.bz2 deluge-caf35bcdf470c3c59fbde1d47126e06d74c3e10a.zip |
[Packaging] Include WebUI debug files for dev versions
* Webui will try to use debug files if deluge version contains 'dev'.
* Include webui debug files in sdist.
* Use exclude_package_data to remove debug files in release versions.
-rw-r--r-- | MANIFEST.in | 6 | ||||
-rwxr-xr-x | setup.py | 62 |
2 files changed, 37 insertions, 31 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 7b9bb2dd7..ff277eb36 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -14,11 +14,9 @@ graft deluge/ui/gtkui/glade include deluge/ui/web/index.html include deluge/ui/web/css/*.css -exclude deluge/ui/web/css/*-debug.css -include deluge/ui/web/js/extjs/*.js -exclude deluge/ui/web/js/extjs/*-debug.js include deluge/ui/web/js/*.js -exclude deluge/ui/web/js/*-debug.js +graft deluge/ui/web/js/deluge-all +graft deluge/ui/web/js/extjs graft deluge/ui/web/themes graft deluge/ui/web/render graft deluge/ui/web/icons @@ -313,10 +313,42 @@ if windows_check(): 'deluge-web-debug = deluge.ui.web:start', 'deluged-debug = deluge.main:start_daemon']) +_package_data = {} +_package_data['deluge'] = [ + 'ui/data/pixmaps/*.png', + 'ui/data/pixmaps/*.svg', + 'ui/data/pixmaps/*.ico', + 'ui/data/pixmaps/*.gif', + 'ui/data/pixmaps/flags/*.png', + 'plugins/*.egg', + 'i18n/*/LC_MESSAGES/*.mo'] +_package_data['deluge.ui.web'] = [ + 'index.html', + 'css/*.css', + 'icons/*.png', + 'images/*.gif', + 'images/*.png', + 'js/*.js', + 'js/extjs/*.js', + 'render/*.html', + 'themes/css/*.css', + 'themes/images/*/*.gif', + 'themes/images/*/*.png', + 'themes/images/*/*/*.gif', + 'themes/images/*/*/*.png'] +_package_data['deluge.ui.gtkui'] = ['glade/*.ui'] + +_version = get_version(prefix='deluge-', suffix='.dev0') + +if 'dev' in _version: + _exclude_package_data = {} +else: + _exclude_package_data = {"deluge.ui.web": ["*-debug.js", '*-debug.css']} + # Main setup setup( name='deluge', - version=get_version(prefix='deluge-', suffix='.dev0'), + version=_version, fullname='Deluge Bittorrent Client', description='Bittorrent Client', author='Andrew Resch, Damien Churchill', @@ -331,32 +363,8 @@ setup( cmdclass=cmdclass, tests_require=['pytest'], data_files=_data_files, - package_data={'deluge': ['ui/gtkui/glade/*.ui', - 'ui/data/pixmaps/*.png', - 'ui/data/pixmaps/*.svg', - 'ui/data/pixmaps/*.ico', - 'ui/data/pixmaps/*.gif', - 'ui/data/pixmaps/flags/*.png', - 'plugins/*.egg', - 'i18n/*/LC_MESSAGES/*.mo', - 'ui/web/index.html', - 'ui/web/css/*.css', - 'ui/web/icons/*.png', - 'ui/web/images/*.gif', - 'ui/web/images/*.png', - 'ui/web/js/*.js', - 'ui/web/js/*/*.js', - 'ui/web/js/*/.order', - 'ui/web/js/*/*/*.js', - 'ui/web/js/*/*/.order', - 'ui/web/js/*/*/*/*.js', - 'ui/web/render/*.html', - 'ui/web/themes/css/*.css', - 'ui/web/themes/images/*/*.gif', - 'ui/web/themes/images/*/*.png', - 'ui/web/themes/images/*/*/*.gif', - 'ui/web/themes/images/*/*/*.png' - ]}, + package_data=_package_data, + exclude_package_data=_exclude_package_data, packages=find_packages(exclude=['plugins', 'docs', 'tests']), namespace_packages=['deluge', 'deluge.plugins'], entry_points=entry_points |