Tidy up cleanup rule and keep lintian happy.

[youtubedl] / setup.py

diff --git a/setup.py b/setup.py
index 1f45159cd3e641f2257abf6d8781ce9f31bbda11..508b27f3707898d07d303cd1ce44b7e4d54b152f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,15 +3,17 @@
 
 from __future__ import print_function
 
 
 from __future__ import print_function
 

-import pkg_resources
+import os.path
+import warnings

 import sys
 
 try:
 import sys
 
 try:

-    from setuptools import setup
+    from setuptools import setup, Command

     setuptools_available = True
 except ImportError:
     setuptools_available = True
 except ImportError:

-    from distutils.core import setup
+    from distutils.core import setup, Command

     setuptools_available = False
     setuptools_available = False

+from distutils.spawn import spawn

 
 try:
     # This will create an exe that needs Microsoft Visual C++ 2008
 
 try:
     # This will create an exe that needs Microsoft Visual C++ 2008


@@ -19,53 +21,89 @@ try:
     import py2exe
 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
     import py2exe
 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':

-        print("Cannot import py2exe", file=sys.stderr)
+        print('Cannot import py2exe', file=sys.stderr)

         exit(1)
 
 py2exe_options = {
         exit(1)
 
 py2exe_options = {

-    "bundle_files": 1,
-    "compressed": 1,
-    "optimize": 2,
-    "dist_dir": '.',
-    "dll_excludes": ['w9xpopen.exe'],
+    'bundle_files': 1,
+    'compressed': 1,
+    'optimize': 2,
+    'dist_dir': '.',
+    'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],

 }
 
 }
 

+# Get the version from youtube_dl/version.py without importing the package
+exec(compile(open('youtube_dl/version.py').read(),
+             'youtube_dl/version.py', 'exec'))
+
+DESCRIPTION = 'YouTube video downloader'
+LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites'
+

 py2exe_console = [{
 py2exe_console = [{

-    "script": "./youtube_dl/__main__.py",
-    "dest_base": "youtube-dl",
+    'script': './youtube_dl/__main__.py',
+    'dest_base': 'youtube-dl',
+    'version': __version__,
+    'description': DESCRIPTION,
+    'comments': LONG_DESCRIPTION,
+    'product_name': 'youtube-dl',
+    'product_version': __version__,

 }]
 
 py2exe_params = {
     'console': py2exe_console,
 }]
 
 py2exe_params = {
     'console': py2exe_console,

-    'options': {"py2exe": py2exe_options},
+    'options': {'py2exe': py2exe_options},

     'zipfile': None
 }
 
 if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
     params = py2exe_params
 else:
     'zipfile': None
 }
 
 if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
     params = py2exe_params
 else:

+    files_spec = [
+        ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
+        ('etc/fish/completions', ['youtube-dl.fish']),
+        ('share/doc/youtube_dl', ['README.txt']),
+        ('share/man/man1', ['youtube-dl.1'])
+    ]
+    root = os.path.dirname(os.path.abspath(__file__))
+    data_files = []
+    for dirname, files in files_spec:
+        resfiles = []
+        for fn in files:
+            if not os.path.exists(fn):
+                warnings.warn('Skipping file %s since it is not present. Type  make  to build all automatically generated files.' % fn)
+            else:
+                resfiles.append(fn)
+        data_files.append((dirname, resfiles))
+

     params = {
     params = {

-        'data_files': [  # Installing system-wide would require sudo...
-            ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
-            ('share/doc/youtube_dl', ['README.txt']),
-            ('share/man/man1', ['youtube-dl.1'])
-        ]
+        'data_files': data_files,

     }
     if setuptools_available:
         params['entry_points'] = {'console_scripts': ['youtube-dl = youtube_dl:main']}
     else:
         params['scripts'] = ['bin/youtube-dl']
 
     }
     if setuptools_available:
         params['entry_points'] = {'console_scripts': ['youtube-dl = youtube_dl:main']}
     else:
         params['scripts'] = ['bin/youtube-dl']
 

-# Get the version from youtube_dl/version.py without importing the package
-exec(compile(open('youtube_dl/version.py').read(),
-             'youtube_dl/version.py', 'exec'))
+class build_lazy_extractors(Command):
+    description = 'Build the extractor lazy loading module'
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        spawn(
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dl/extractor/lazy_extractors.py'],
+            dry_run=self.dry_run,
+        )

 
 setup(
     name='youtube_dl',
     version=__version__,
 
 setup(
     name='youtube_dl',
     version=__version__,

-    description='YouTube video downloader',
-    long_description='Small command-line program to download videos from'
-    ' YouTube.com and other video sites.',
+    description=DESCRIPTION,
+    long_description=LONG_DESCRIPTION,

     url='https://github.com/rg3/youtube-dl',
     author='Ricardo Garcia',
     author_email='ytdl@yt-dl.org',
     url='https://github.com/rg3/youtube-dl',
     author='Ricardo Garcia',
     author_email='ytdl@yt-dl.org',


@@ -81,15 +119,19 @@ setup(
     # test_requires = ['nosetest'],
 
     classifiers=[
     # test_requires = ['nosetest'],
 
     classifiers=[

-        "Topic :: Multimedia :: Video",
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Console",
-        "License :: Public Domain",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3"
+        'Topic :: Multimedia :: Video',
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'License :: Public Domain',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',

     ],
 
     ],
 

+    cmdclass={'build_lazy_extractors': build_lazy_extractors},

     **params
 )
     **params
 )