Merge pull request #80 from bertsky/master

make install more flexibly

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 jobs:
 
-  build-olena:
+  test:
     docker:
       - image: circleci/buildpack-deps:stretch
     steps:
@@ -13,6 +13,14 @@ jobs:
       - run: sudo make install PREFIX=/usr/local
       - run: make test
       - run: make docker
+
+  build-docker:
+    docker:
+      - image: circleci/buildpack-deps:stretch
+    steps:
+      - checkout
+      - setup_remote_docker      # https://circleci.com/docs/2.0/building-docker-images/
+      - run: make docker
       - run: echo "$DOCKERHUB_PASS" | docker login --username "$DOCKERHUB_USERNAME" --password-stdin
       - run: docker push ocrd/olena:latest
       - run: docker push ocrd/olena:build-olena
@@ -21,4 +29,10 @@ workflows:
   version: 2
   build-master:
     jobs:
-      - build-olena
+      - build-docker
+          filters:
+            branches:
+              only: master
+  test-pull-request:
+    jobs:
+      - test

CHANGELOG.md

@@ -4,6 +4,13 @@ Versioned according to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## [1.2.5] - 2021-11-11
+
+Changed:
+
+   - on `make install`, check for existing `scribo-cli` in PATH
+   - differentiate `make install` vs `make install-tools`
+
 ## [1.2.4] - 2021-09-22
 
 Fixed:
@@ -161,6 +168,7 @@ Changed
 First release
 
 <!-- link-labels -->
+[1.2.5]: ../../compare/v1.2.4...v1.2.5
 [1.2.4]: ../../compare/v1.2.3...v1.2.4
 [1.2.3]: ../../compare/v1.2.2...v1.2.3
 [1.2.2]: ../../compare/v1.2.1...v1.2.2

Makefile

@@ -64,16 +64,16 @@ deps-check:
 	$(call check_config_status,BOOST,libboost-dev)
 
 deps: #deps-ubuntu
-	test -x $(BINDIR)/scribo-cli && \
-	$(BINDIR)/scribo-cli sauvola --help >/dev/null 2>&1 || \
+	command -v scribo-cli >/dev/null 2>&1 && \
+	scribo-cli sauvola --help >/dev/null 2>&1 || \
 		$(MAKE) build-olena
 	$(PIP) install -U pip
 	$(PIP) install "ocrd>=2.13" # needed for ocrd CLI (and bashlib)
 
 # Install
-install: deps
-install: $(SHAREDIR)/ocrd-tool.json
-install: $(TOOLS:%=$(BINDIR)/%)
+install: deps install-tools
+install-tools: $(SHAREDIR)/ocrd-tool.json
+install-tools: $(TOOLS:%=$(BINDIR)/%)
 
 $(SHAREDIR)/ocrd-tool.json: ocrd-tool.json
 	@mkdir -p $(SHAREDIR)
@@ -154,7 +154,7 @@ docker: build-olena.dockerfile Dockerfile
 	docker build -t $(DOCKER_TAG):build-olena -f build-olena.dockerfile .
 	docker build -t $(DOCKER_TAG) .
 
-.PHONY: build-olena clean-olena deps deps-ubuntu help install test clean docker
+.PHONY: build-olena clean-olena deps deps-ubuntu help install install-tools test clean docker
 
 # do not search for implicit rules here:
 Makefile: ;