Merge tag 'upstream/2015.02.28'

[youtubedl] / setup.py

diff --git a/setup.py b/setup.py
index 61435fcb7c36f4f60cba2b7cf82002a6a36ace54..4686260e0bbd25adf39e683bdae1b475e267b0b8 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,17 +3,21 @@
 
 from __future__ import print_function
 
 
 from __future__ import print_function
 

-import pkg_resources
+import os.path
+import warnings

 import sys
 
 try:
     from setuptools import setup
 import sys
 
 try:
     from setuptools import setup

+    setuptools_available = True

 except ImportError:
     from distutils.core import setup
 except ImportError:
     from distutils.core import setup

+    setuptools_available = False

 
 try:
 
 try:

+    # This will create an exe that needs Microsoft Visual C++ 2008
+    # Redistributable Package

     import py2exe
     import py2exe

-    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""

 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
         print("Cannot import py2exe", file=sys.stderr)
 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
         print("Cannot import py2exe", file=sys.stderr)


@@ -26,45 +30,71 @@ py2exe_options = {
     "dist_dir": '.',
     "dll_excludes": ['w9xpopen.exe'],
 }
     "dist_dir": '.',
     "dll_excludes": ['w9xpopen.exe'],
 }

+

 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]

+

 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 = {

-        'scripts': ['bin/youtube-dl'],
-        'data_files': [('etc/bash_completion.d', ['youtube-dl.bash-completion']), # Installing system-wide would require sudo...
-                       ('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']

 
 # Get the version from youtube_dl/version.py without importing the package
 
 # 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'))
+exec(compile(open('youtube_dl/version.py').read(),
+             'youtube_dl/version.py', 'exec'))

 
 setup(
 
 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.',
-    url = 'https://github.com/rg3/youtube-dl',
-    author = 'Ricardo Garcia',
-    maintainer = 'Philipp Hagemeister',
-    maintainer_email = 'phihag@phihag.de',
-    packages = ['youtube_dl', 'youtube_dl.extractor'],
+    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.',
+    url='https://github.com/rg3/youtube-dl',
+    author='Ricardo Garcia',
+    author_email='ytdl@yt-dl.org',
+    maintainer='Philipp Hagemeister',
+    maintainer_email='phihag@phihag.de',
+    packages=[
+        'youtube_dl',
+        'youtube_dl.extractor', 'youtube_dl.downloader',
+        'youtube_dl.postprocessor'],

 
     # Provokes warning on most systems (why?!)
 
     # Provokes warning on most systems (why?!)

-    #test_suite = 'nose.collector',
-    #test_requires = ['nosetest'],
+    # test_suite = 'nose.collector',
+    # test_requires = ['nosetest'],

 
 

-    classifiers = [
+    classifiers=[

         "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",


@@ -72,7 +102,9 @@ setup(
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",

-        "Programming Language :: Python :: 3.3"
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",

     ],
 
     **params
     ],
 
     **params