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

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index c4937a51221649ce667dc738aa49217e1729f157..0069e79753205499cb104b73179d1acaf16eae8f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-all: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
-# 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 -f youtube-dl youtube-dl.exe youtube-dl.1 LATEST_VERSION
+       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,40 +17,31 @@ 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 README.md youtube-dl.bash-completion
-# TODO un-phony README.md and youtube-dl.bash_completion by reading from .in files and generating from them
+.PHONY: all clean install test
 
 youtube-dl: youtube_dl/*.py
-       zip --quiet youtube-dl __main__.py youtube_dl/*.py
+       zip --quiet youtube-dl youtube_dl/*.py
+       zip --quiet --junk-paths youtube-dl youtube_dl/__main__.py
        echo '#!/usr/bin/env python' > youtube-dl
        cat youtube-dl.zip >> youtube-dl
        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 -s -w man README.md -o youtube-dl.1
+       pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md
-       @options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
-               content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \
-               echo "$${content}" > youtube-dl.bash-completion
+youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.in
+       python devscripts/bash-completion.py
 
-LATEST_VERSION: youtube_dl/__init__.py
-       python -m youtube_dl --version > LATEST_VERSION
+youtube-dl.tar.gz: all
+       tar -cvzf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
+               --exclude-from=".tarignore" -- .