rollback tests multiprocess, Travis and OSX don't support it

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index e126a9fa1db1e2eb06200bea0755425d5014a866..426acd35776425acd62935094aaf8dc53c9793cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion 
+all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion
 
 clean:
        rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/
@@ -17,7 +17,8 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
        install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
 
 test:
-       nosetests2 --nocapture test
+       #nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
+       nosetests --verbose test
 
 .PHONY: all clean install test
 
@@ -30,24 +31,19 @@ youtube-dl: youtube_dl/*.py
        chmod a+x youtube-dl
 
 README.md: youtube_dl/*.py
-       @options=$$(COLUMNS=80 python -m youtube_dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \
-               header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \
-               footer=$$(sed -e '1,/.*# CONFIGURATION/ d' README.md) && \
-               echo "$${header}" > README.md && \
-               echo >> README.md && \
-               echo '# OPTIONS' >> README.md && \
-               echo "$${options}" >> README.md&& \
-               echo >> README.md && \
-               echo '# CONFIGURATION' >> README.md && \
-               echo "$${footer}" >> README.md
+       COLUMNS=80 python -m youtube_dl --help | python devscripts/make_readme.py
 
 README.txt: README.md
-       pandoc -s -f markdown -t plain README.md -o README.txt
+       pandoc -f markdown -t plain README.md -o README.txt
 
 youtube-dl.1: README.md
        pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md youtube-dl.bash-completion.in
-       @options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
-               content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion.in` && \
-               echo "$${content}" > youtube-dl.bash-completion
+youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.template
+       python devscripts/bash-completion.py
+
+youtube-dl.tar.gz: all
+       tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
+               --exclude="*.pyc" --exclude="*.pyo" --exclude="*~" --exclude="youtube-dl.exe" \
+               --exclude="wine-py2exe/" --exclude="py2exe.log" --exclude="*.kate-swp" \
+               --exclude="build/" --exclude="dist/" --exclude="MANIFEST" --exclude=".git/" .