justin.tv tweaks

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index 5073a211ba818971e194dd418c9034a6def3445f..b629304e52fa609d120262f605360affbeafbc5c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 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/
+       rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/
 
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
@@ -17,9 +17,12 @@ 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
+tar: youtube-dl.tar.gz
+
+.PHONY: all clean install test tar
 
 youtube-dl: youtube_dl/*.py
        zip --quiet youtube-dl youtube_dl/*.py
@@ -42,7 +45,22 @@ youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.in
        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/" .
+       @tar -czf youtube-dl.tar.gz --transform "s|^./|./youtube-dl/|" --owner 0 --group 0 \
+               --exclude-vcs \
+               --exclude '*.DS_Store' \
+               --exclude '*.kate-swp' \
+               --exclude '*.pyc' \
+               --exclude '*.pyo' \
+               --exclude '*~' \
+               --exclude '__pycache' \
+               --exclude 'build' \
+               --exclude 'cover' \
+               --exclude '.coverage' \
+               --exclude 'dist' \
+               --exclude 'MANIFEST' \
+               --exclude 'py2exe.log' \
+               --exclude 'updates_key.pem' \
+               --exclude 'wine-py2exe' \
+               --exclude 'youtube-dl.exe' \
+               --exclude 'youtube-dl.tar.gz' \
+               -- .