diff --git a/setup.py b/setup.py index 2e18afc3f8cf1af5f630e3e455a7e01c0aeabc5a..ec69fad16727b20c7b0856e4b815553e6097f4b6 100755 --- a/setup.py +++ b/setup.py @@ -89,38 +89,37 @@ class Options: args.remove('--no-xdg') sys.argv = args -scripts = os.listdir('scripts') -packages = find_packages() - -if sys.argv[1] in ('bdist', 'sdist'): - hildon_scripts = ('masstransit',) - qt_scripts = ('qboobmsg', 'qhavesex', 'qvideoob', 'weboob-config-qt') - - if not options.hildon: - scripts = set(scripts) - set(hildon_scripts) - if options.qt: - build_qt() - else: - scripts = set(scripts) - set(qt_scripts) - - hildon_packages = ( - 'weboob.applications.masstransit', - ) - qt_packages = ( - 'weboob.applications.qboobmsg', - 'weboob.applications.qboobmsg.ui', - 'weboob.applications.qhavesex', - 'weboob.applications.qhavesex.ui', - 'weboob.applications.qvideoob', - 'weboob.applications.qvideoob.ui', - 'weboob.applications.qweboobcfg', - 'weboob.applications.qweboobcfg.ui', - ) - - if not options.hildon: - packages = set(packages) - set(hildon_packages) - if not options.qt: - packages = set(packages) - set(qt_packages) +scripts = set(os.listdir('scripts')) +packages = set(find_packages()) + +hildon_scripts = set('masstransit',) +qt_scripts = set('qboobmsg', 'qhavesex', 'qvideoob', 'weboob-config-qt') + +if not options.hildon: + scripts = scripts - hildon_scripts +if options.qt: + build_qt() +else: + scripts = scripts - qt_scripts + +hildon_packages = ( + 'weboob.applications.masstransit', + ) +qt_packages = ( + 'weboob.applications.qboobmsg', + 'weboob.applications.qboobmsg.ui', + 'weboob.applications.qhavesex', + 'weboob.applications.qhavesex.ui', + 'weboob.applications.qvideoob', + 'weboob.applications.qvideoob.ui', + 'weboob.applications.qweboobcfg', + 'weboob.applications.qweboobcfg.ui', + ) + +if not options.hildon: + packages = packages - hildon_packages +if not options.qt: + packages = packages - qt_packages setup( name='weboob', @@ -135,7 +134,6 @@ class Options: packages=packages, scripts=[os.path.join('scripts', script) for script in scripts], - # see also MANIFEST.in data_files=[ ('share/applications', glob.glob('desktop/*')), ('share/icons/hicolor/64x64/apps', glob.glob('icons/*')),