X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=setup.py;h=4686260e0bbd25adf39e683bdae1b475e267b0b8;hb=8940b8608e567dba09b3ea146b89b297190ec6d6;hp=ec63beddedd9bd5a0ec3d8bbfea4cce53dfa6c4c;hpb=caaa47d37215f498c033afb42972c135be8138d4;p=youtube-dl

diff --git a/setup.py b/setup.py
index ec63bedde..4686260e0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,65 +1,111 @@
-from distutils.core import setup, Command
-import sys
-try:
-    import py2exe
-except ImportError:
-    sys.stderr.write("Cannot import py2exe")
-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 -*-
 
-   The test suite can be run with
-    python setup.py test
+from __future__ import print_function
 
+import os.path
+import warnings
+import sys
 
-    The actual version is defined by the last git tag
-"""
-
-# 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:
-    #return the last tag name
-    version = subprocess.checkoutput(["git", "describe", "--abbrev=0", "--tags"])
-except:
-    version = ''
+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))
 
-setup(name='youtube-dl',
-      version=version,
-      long_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'],
-      #test suite
-      test_suite='nose.collector',
-      test_requires=['nosetest'],
-      console=console,
-      options={"py2exe": options},
-      scripts=['bin/youtube-dl'],
-      zipfile=None,
-)
+    params = {
+        'data_files': data_files,
+    }
+    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', 'youtube_dl.downloader',
+        'youtube_dl.postprocessor'],
+
+    # 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.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+    ],
+
+    **params
+)