Skip to content

Commit

Permalink
Integrate spec/assets as submodules, OCR-D#337, OCR-D#593
Browse files Browse the repository at this point in the history
  • Loading branch information
kba committed Sep 18, 2020
1 parent b4a3337 commit 56cdca3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ ocrd.egg-info
.pytest_cache
/src
/profile
/repo
.~lock*
.pynative
venv3
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "repo/assets"]
path = repo/assets
url = https://github.com/OCR-D/assets
[submodule "repo/spec"]
path = repo/spec
url = https://github.com/OCR-D/spec
15 changes: 3 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ help:
@echo " install-dev Install with pip install -e"
@echo " uninstall Uninstall the tool"
@echo " generate-page Regenerate python code from PAGE XSD"
@echo " repo/assets Clone OCR-D/assets to ./repo/assets"
@echo " repo/spec Clone OCR-D/spec to ./repo/spec"
@echo " spec Copy JSON Schema, OpenAPI from OCR-D/spec"
@echo " assets Setup test assets"
@echo " assets-server Start asset server at http://localhost:5001"
Expand All @@ -35,7 +33,6 @@ help:
@echo " docs Build documentation"
@echo " docs-clean Clean docs"
@echo " docs-coverage Calculate docstring coverage"
@echo " docker Build docker image"
@echo " docker-cuda Build docker GPU / CUDA image"
@echo " bashlib Build bash library"
@echo " pypi Build wheels and source dist and twine upload them"
Expand Down Expand Up @@ -106,15 +103,9 @@ generate-page: repo/assets
# Repos
#

# Clone OCR-D/assets to ./repo/assets
repo/assets:
mkdir -p $(dir $@)
git clone https://github.com/OCR-D/assets "$@"

# Clone OCR-D/spec to ./repo/spec
repo/spec:
mkdir -p $(dir $@)
git clone https://github.com/OCR-D/spec "$@"
# Update OCR-D/assets and OCR-D/spec resp.
repo/assets repo/spec:
git submodule update --init

#
# Spec
Expand Down
1 change: 1 addition & 0 deletions repo/assets
Submodule assets added at 32fde9
1 change: 1 addition & 0 deletions repo/spec
Submodule spec added at e11ead

0 comments on commit 56cdca3

Please sign in to comment.