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

diff --git a/setup.py b/setup.py
index 45ccf432e..42cbaf858 100644
--- a/setup.py
+++ b/setup.py
@@ -2,16 +2,30 @@
 # -*- 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:
+    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 = [{
@@ -19,22 +33,27 @@ py2exe_console = [{
     "dest_base": "youtube-dl",
 }]
 
-try:
-    import py2exe
-    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
-    py2exe_params = {
-        'console': py2exe_console,
-        'options': { "py2exe": py2exe_options },
-        'zipfile': None
+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'])
+        ]
     }
-except ImportError:
-    if 'py2exe' in sys.argv:
-        print("Cannot import py2exe", file=sys.stderr)
-        exit(1)
-    py2exe_params = {}
 
 # 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(
     name = 'youtube_dl',
@@ -45,17 +64,12 @@ setup(
     author = 'Ricardo Garcia',
     maintainer = 'Philipp Hagemeister',
     maintainer_email = 'phihag@phihag.de',
-    packages = ['youtube_dl'],
+    packages = ['youtube_dl', 'youtube_dl.extractor'],
 
     # Provokes warning on most systems (why?!)
     #test_suite = 'nose.collector',
     #test_requires = ['nosetest'],
 
-    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']) ],
-
     classifiers = [
         "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",
@@ -67,5 +81,5 @@ setup(
         "Programming Language :: Python :: 3.3"
     ],
 
-    **py2exe_params
+    **params
 )