From ee372af8c07fa5f4c78ce0add4d779a8efb61625 Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.name>
Date: Mon, 4 May 2020 15:54:37 +0100
Subject: Roll training into main tesseract role; no need to keep it separate

---
 roles/tesseractor/tasks/leptonica.yml |  9 ++++++++-
 roles/tesseractor/tasks/tesseract.yml | 29 ++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

(limited to 'roles/tesseractor')

diff --git a/roles/tesseractor/tasks/leptonica.yml b/roles/tesseractor/tasks/leptonica.yml
index 0664529..9b07c9b 100644
--- a/roles/tesseractor/tasks/leptonica.yml
+++ b/roles/tesseractor/tasks/leptonica.yml
@@ -3,8 +3,15 @@
 
 - name: Install leptonica dependencies
   apt:
-    name: ['g++', 'git', 'libjpeg62-turbo-dev', 'libpng-dev', 'libtiff-dev', 'make', 'zlib1g-dev']
     state: present
+    name:
+      - g++
+      - git
+      - libjpeg62-turbo-dev
+      - libpng-dev
+      - libtiff-dev
+      - make
+      - zlib1g-dev
 
 - name: Clone leptonica repository
   git:
diff --git a/roles/tesseractor/tasks/tesseract.yml b/roles/tesseractor/tasks/tesseract.yml
index 99d15f8..56d8750 100644
--- a/roles/tesseractor/tasks/tesseract.yml
+++ b/roles/tesseractor/tasks/tesseract.yml
@@ -3,8 +3,23 @@
 
 - name: Install tesseract dependencies
   apt:
-    name: ['g++', 'git', 'libjpeg62-turbo-dev', 'libpng-dev', 'libtiff-dev', 'make', 'zlib1g-dev']
     state: present
+    name:
+      - g++
+      - git
+      - libjpeg62-turbo-dev
+      - libpng-dev
+      - libtiff-dev
+      - make
+      - zlib1g-dev
+
+- name: Install tesseract training dependencies
+  apt:
+    state: present
+    name:
+      - libcairo2-dev
+      - libicu-dev
+      - libpango1.0-dev
 
 - name: Clone tesseract repository
   git:
@@ -15,12 +30,16 @@
   become: no
   register: tessclone
 
-- name: Build tesseract
-  make: chdir=/home/{{ ansible_user }}/src/tesseract/simplemake
+- name: Build tesseract and training tools
+  command: make all training
+  args:
+    chdir=/home/{{ ansible_user }}/src/tesseract/simplemake
   become: no
   when: tessclone.changed
 
-- name: Install tesseract
-  make: chdir=/home/{{ ansible_user }}/src/tesseract/simplemake target=install
+- name: Install tesseract and training tools
+  command: make install install-training
+  args:
+    chdir=/home/{{ ansible_user }}/src/tesseract/simplemake
   when: tessclone.changed
   notify: update ld.so
-- 
cgit v1.2.1-24-ge1ad