From c2afd215e34beb69bf6e0665193ecf4d87d74e99 Mon Sep 17 00:00:00 2001 From: Nick White Date: Sat, 5 Jan 2019 12:16:04 +0000 Subject: tesstrainer role installs basic tesseract tools too, and only build and run ldconfig when necessary Use register variables and handlers to only run ldconfig and build tools when there's some need to do so. The tesseractor role is now only to be used by hosts that don't want training tools, hosts that want both should just use the tesstrainer role. --- roles/tesseractor/handlers/main.yml | 3 +++ roles/tesseractor/tasks/ldlocal.yml | 4 +--- roles/tesseractor/tasks/tesseract.yml | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 roles/tesseractor/handlers/main.yml (limited to 'roles/tesseractor') diff --git a/roles/tesseractor/handlers/main.yml b/roles/tesseractor/handlers/main.yml new file mode 100644 index 0000000..12df781 --- /dev/null +++ b/roles/tesseractor/handlers/main.yml @@ -0,0 +1,3 @@ +--- +- name: update ld.so + command: /sbin/ldconfig diff --git a/roles/tesseractor/tasks/ldlocal.yml b/roles/tesseractor/tasks/ldlocal.yml index e817d85..2fd5fac 100644 --- a/roles/tesseractor/tasks/ldlocal.yml +++ b/roles/tesseractor/tasks/ldlocal.yml @@ -6,6 +6,4 @@ dest: /etc/ld.so.conf.d/locallib.conf create: true line: /usr/local/lib - -- name: Update ld.so cache - command: /sbin/ldconfig + notify: update ld.so diff --git a/roles/tesseractor/tasks/tesseract.yml b/roles/tesseractor/tasks/tesseract.yml index 74c9076..e63cfee 100644 --- a/roles/tesseractor/tasks/tesseract.yml +++ b/roles/tesseractor/tasks/tesseract.yml @@ -22,12 +22,13 @@ dest: /home/ec2-user/src/leptonica version: addinstall depth: 1 - force: yes + register: leptclone - name: Build leptonica command: make -f makefile.static SHARED=yes install args: chdir: /home/ec2-user/src/leptonica/src + when: leptclone.changed - name: Clone tesseract repository git: @@ -35,6 +36,8 @@ dest: /home/ec2-user/src/tesseract version: amibuild depth: 1 + register: tessclone - name: Build and install tesseract make: chdir=/home/ec2-user/src/tesseract/simplemake target=install + when: tessclone.changed -- cgit v1.2.1-24-ge1ad