Merge tag 'upstream/2014.06.07'

[youtubedl] / Makefile

diff --git a/Makefile b/Makefile
index c97d6ffb005d9561dc2fede6f613d026d9c0924e..c079761efa9b2e60887575f4cd7626d0abe469a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,26 @@
 all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion
 
 clean:
 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.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz
+
+cleanall: clean
+       rm -f youtube-dl youtube-dl.exe

 
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
 MANDIR=$(PREFIX)/man
 
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
 MANDIR=$(PREFIX)/man

-SYSCONFDIR=/etc
+PYTHON=/usr/bin/env python
+
+# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
+ifeq ($(PREFIX),/usr)
+       SYSCONFDIR=/etc
+else
+       ifeq ($(PREFIX),/usr/local)
+               SYSCONFDIR=/etc
+       else
+               SYSCONFDIR=$(PREFIX)/etc
+       endif
+endif

 
 install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
        install -d $(DESTDIR)$(BINDIR)
 
 install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
        install -d $(DESTDIR)$(BINDIR)


@@ -17,32 +31,52 @@ 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:
        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
+
+tar: youtube-dl.tar.gz

 
 

-.PHONY: all clean install test
+.PHONY: all clean install test tar bash-completion pypi-files

 
 

-youtube-dl: youtube_dl/*.py
-       zip --quiet youtube-dl youtube_dl/*.py
+pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1
+
+youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
+       zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py

        zip --quiet --junk-paths youtube-dl youtube_dl/__main__.py
        zip --quiet --junk-paths youtube-dl youtube_dl/__main__.py

-       echo '#!/usr/bin/env python' > youtube-dl
+       echo '#!$(PYTHON)' > youtube-dl

        cat youtube-dl.zip >> youtube-dl
        rm youtube-dl.zip
        chmod a+x youtube-dl
 
        cat youtube-dl.zip >> youtube-dl
        rm youtube-dl.zip
        chmod a+x youtube-dl
 

-README.md: youtube_dl/*.py
+README.md: youtube_dl/*.py youtube_dl/*/*.py

        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
        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 -f markdown -t man README.md -o youtube-dl.1
+       python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
+       pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
+       rm -f youtube-dl.1.temp.md

 
 

-youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.template
+youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in

        python devscripts/bash-completion.py
 
        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/" .
+bash-completion: youtube-dl.bash-completion
+
+youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion
+       @tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \
+               --exclude '*.DS_Store' \
+               --exclude '*.kate-swp' \
+               --exclude '*.pyc' \
+               --exclude '*.pyo' \
+               --exclude '*~' \
+               --exclude '__pycache' \
+               --exclude '.git' \
+               --exclude 'testdata' \
+               --exclude 'docs/_build' \
+               -- \
+               bin devscripts test youtube_dl docs \
+               LICENSE README.md README.txt \
+               Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion setup.py \
+               youtube-dl