From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Sep 2012 17:41:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'FiloSottille/automation'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=85f76ac90ba36bdf408a6dc6d54c613de136e0bb

Merge remote-tracking branch 'FiloSottille/automation'
---

85f76ac90ba36bdf408a6dc6d54c613de136e0bb
diff --cc Makefile
index e2da02e96,21b346905..625948211
--- a/Makefile
+++ b/Makefile
@@@ -1,26 -1,41 +1,48 @@@
- default: update
 -all: youtube-dl youtube-dl.exe README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
++all: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
 +
- update: compile update-readme update-latest
++# TODO: re-add youtube-dl.exe, and make sure it's 1. safe and 2. doesn't need sudo
 +
- update-latest:
- 	./youtube-dl.dev --version > LATEST_VERSION
++clean:
++	rm -f youtube-dl youtube-dl.exe youtube-dl.1 LATEST_VERSION
  
- update-readme:
- 	@options=$$(COLUMNS=80 ./youtube-dl.dev --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/### \1/') && \
- 		header=$$(sed -e '/.*## OPTIONS/,$$ d' README.md) && \
- 		footer=$$(sed -e '1,/.*## FAQ/ d' README.md) && \
+ PREFIX=/usr/local
+ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
+ 	install -m 755 --owner root --group root youtube-dl $(PREFIX)/bin/
+ 	install -m 644 --owner root --group root youtube-dl.1 $(PREFIX)/man/man1
+ 	install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl
+ 
 -.PHONY: all install
++.PHONY: all clean install README.md youtube-dl.bash-completion
++# TODO un-phone README.md and youtube-dl.bash_completion by reading from .in files and generating from them
+ 
+ youtube-dl: youtube_dl/*.py
+ 	zip --quiet --junk-paths youtube-dl youtube_dl/*.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
+ 	@options=$$(COLUMNS=80 ./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,/.*# FAQ/ d' README.md) && \
  		echo "$${header}" > README.md && \
  		echo >> README.md && \
- 		echo '## OPTIONS' >> README.md && \
+ 		echo '# OPTIONS' >> README.md && \
  		echo "$${options}" >> README.md&& \
  		echo >> README.md && \
- 		echo '## FAQ' >> README.md && \
+ 		echo '# FAQ' >> README.md && \
  		echo "$${footer}" >> README.md
  
- compile:
- 	zip --quiet --junk-paths youtube-dl youtube_dl/*.py
- 	echo '#!/usr/bin/env python' > youtube-dl
- 	cat youtube-dl.zip >> youtube-dl
- 	rm youtube-dl.zip
+ youtube-dl.1: README.md
+ 	pandoc -s -w 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
  
- .PHONY: default compile update update-latest update-readme
+ LATEST_VERSION: youtube-dl
+ 	./youtube-dl --version > LATEST_VERSION
diff --cc youtube-dl
index 21e604a25,82d465c46..9c78766ff
Binary files differ
diff --cc youtube-dl.exe
index fbed2841a,b3016aeb6..000000000
deleted file mode 100755,100755
Binary files differ