X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=setup.py;h=42cbaf8588381f1f2a6fb9c42c523541e884f4da;hb=d055fe4cb09dc18a368f40f73e77081e7b0127bf;hp=ba051f7deb0216d5c7aaa36091a5d10d9037b38c;hpb=2f1765c4eaeeee58c1711aaf5757c1fb731c7f9b;p=youtube-dl

diff --git a/setup.py b/setup.py
index ba051f7de..42cbaf858 100644
--- a/setup.py
+++ b/setup.py
@@ -2,48 +2,73 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
-from distutils.core import setup
+
 import pkg_resources
 import sys
 
 try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+try:
+    # This will create an exe that needs Microsoft Visual C++ 2008
+    # Redistributable Package
     import py2exe
 except ImportError:
-    print("Cannot import py2exe", file=sys.stderr)
+    if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
+        print("Cannot import py2exe", file=sys.stderr)
+        exit(1)
 
 py2exe_options = {
     "bundle_files": 1,
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
-    "dll_excludes": ['w9xpopen.exe']
+    "dll_excludes": ['w9xpopen.exe'],
 }
 
 py2exe_console = [{
-    "script":"./youtube_dl/__main__.py",
+    "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
 
-exec(compile(open('youtube_dl/version.py').read(), 'youtube_dl/version.py', 'exec'))
+py2exe_params = {
+    'console': py2exe_console,
+    'options': {"py2exe": py2exe_options},
+    'zipfile': None
+}
+
+if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
+    params = py2exe_params
+else:
+    params = {
+        'scripts': ['bin/youtube-dl'],
+        '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'])
+        ]
+    }
+
+# 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'))
 
 setup(
     name = 'youtube_dl',
     version = __version__,
-    description = 'Small command-line program to download videos from YouTube.com and other video sites',
+    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'],
-
-    test_suite = 'nose.collector',
-    test_requires = ['nosetest'],
+    packages = ['youtube_dl', 'youtube_dl.extractor'],
 
-    console = py2exe_console,
-    options = { "py2exe": py2exe_options },
-
-    scripts = ['bin/youtube-dl'],
-    zipfile = None,
+    # Provokes warning on most systems (why?!)
+    #test_suite = 'nose.collector',
+    #test_requires = ['nosetest'],
 
     classifiers = [
         "Topic :: Multimedia :: Video",
@@ -54,5 +79,7 @@ setup(
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3"
-    ]
+    ],
+
+    **params
 )