mirror of
https://github.com/l1ving/youtube-dl
synced 2024-11-20 19:15:17 +08:00
Merge branch 'master' of github.com:rg3/youtube-dl
This commit is contained in:
commit
8179d2ba74
10
Makefile
10
Makefile
@ -17,7 +17,10 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
|
||||
install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
|
||||
install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
|
||||
|
||||
.PHONY: all clean install README.md youtube-dl.bash-completion
|
||||
test:
|
||||
nosetests2 --nocapture 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
|
||||
|
||||
youtube-dl: youtube_dl/*.py
|
||||
@ -52,8 +55,3 @@ youtube-dl.bash-completion: README.md
|
||||
|
||||
LATEST_VERSION: youtube_dl/__init__.py
|
||||
python -m youtube_dl --version > LATEST_VERSION
|
||||
|
||||
test:
|
||||
nosetests2 --nocapture test
|
||||
|
||||
.PHONY: default compile update update-latest update-readme test clean
|
||||
|
@ -151,7 +151,7 @@ Please note that Python 2.5 is not supported anymore.
|
||||
|
||||
### What is this binary file? Where has the code gone?
|
||||
|
||||
Since June 2012 (#342) youtube-dl is packed as an executable zipfile, simply unzip it (might need renaming to `youtube-dl.zip` first on some systems) or clone the git repo to see the code. If you modify the code, you can run it by executing the `__main__.py` file. To recompile the executable, run `make compile`.
|
||||
Since June 2012 (#342) youtube-dl is packed as an executable zipfile, simply unzip it (might need renaming to `youtube-dl.zip` first on some systems) or clone the git repo to see the code. If you modify the code, you can run it by executing the `__main__.py` file. To recompile the executable, run `make youtube-dl`.
|
||||
|
||||
### The exe throws a *Runtime error from Visual C++*
|
||||
|
||||
|
@ -213,7 +213,7 @@ simply unzip it (might need renaming to \f[C]youtube-dl.zip\f[] first on
|
||||
some systems) or clone the git repo to see the code.
|
||||
If you modify the code, you can run it by executing the
|
||||
\f[C]__main__.py\f[] file.
|
||||
To recompile the executable, run \f[C]make\ compile\f[].
|
||||
To recompile the executable, run \f[C]make\ youtube-dl\f[].
|
||||
.SS The exe throws a \f[I]Runtime error from Visual C++\f[]
|
||||
.PP
|
||||
To run the exe you need to install first the Microsoft Visual C++ 2008
|
||||
|
Loading…
Reference in New Issue
Block a user