From b0a216f59a7770f5ce35f4a56b5055c51ceec284 Mon Sep 17 00:00:00 2001 From: hut Date: Mon, 3 May 2010 13:36:20 +0200 Subject: Makefile: cleaned up, added automatic uninstall --- Makefile | 115 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 57 insertions(+), 58 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 05c565e6..bef340ec 100644 --- a/Makefile +++ b/Makefile @@ -2,37 +2,74 @@ NAME = ranger VERSION = 1.0.4 PYTHON ?= python DOCDIR ?= doc/pydoc -PREFIX ?= /usr/local +PREFIX ?= /usr +MANPREFIX ?= /share/man PYTHONOPTIMIZE ?= 2 CWD = $(shell pwd) -EDITOR ?= vim -DEST ?= $(shell $(PYTHON) -c 'import sys; sys.stdout.write( \ - [p for p in sys.path if "site" in p][0])' 2> /dev/null)/ranger +PYTHON_SITE_DEST ?= $(shell $(PYTHON) -c 'import sys; sys.stdout.write( \ + [p for p in sys.path if "site" in p][0])' 2> /dev/null) -.PHONY: all compile clean doc cleandoc edit push test commit \ - install uninstall info snapshot minimal_snapshot +default: test compile + @echo 'Run `make options` for a list of all options' -info: - @echo 'This makefile provides shortcuts for common tasks.' - @echo 'make clean: Remove all unnecessary files (.pyc, .pyo)' - @echo 'make cleandoc: Remove the pydoc documentation' +options: help + @echo + @echo 'Options:' + @echo 'PYTHON = $(PYTHON)' + @echo 'PYTHONOPTIMIZE = $(PYTHONOPTIMIZE)' + @echo 'PYTHON_SITE_DEST = $(PYTHON_SITE_DEST)' + @echo 'PREFIX = $(PREFIX)' + @echo 'MANPREFIX = $(MANPREFIX)' + @echo 'DOCDIR = $(DOCDIR)' + +help: + @echo 'make: Compile $(NAME)' @echo 'make doc: Create the pydoc documentation' @echo 'make install: Install ranger' + @echo 'make clean: Remove the compiled files (*.pyc, *.pyo)' + @echo 'make cleandoc: Remove the pydoc documentation' + @echo 'make uninstall: Uninstall ranger' @echo 'make snapshot: Create a tar.gz of the current git revision' - @echo - @echo 'For developers:' - @echo 'make commit: Test and commit the changes' @echo 'make test: Run all unittests.' - @echo 'make push: push the changes via git' - @echo 'make edit: open all relevant files in your editor' -all: test install +all: test compile install + +install: + @if [ '$(PYTHON_SITE_DEST)' == '' ]; then \ + echo -n 'Cannot find a suitable destination for the files.'; \ + echo ' Please install $(NAME) manually.'; \ + false; \ + fi + @echo "Installing $(NAME) version $(VERSION)..." + @mkdir -p $(PREFIX)/bin + cp -f ranger.py $(PREFIX)/bin/ranger + @mkdir -p $(PYTHON_SITE_DEST) + cp -fruT ranger $(PYTHON_SITE_DEST)/ranger + @chmod 755 $(PREFIX)/bin/ranger + @chmod -R +rX $(PYTHON_SITE_DEST)/ranger + @mkdir -p $(PREFIX)$(MANPREFIX)/man1 + cp -f doc/ranger.1 $(PREFIX)$(MANPREFIX)/man1/ranger.1 + @chmod 644 $(PREFIX)$(MANPREFIX)/man1/ranger.1 + +uninstall: + rm -f $(PREFIX)/bin/ranger + rm -f '$(PREFIX)$(MANPREFIX)/man1/ranger.1' + @if [ '$(PYTHON_SITE_DEST)' == '' ]; then \ + echo 'Cannot find a possible location of rangers library files'; \ + false; \ + fi + rm -rf '$(PYTHON_SITE_DEST)/ranger/*' + @echo 'NOTE: By default, configuration files are stored at "~/.ranger".' + @echo 'This script will not delete those.' compile: clean @echo 'Compiling...' python -m compileall -q ranger PYTHONOPTIMIZE=$(PYTHONOPTIMIZE) python -m compileall -q ranger +clean: + find . -regex .\*.py[co]\$$ -exec rm -f -- {} \; + doc: cleandoc mkdir -p $(DOCDIR) cd $(DOCDIR); \ @@ -40,53 +77,15 @@ doc: cleandoc sys.path[0] = "$(CWD)"; \ pydoc.writedocs("$(CWD)")' -uninstall: - @echo 'To uninstall ranger, please remove these files:' - @echo $(DEST)'/*' - @echo $(PREFIX)'/bin/ranger' - @echo 'and optionally the config files at:' - @echo '~/.ranger' - -install: compile - @if [ '$(DEST)' == '/ranger' ]; then \ - echo 'Cannot find a suitable destination for the files.'; \ - false; \ - fi - @echo "Installing..." - cp ranger.py $(PREFIX)/bin/ranger - cp -ruT ranger $(DEST) - chmod 755 $(PREFIX)/bin/ranger - chmod -R +rX $(DEST) - @echo '--------------------------------------' - @echo 'Finished.' - @echo 'If you use BASH or ZSH, you can activate an extra feature now:' - @echo 'When you exit ranger, the directory of the current shell can be' - @echo 'changed to the last visited directory in ranger. To do so, add' - @echo 'this alias to your shell rc file (like ~/.bashrc):' - @echo 'alias rng="source ranger ranger"' - @echo 'And run ranger by typing rng.' - - cleandoc: test -d $(DOCDIR) && rm -f -- $(DOCDIR)/*.html -clean: - find . -regex .\*.py[co]\$$ -exec rm -f -- {} \; - test: ./all_tests.py 1 - -edit: - @$(EDITOR) ranger.py Makefile README COPYING HACKING INSTALL $(shell find ranger test -regex .\*py$ ) - -push: - @for repo in $(shell git remote); do \ - echo "Pushing to $$repo..."; \ - git push $$repo master; \ - done - -commit: test - @git citool + ./all_benchmarks.py 1 snapshot: git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar.gz + +.PHONY: default options all compile clean doc cleandoc test \ + install uninstall snapshot -- cgit 1.4.1-2-gfad0 From 4ade06a67abb6293c2695627b8b2b2c04298d8b6 Mon Sep 17 00:00:00 2001 From: hut Date: Mon, 3 May 2010 23:53:11 +0200 Subject: Makefile: added `make bm` to run all benchmarks BMCOUNT times --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bef340ec..ffa81797 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ PYTHONOPTIMIZE ?= 2 CWD = $(shell pwd) PYTHON_SITE_DEST ?= $(shell $(PYTHON) -c 'import sys; sys.stdout.write( \ [p for p in sys.path if "site" in p][0])' 2> /dev/null) +BMCOUNT ?= 5 default: test compile @echo 'Run `make options` for a list of all options' @@ -82,10 +83,12 @@ cleandoc: test: ./all_tests.py 1 - ./all_benchmarks.py 1 + +bm: + ./all_benchmarks.py $(BMCOUNT) snapshot: git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar.gz -.PHONY: default options all compile clean doc cleandoc test \ +.PHONY: default options all compile clean doc cleandoc test bm \ install uninstall snapshot -- cgit 1.4.1-2-gfad0 From da440d3a10b7ab05e9b55968344fff2cbc45da09 Mon Sep 17 00:00:00 2001 From: hut Date: Tue, 4 May 2010 00:06:25 +0200 Subject: Added license header to a few files --- Makefile | 15 +++++++++++++++ all_benchmarks.py | 15 +++++++++++++++ all_tests.py | 15 +++++++++++++++ test/bm_loader.py | 15 +++++++++++++++ 4 files changed, 60 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ffa81797..3b429367 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,18 @@ +# Copyright (C) 2009, 2010 Roman Zimbelmann +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + NAME = ranger VERSION = 1.0.4 PYTHON ?= python diff --git a/all_benchmarks.py b/all_benchmarks.py index c03d0d92..abcd051e 100755 --- a/all_benchmarks.py +++ b/all_benchmarks.py @@ -1,4 +1,19 @@ #!/usr/bin/python +# Copyright (C) 2009, 2010 Roman Zimbelmann +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + """Run all the tests inside the test/ directory as a test suite.""" if __name__ == '__main__': from test import * diff --git a/all_tests.py b/all_tests.py index 6693b870..90926918 100755 --- a/all_tests.py +++ b/all_tests.py @@ -1,4 +1,19 @@ #!/usr/bin/python +# Copyright (C) 2009, 2010 Roman Zimbelmann +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + """Run all the tests inside the test/ directory as a test suite.""" if __name__ == '__main__': import unittest diff --git a/test/bm_loader.py b/test/bm_loader.py index 33011108..0604d5ad 100644 --- a/test/bm_loader.py +++ b/test/bm_loader.py @@ -1,3 +1,18 @@ +# Copyright (C) 2009, 2010 Roman Zimbelmann +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + from ranger.core.loader import Loader from ranger.fsobject import Directory, File from ranger.ext.openstruct import OpenStruct -- cgit 1.4.1-2-gfad0 From 3a1e1f28fa847df5021b37d4c81eb4dfa01f5a8e Mon Sep 17 00:00:00 2001 From: hut Date: Fri, 7 May 2010 18:02:06 +0200 Subject: Makefile: updated --- Makefile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3b429367..1f75728c 100644 --- a/Makefile +++ b/Makefile @@ -19,20 +19,21 @@ PYTHON ?= python DOCDIR ?= doc/pydoc PREFIX ?= /usr MANPREFIX ?= /share/man -PYTHONOPTIMIZE ?= 2 -CWD = $(shell pwd) +PYOPTIMIZE ?= 1 PYTHON_SITE_DEST ?= $(shell $(PYTHON) -c 'import sys; sys.stdout.write( \ [p for p in sys.path if "site" in p][0])' 2> /dev/null) -BMCOUNT ?= 5 +BMCOUNT ?= 5 # how often to run the benchmarks? + +CWD = $(shell pwd) -default: test compile +default: compile @echo 'Run `make options` for a list of all options' options: help @echo @echo 'Options:' @echo 'PYTHON = $(PYTHON)' - @echo 'PYTHONOPTIMIZE = $(PYTHONOPTIMIZE)' + @echo 'PYOPTIMIZE = $(PYOPTIMIZE)' @echo 'PYTHON_SITE_DEST = $(PYTHON_SITE_DEST)' @echo 'PREFIX = $(PREFIX)' @echo 'MANPREFIX = $(MANPREFIX)' @@ -80,13 +81,14 @@ uninstall: compile: clean @echo 'Compiling...' - python -m compileall -q ranger - PYTHONOPTIMIZE=$(PYTHONOPTIMIZE) python -m compileall -q ranger + PYTHONOPTIMIZE=$(PYOPTIMIZE) python -m compileall -q ranger clean: + @echo 'Cleaning...' find . -regex .\*.py[co]\$$ -exec rm -f -- {} \; doc: cleandoc + @echo 'Creating pydoc html documentation...' mkdir -p $(DOCDIR) cd $(DOCDIR); \ $(PYTHON) -c 'import pydoc, sys; \ @@ -94,13 +96,14 @@ doc: cleandoc pydoc.writedocs("$(CWD)")' cleandoc: + @echo 'Removing pydoc html documentation...' test -d $(DOCDIR) && rm -f -- $(DOCDIR)/*.html test: - ./all_tests.py 1 + @./all_tests.py 1 bm: - ./all_benchmarks.py $(BMCOUNT) + @./all_benchmarks.py $(BMCOUNT) snapshot: git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar.gz -- cgit 1.4.1-2-gfad0