Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add OCR-D/ocrd_fileformat, fix #80 #83

Merged
merged 4 commits into from
Apr 23, 2020
Merged

add OCR-D/ocrd_fileformat, fix #80 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb35133
add OCR-D/ocrd_fileformat, fix #80
kba Apr 22, 2020
b7aa8f5
Makefile: sort DOCKER_MODULES alphabetically (but core first)
kba Apr 22, 2020
5e6da3b
Update .gitmodules
kba Apr 22, 2020
27a507f
Add unzip as a requirement (needed for ocrd_fileformat / ocr-fileformat)
stweil Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
[submodule "ocrd_repair_inconsistencies"]
path = ocrd_repair_inconsistencies
url = https://github.com/qurator-spk/ocrd_repair_inconsistencies.git
[submodule "ocrd_fileformat"]
path = ocrd_fileformat
url = https://github.com/OCR-D/ocrd_fileformat.git
[submodule "ocrd_pagetopdf"]
path = ocrd_pagetopdf
url = https://github.com/JKamlah/ocrd_pagetopdf.git
13 changes: 10 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PKG_CONFIG_PATH := $(VIRTUAL_ENV)/lib/pkgconfig
export PKG_CONFIG_PATH

OCRD_EXECUTABLES = $(BIN)/ocrd # add more CLIs below
CUSTOM_DEPS = wget python3-venv # add more packages for deps-ubuntu below (or modules as preqrequisites)
CUSTOM_DEPS = unzip wget python3-venv # add more packages for deps-ubuntu below (or modules as preqrequisites)

DISABLED_MODULES ?= cor-asv-fst opencv-python ocrd_kraken clstm ocrd_ocropy
# Default to all submodules, but allow overriding by user
Expand Down Expand Up @@ -210,6 +210,13 @@ $(BIN)/ocrd-im6convert: ocrd_im6convert
. $(ACTIVATE_VENV) && $(MAKE) -C $< install
endif

ifneq ($(findstring ocrd_fileformat, $(OCRD_MODULES)),)
ocrd_fileformat: GIT_RECURSIVE = --recursive
OCRD_EXECUTABLES += $(BIN)/ocrd-fileformat
$(BIN)/ocrd-fileformat: ocrd_fileformat
. $(ACTIVATE_VENV) && $(MAKE) -C $< install-fileformat install
endif

ifneq ($(findstring ocrd_olena, $(OCRD_MODULES)),)
ocrd_olena: GIT_RECURSIVE = --recursive
deps-ubuntu: ocrd_olena
Expand Down Expand Up @@ -481,9 +488,9 @@ endif
docker-minimum-git docker-medium-git docker-maximum-git: PIP_OPTIONS = -e

# Minimum-size selection: use Ocropy binarization, use Tesseract from PPA
docker-minimum docker-minimum-git: DOCKER_MODULES = core ocrd_im6convert ocrd_cis ocrd_pagetopdf ocrd_tesserocr tesserocr workflow-configuration ocrd_repair_inconsistencies
docker-minimum docker-minimum-git: DOCKER_MODULES = core ocrd_cis ocrd_fileformat ocrd_im6convert ocrd_pagetopdf ocrd_repair_inconsistencies ocrd_tesserocr tesserocr workflow-configuration
# Medium-size selection: add Olena binarization and Calamari, use Tesseract from git, add evaluation
docker-medium docker-medium-git: DOCKER_MODULES = core ocrd_im6convert format-converters ocrd_cis ocrd_pagetopdf ocrd_tesserocr tesserocr tesseract ocrd_olena ocrd_segment ocrd_keraslm ocrd_calamari dinglehopper cor-asv-ann workflow-configuration ocrd_repair_inconsistencies
docker-medium docker-medium-git: DOCKER_MODULES = core cor-asv-ann dinglehopper format-converters ocrd_calamari ocrd_cis ocrd_fileformat ocrd_im6convert ocrd_keraslm ocrd_olena ocrd_pagetopdf ocrd_repair_inconsistencies ocrd_segment ocrd_tesserocr tesseract tesserocr workflow-configuration
# Maximum-size selection: use all modules
docker-maximum docker-maximum-git: DOCKER_MODULES = $(OCRD_MODULES)

Expand Down
1 change: 1 addition & 0 deletions ocrd_fileformat
Open in desktop
Submodule ocrd_fileformat added at de5b53