Repository navigation
Fix ODK_RESOURCES_DIR default and plugin download dir #50
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -74,7 +74,7 @@ BRIDGEDIR = bridges | |
| TRANSLATIONSDIR = ../translations | ||
| {% endif -%} | ||
| PATCHESDIR = $(TMPDIR)/patches | ||
| ODK_RESOURCES_DIR ?= /tools/resources | ||
| ODK_RESOURCES_DIR ?= /odk/resources | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If it makes you happy, but that doesn’t serve any purpose. ODK-Core is deliberately disconnected from the layout of the ODK Docker images. It should always get the location of the resources from the The variable is always set either by the Docker image (OK, until INCATools/ontology-development-kit#1391 this was not the case if you were running under |
||
|
|
||
| # Files | ||
| SRC = $(ONT)-edit.$(EDIT_FORMAT) | ||
|
|
@@ -257,6 +257,7 @@ $(ROBOT_PLUGINS_DIRECTORY)/%.jar: | |
| $(ROBOT_PLUGINS_DIRECTORY)/{{ plugin.name }}.jar: | ||
| {# -#} | ||
| {% if plugin.mirror_from -%} | ||
| @mkdir -p $(ROBOT_PLUGINS_DIRECTORY) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This doesn’t hurt, but shouldn’t be needed either. You say in #49 that this fails “if no bundled plugin was copied first”, but there should always be bundled plugins to be copied first, since the ODK comes with no less than 3 bundled plugins (the ODK plugin, the KGCL plugin, and the SSSOM plugin). |
||
| curl --location --output $@ {{ plugin.mirror_from -}} | ||
| {% else -%} | ||
| @echo "ERROR: No URL has been provided for this plugin; you must override" | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above. If it makes you happy, but this is pointless.