Remake the build system from scratch.

Author: jwilk

.gitignore

@@ -1,5 +1,4 @@
 *.py[co]
 /.coverage
-/build
 /dist
 /doc/*.1

.travis.yml

@@ -48,17 +48,17 @@ install:
 - pip install $pyflakes
 - pip install docutils
 script:
-- nosetests --verbose
+- make test
 - py2diatra .
 - private/run-pyflakes
 - make -C doc check
 - make -C doc all
-- python setup.py install
+- make install PREFIX=$HOME/.local
 - cd /
 - djvu2hocr --version
 - hocr2djvused --version
 - ocrodjvu --version
-- export MANPATH="$VIRTUAL_ENV/share/man" MANWIDTH=80
+- export MANPATH="$HOME/.local/share/man" MANWIDTH=80
 - man 1 ocrodjvu | grep -A 10 -w OCRODJVU
 - man 1 djvu2hocr | grep -A 10 -w DJVU2HOCR
 - man 1 hocr2djvused | grep -A 10 -w HOCR2DJVUSED

Makefile

@@ -0,0 +1,75 @@
+# Copyright © 2012-2019 Jakub Wilk <[email protected]>
+#
+# This file is part of ocrodjvu.
+#
+# ocrodjvu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# ocrodjvu 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.
+
+PYTHON = python
+
+PREFIX = /usr/local
+DESTDIR =
+
+bindir = $(PREFIX)/bin
+basedir = $(PREFIX)/share/ocrodjvu
+mandir = $(PREFIX)/share/man
+
+.PHONY: all
+all: ;
+
+python-exe = $(shell $(PYTHON) -c 'import sys; print(sys.executable)')
+
+define install-script
+	sed \
+		-e "1 s@^#!.*@#!$(python-exe)@" \
+		-e "s#^basedir = .*#basedir = '$(basedir)/'#" \
+		$(1) > $(1).tmp
+	install -d $(DESTDIR)$(bindir)
+	install $(1).tmp $(DESTDIR)$(bindir)/$(1)
+	rm $(1).tmp
+endef
+
+define install-lib
+	install -d $(DESTDIR)$(basedir)/lib/$(1)
+	install -p -m644 lib/$(1)/*.py $(DESTDIR)$(basedir)/lib/$(1)
+endef
+
+.PHONY: install
+install: ocrodjvu
+	$(PYTHON) - < lib/__init__.py  # Python version check
+	$(call install-script,ocrodjvu)
+	$(call install-script,hocr2djvused)
+	$(call install-script,djvu2hocr)
+	$(call install-lib)
+	$(call install-lib,cli)
+	$(call install-lib,engines)
+ifeq "$(DESTDIR)" ""
+	umask 022 && $(PYTHON) -m compileall -q $(basedir)/lib/
+endif
+ifeq "$(wildcard doc/*.1)" ""
+	# run "$(MAKE) -C doc" to build the manpages
+else
+	install -d $(DESTDIR)$(mandir)/man1
+	install -m644 doc/*.1 $(DESTDIR)$(mandir)/man1/
+endif
+
+.PHONY: test
+test: ocrodjvu
+	$(PYTHON) -c 'import nose; nose.main()' --verbose
+
+.PHONY: clean
+clean:
+	find . -type f -name '*.py[co]' -delete
+	find . -type d -name '__pycache__' -delete
+	rm -f .coverage
+	rm -f *.tmp
+
+.error = GNU make is required
+
+# vim:ts=4 sts=4 sw=4 noet

djvu2hocr

@@ -1,9 +1,27 @@
 #!/usr/bin/env python
+# encoding=UTF-8
+
+# Copyright © 2009-2018 Jakub Wilk <[email protected]>
+#
+# This file is part of ocrodjvu.
+#
+# didjvu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# didjvu 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.
 
 import sys
 
-from ocrodjvu.cli import djvu2hocr as _
+basedir = None
+if basedir is not None:
+    sys.path[:0] = [basedir]
+
+from lib.cli import djvu2hocr as cli
 
-_.main(sys.argv)
+cli.main(sys.argv)
 
 # vim:ts=4 sts=4 sw=4 et

hocr2djvused

@@ -1,9 +1,27 @@
 #!/usr/bin/env python
+# encoding=UTF-8
+
+# Copyright © 2008-2018 Jakub Wilk <[email protected]>
+#
+# This file is part of ocrodjvu.
+#
+# didjvu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# didjvu 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.
 
 import sys
 
-from ocrodjvu.cli import hocr2djvused as _
+basedir = None
+if basedir is not None:
+    sys.path[:0] = [basedir]
+
+from lib.cli import hocr2djvused as cli
 
-_.main(sys.argv)
+cli.main(sys.argv)
 
 # vim:ts=4 sts=4 sw=4 et

ocrodjvu

@@ -1,9 +1,27 @@
 #!/usr/bin/env python
+# encoding=UTF-8
+
+# Copyright © 2008-2018 Jakub Wilk <[email protected]>
+#
+# This file is part of ocrodjvu.
+#
+# didjvu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# didjvu 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.
 
 import sys
 
-from ocrodjvu.cli import ocrodjvu as _
+basedir = None
+if basedir is not None:
+    sys.path[:0] = [basedir]
+
+from lib.cli import ocrodjvu as cli
 
-_.main(sys.argv)
+cli.main(sys.argv)
 
 # vim:ts=4 sts=4 sw=4 et