Merge branch 'master' of github.com:rg3/youtube-dl

diff --git a/devscripts/release.sh b/devscripts/release.sh
index 735e13a904b69e948820fd560549be1ccd16b435..015372d5e0077ac8ab6d7e50067e67b59f58af99 100755 (executable)
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -15,8 +15,9 @@
 set -e
 
 skip_test=false
-if [ "$2" == '--skip-test' ]; then
+if [ "$1" = '--skip-test' ]; then
     skip_test=true
+    shift
 fi
 if [ -z "$1" ]; then echo "ERROR: specify version number like this: $0 1994.09.06"; exit 1; fi
 version="$1"

diff --git a/setup.py b/setup.py
index 55fc1c839d38db3248d28fb97186ad21c785a880..1d2e71e15fb24d6ae5a79d8cee2ebfcbfad6c3fb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
+
+from glob import glob
 import pkg_resources
 import sys
 
@@ -23,7 +25,9 @@ py2exe_options = {
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
-    "dll_excludes": ['w9xpopen.exe']
+    "dll_excludes": ['w9xpopen.exe'],
+    "includes": [m.replace('\\', '.').replace('/', '.')[:-3]
+                 for m in glob('youtube_dl/*/*.py')]
 }
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",

diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index dae25675764cbfff4c95fd6e0ce722234e507ae9..989ff10f10e158053d974c7dd31faeb2a1275c60 100644 (file)
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
 
-__version__ = '2013.06.23'
+__version__ = '2013.06.24'