X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=setup.py;h=aa7cfca0862b1f4ba2cfd220fd570ca63bcfda7e;hb=2b35c9ef742bf261078ea10c6c0bba848db1a0df;hp=d90856b9d295d0e14778e88866c8e7323c3adda5;hpb=87bec4c7155d390c3f6e716c87616ce8cdf1450a;p=youtube-dl

diff --git a/setup.py b/setup.py
index d90856b9d..aa7cfca08 100644
--- a/setup.py
+++ b/setup.py
@@ -1,58 +1,92 @@
-from distutils.core import setup
-import sys
-try:
-    import py2exe
-except ImportError:
-    sys.stderr.write("Cannot import py2exe")
-import os
-import subprocess
-
-"""The p2exe option will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package.
-    python setup.py py2exe
-   You can also build a zip executable with
-    python setup.py bdist --format=zip
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
+from __future__ import print_function
 
-"""
+import pkg_resources
+import sys
 
-# If run without args, build executables
-if len(sys.argv) == 1:
-    sys.argv.append("py2exe")
+try:
+    from setuptools import setup
+    setuptools_available = True
+except ImportError:
+    from distutils.core import setup
+    setuptools_available = False
 
-# os.chdir(os.path.dirname(os.path.abspath(sys.argv[0]))) # conflict with wine-py2exe.sh
-#sys.path.append('./youtube_dl')
+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)
 
-options = {
+py2exe_options = {
     "bundle_files": 1,
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
-    "dll_excludes": ['w9xpopen.exe']
+    "dll_excludes": ['w9xpopen.exe'],
 }
 
-console = [{
-    "script":"./youtube_dl/__main__.py",
+py2exe_console = [{
+    "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
 
-init_file = open('./youtube_dl/__init__.py')
+py2exe_params = {
+    'console': py2exe_console,
+    'options': {"py2exe": py2exe_options},
+    'zipfile': None
+}
 
-try:
-    version = subprocess.checkoutput(["git", "describe", "--abbrev=0", "--tags"])
-except:
-    version = ''
-
-setup(name='youtube-dl',
-      version=version,
-      description='Small command-line program to download videos from YouTube.com and other video sites',
-      url='https://github.com/rg3/youtube-dl',
-      packages=['youtube_dl'],
-
-      console = console,
-      options = {"py2exe": options},
-      zipfile = None,
-)
+if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
+    params = py2exe_params
+else:
+    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'])
+        ]
+    }
+    if setuptools_available:
+        params['entry_points'] = {'console_scripts': ['youtube-dl = youtube_dl:main']}
+    else:
+        params['scripts'] = ['bin/youtube-dl']
 
-import shutil
-shutil.rmtree("build")
+# 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='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'],
+
+    # Provokes warning on most systems (why?!)
+    # test_suite = 'nose.collector',
+    # 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"
+    ],
+
+    **params
+)