From ef0c08cdfe05295f7dc5b164f187e2359970cde1 Mon Sep 17 00:00:00 2001 From: joehillen Date: Sun, 22 Jul 2012 13:36:22 -0700 Subject: Added install target to Makefile. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e2da02e..0de669c 100644 --- a/Makefile +++ b/Makefile @@ -23,4 +23,7 @@ compile: cat youtube-dl.zip >> youtube-dl rm youtube-dl.zip -.PHONY: default compile update update-latest update-readme +install: youtube-dl + install -m 755 --owner root --group root youtube-dl /usr/local/bin/ + +.PHONY: default compile update update-latest update-readme install -- cgit v1.1 From cfcec693315c7f463c9364fd8b9d96f6e090f439 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 1 Aug 2012 11:53:17 +0200 Subject: auto-generating manpage from README.md (closes #151); redesigned Makefile --- Makefile | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0de669c..c31850a 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,34 @@ -default: update - -update: compile update-readme update-latest +all: compile exe readme man-page update-latest update-latest: - ./youtube-dl.dev --version > LATEST_VERSION + ./youtube-dl --version > 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) && \ +readme: + @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 +man-page: + pandoc -s -w man README.md -o youtube-dl.1 + 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 -install: youtube-dl +exe: + bash devscripts/wine-py2exe.sh build_exe.py + +install: install -m 755 --owner root --group root youtube-dl /usr/local/bin/ + install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 -.PHONY: default compile update update-latest update-readme install +.PHONY: all update-latest readme man-page compile exe install \ No newline at end of file -- cgit v1.1 From ce7b2a40d04de1eadd5b81910ad374fee8db268d Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 1 Aug 2012 17:26:50 +0200 Subject: added automatically generated bash-completion; closes #191 --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c31850a..da9103c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: compile exe readme man-page update-latest +all: compile exe readme man-page bash-completion update-latest update-latest: ./youtube-dl --version > LATEST_VERSION @@ -18,6 +18,11 @@ readme: man-page: pandoc -s -w man README.md -o youtube-dl.1 +bash-completion: + @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 + compile: zip --quiet --junk-paths youtube-dl youtube_dl/*.py echo '#!/usr/bin/env python' > youtube-dl @@ -30,5 +35,6 @@ exe: install: install -m 755 --owner root --group root youtube-dl /usr/local/bin/ install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 + install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl -.PHONY: all update-latest readme man-page compile exe install \ No newline at end of file +.PHONY: all update-latest readme man-page bash-completion compile exe install \ No newline at end of file -- cgit v1.1 From 7a7c093ab011ea94de52d90500cb90c7a39ea0a2 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 1 Aug 2012 18:40:27 +0200 Subject: added one-step realese script 'make release version=nn' - closes #158 --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index da9103c..ea1efe0 100644 --- a/Makefile +++ b/Makefile @@ -37,4 +37,14 @@ install: install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl -.PHONY: all update-latest readme man-page bash-completion compile exe install \ No newline at end of file +release: + @if [ -z "$$version" ]; then echo 'ERROR: specify version number like this: make release version=1994.09.06'; exit 1; fi + @if [ ! -z "`git tag | grep "$$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi + @if [ ! -z "`git status --porcelain`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi + @sed -i "s/__version__ = '.*'/__version__ = '$$version'/" youtube_dl/__init__.py + make all + git add -A + git commit -m "release $$version" + git tag -m "Release $$version" "$$version" + +.PHONY: all update-latest readme man-page bash-completion compile exe install release -- cgit v1.1 From dce1088450becaa95e7fcaea2c70e8965b142a69 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Fri, 3 Aug 2012 20:10:54 +0200 Subject: A more "make-esque" Makefile with file targets and dependencies --- Makefile | 62 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ea1efe0..26c85b5 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,32 @@ -all: compile exe readme man-page bash-completion update-latest +all: youtube-dl youtube-dl.exe README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION -update-latest: - ./youtube-dl --version > LATEST_VERSION +install: youtube-dl youtube-dl.1 youtube-dl.bash-completion + install -m 755 --owner root --group root youtube-dl /usr/local/bin/ + install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 + install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl + +release: + @if [ -z "$$version" ]; then echo 'ERROR: specify version number like this: make release version=1994.09.06'; exit 1; fi + @if [ ! -z "`git tag | grep "$$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi + @if [ ! -z "`git status --porcelain`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi + @sed -i "s/__version__ = '.*'/__version__ = '$$version'/" youtube_dl/__init__.py + make all + git add -A + git commit -m "release $$version" + git tag -m "Release $$version" "$$version" + +.PHONY: all install release + +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 + +youtube-dl.exe: youtube_dl/*.py + bash devscripts/wine-py2exe.sh build_exe.py -readme: +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) && \ @@ -15,36 +38,13 @@ readme: echo '# FAQ' >> README.md && \ echo "$${footer}" >> README.md -man-page: +youtube-dl.1: README.md pandoc -s -w man README.md -o youtube-dl.1 -bash-completion: +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 -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 - -exe: - bash devscripts/wine-py2exe.sh build_exe.py - -install: - install -m 755 --owner root --group root youtube-dl /usr/local/bin/ - install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 - install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl - -release: - @if [ -z "$$version" ]; then echo 'ERROR: specify version number like this: make release version=1994.09.06'; exit 1; fi - @if [ ! -z "`git tag | grep "$$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi - @if [ ! -z "`git status --porcelain`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi - @sed -i "s/__version__ = '.*'/__version__ = '$$version'/" youtube_dl/__init__.py - make all - git add -A - git commit -m "release $$version" - git tag -m "Release $$version" "$$version" - -.PHONY: all update-latest readme man-page bash-completion compile exe install release +LATEST_VERSION: youtube-dl + ./youtube-dl --version > LATEST_VERSION -- cgit v1.1 From 225dceb0468a0608e9805479b927f6fb8cb94067 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Tue, 25 Sep 2012 23:56:01 +0200 Subject: moved make release to devscripts/release.sh --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 26c85b5..c167d01 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,7 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 install -m 644 --owner root --group root youtube-dl.bash-completion /etc/bash_completion.d/youtube-dl -release: - @if [ -z "$$version" ]; then echo 'ERROR: specify version number like this: make release version=1994.09.06'; exit 1; fi - @if [ ! -z "`git tag | grep "$$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi - @if [ ! -z "`git status --porcelain`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi - @sed -i "s/__version__ = '.*'/__version__ = '$$version'/" youtube_dl/__init__.py - make all - git add -A - git commit -m "release $$version" - git tag -m "Release $$version" "$$version" - -.PHONY: all install release +.PHONY: all install youtube-dl: youtube_dl/*.py zip --quiet --junk-paths youtube-dl youtube_dl/*.py -- cgit v1.1 From 0e841bdc54c68076d82c29d541683eb844d19794 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 26 Sep 2012 00:10:39 +0200 Subject: add PREFIX option to make install --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c167d01..21b3469 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ all: youtube-dl youtube-dl.exe README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION +PREFIX=/usr/local install: youtube-dl youtube-dl.1 youtube-dl.bash-completion - install -m 755 --owner root --group root youtube-dl /usr/local/bin/ - install -m 644 --owner root --group root youtube-dl.1 /usr/local/man/man1 + 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 -- cgit v1.1