justin.tv tweaks

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index 470717a927cb55193d4602395ffbaa10df68274a..b629304e52fa609d120262f605360affbeafbc5c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion 
-# TODO: re-add youtube-dl.exe, and make sure it's 1. safe and 2. doesn't need sudo
+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
@@ -18,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
@@ -30,28 +32,35 @@ youtube-dl: youtube_dl/*.py
        rm youtube-dl.zip
        chmod a+x youtube-dl
 
-youtube-dl.exe: youtube_dl/*.py
-       bash devscripts/wine-py2exe.sh build_exe.py
-
 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 -f markdown -t plain README.md -o README.txt
 
 youtube-dl.1: README.md
-       pandoc -f markdown -t man README.md -o youtube-dl.1
+       pandoc -s -f markdown -t man README.md -o youtube-dl.1
+
+youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.in
+       python devscripts/bash-completion.py
 
-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.tar.gz: all
+       @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' \
+               -- .