Skip to content

Commit 00a519a

Browse files
committed
fix: update LinkML pin, fix Makefile quoting, regenerate GX artifacts
- Pin linkml to ASCS-eV/linkml@feat/harbour-credentials which includes: - fix(shacl): nodeidentifier range produces sh:BlankNodeOrIRI (PR #3291) - feat(context): --xsd-anyuri-as-iri opt-in flag (PR #3292) - Plus 4 prior fixes for improved SHACL/OWL/context generation - Pin service-characteristics submodule to fix/envited-ontology-fixes - Fix Makefile quoting: quote all $(MAKE) and $(DOMAIN) expansions in case statement bodies to handle paths with spaces/parentheses - Fix update-from-submodule.sh cross-platform issues: - Set MSYS_NO_PATHCONV=1 to prevent Git Bash path conversion - Redirect stderr from merge_schemas.sh to log file (pipe deadlock) - Strip rdfpipe Windows \r Turtle escapes for deterministic output - Regenerate Gaia-X artifacts from service-characteristics@e12e485 Refs: linkml/linkml#3291, linkml/linkml#3292 Signed-off-by: jdsika <carlo.van-driesten@bmw.de>
1 parent 4da2c3f commit 00a519a

12 files changed

Lines changed: 6493 additions & 6467 deletions

Makefile

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ help:
7171
@:
7272
else
7373
help:
74-
@$(MAKE) --no-print-directory _help_general
74+
@"$(MAKE)" --no-print-directory _help_general
7575
endif
7676

7777
# Default target
@@ -113,9 +113,9 @@ install:
113113
exit 1; \
114114
fi; \
115115
case "$$subcommand" in \
116-
default) $(MAKE) --no-print-directory _install_default ;; \
117-
dev) $(MAKE) --no-print-directory _install_dev ;; \
118-
help) $(MAKE) --no-print-directory _help_install ;; \
116+
default) "$(MAKE)" --no-print-directory _install_default ;; \
117+
dev) "$(MAKE)" --no-print-directory _install_dev ;; \
118+
help) "$(MAKE)" --no-print-directory _help_install ;; \
119119
*) echo "ERROR: Unknown install subcommand '$$subcommand'"; echo "Run 'make install help' for available options."; exit 1 ;; \
120120
esac
121121

@@ -153,9 +153,9 @@ generate:
153153
exit 1; \
154154
fi; \
155155
case "$$subcommand" in \
156-
default) $(MAKE) --no-print-directory _generate_default DOMAIN="$(DOMAIN)" ;; \
157-
gx) $(MAKE) --no-print-directory _generate_gx GX_REF="$(GX_REF)" ;; \
158-
help) $(MAKE) --no-print-directory _help_generate ;; \
156+
default) "$(MAKE)" --no-print-directory _generate_default DOMAIN="$(DOMAIN)" ;; \
157+
gx) "$(MAKE)" --no-print-directory _generate_gx GX_REF="$(GX_REF)" ;; \
158+
help) "$(MAKE)" --no-print-directory _help_generate ;; \
159159
*) echo "ERROR: Unknown generate subcommand '$$subcommand'"; echo "Run 'make generate help' for available options."; exit 1 ;; \
160160
esac
161161

@@ -206,14 +206,14 @@ test:
206206
exit 1; \
207207
fi; \
208208
case "$$subcommand" in \
209-
default) $(MAKE) --no-print-directory _test_default ;; \
210-
syntax) $(MAKE) --no-print-directory _test_syntax ;; \
211-
artifact-coherence) $(MAKE) --no-print-directory _test_artifact_coherence ;; \
212-
data-conformance) $(MAKE) --no-print-directory _test_data_conformance ;; \
213-
failing) $(MAKE) --no-print-directory _test_failing ;; \
214-
cov) $(MAKE) --no-print-directory _test_cov ;; \
215-
domain) $(MAKE) --no-print-directory _test_domain ;; \
216-
help) $(MAKE) --no-print-directory _help_test ;; \
209+
default) "$(MAKE)" --no-print-directory _test_default ;; \
210+
syntax) "$(MAKE)" --no-print-directory _test_syntax ;; \
211+
artifact-coherence) "$(MAKE)" --no-print-directory _test_artifact_coherence ;; \
212+
data-conformance) "$(MAKE)" --no-print-directory _test_data_conformance ;; \
213+
failing) "$(MAKE)" --no-print-directory _test_failing ;; \
214+
cov) "$(MAKE)" --no-print-directory _test_cov ;; \
215+
domain) "$(MAKE)" --no-print-directory _test_domain ;; \
216+
help) "$(MAKE)" --no-print-directory _help_test ;; \
217217
*) echo "ERROR: Unknown test subcommand '$$subcommand'"; echo "Run 'make test help' for available options."; exit 1 ;; \
218218
esac
219219

@@ -260,7 +260,7 @@ _test_domain:
260260
exit 1; \
261261
fi
262262
@echo "[INFO] Running full validation suite for domain: $(DOMAIN)..."
263-
@"$(PYTHON)" -m src.tools.validators.validation_suite --run all --domain $(DOMAIN)
263+
@"$(PYTHON)" -m src.tools.validators.validation_suite --run all --domain "$(DOMAIN)"
264264
@echo "[OK] Domain validation complete"
265265

266266
# Documentation targets
@@ -273,10 +273,10 @@ docs:
273273
exit 1; \
274274
fi; \
275275
case "$$subcommand" in \
276-
generate) $(MAKE) --no-print-directory _docs_generate ;; \
277-
serve) $(MAKE) --no-print-directory _docs_serve ;; \
278-
build) $(MAKE) --no-print-directory _docs_build ;; \
279-
help|default) $(MAKE) --no-print-directory _help_docs ;; \
276+
generate) "$(MAKE)" --no-print-directory _docs_generate ;; \
277+
serve) "$(MAKE)" --no-print-directory _docs_serve ;; \
278+
build) "$(MAKE)" --no-print-directory _docs_build ;; \
279+
help|default) "$(MAKE)" --no-print-directory _help_docs ;; \
280280
*) echo "ERROR: Unknown docs subcommand '$$subcommand'"; echo "Run 'make docs help' for available options."; exit 1 ;; \
281281
esac
282282

@@ -307,8 +307,8 @@ registry:
307307
exit 1; \
308308
fi; \
309309
case "$$subcommand" in \
310-
update) $(MAKE) --no-print-directory _registry_update TAG="$(TAG)" ;; \
311-
help|default) $(MAKE) --no-print-directory _help_registry ;; \
310+
update) "$(MAKE)" --no-print-directory _registry_update TAG="$(TAG)" ;; \
311+
help|default) "$(MAKE)" --no-print-directory _help_registry ;; \
312312
*) echo "ERROR: Unknown registry subcommand '$$subcommand'"; echo "Run 'make registry help' for available options."; exit 1 ;; \
313313
esac
314314

@@ -332,9 +332,9 @@ clean:
332332
exit 1; \
333333
fi; \
334334
case "$$subcommand" in \
335-
default) $(MAKE) --no-print-directory _clean_default ;; \
336-
cache) $(MAKE) --no-print-directory _clean_cache ;; \
337-
help) $(MAKE) --no-print-directory _help_clean ;; \
335+
default) "$(MAKE)" --no-print-directory _clean_default ;; \
336+
cache) "$(MAKE)" --no-print-directory _clean_cache ;; \
337+
help) "$(MAKE)" --no-print-directory _help_clean ;; \
338338
*) echo "ERROR: Unknown clean subcommand '$$subcommand'"; echo "Run 'make clean help' for available options."; exit 1 ;; \
339339
esac
340340

0 commit comments

Comments
 (0)