Better XML linting

This commit is contained in:
Ehmry - 2019-04-04 13:31:00 +02:00
parent 27e2a80275
commit 42e2f41f85
2 changed files with 7 additions and 7 deletions

View File

@ -48,10 +48,10 @@ SHORT_SUM = b2sum -l24
# Generate the makefile for creating signed package tarballs
: index.xml | $(PKG_SED_FILE) |> ^ generate public index^ \
sed \
-e 's|_/pkg/\(\w*\)|local/pkg/\1/current|' \
-f $(PKG_SED_FILE) %f \
| xz > %o \
xmllint %f | sed \
-e 's|_/pkg/\([^"]*\)|local/pkg/\1/current|' \
-f $(PKG_SED_FILE) \
| xz > %o; \
|> public/@(PUBLIC_USER)/index/@(SCULPT_VERSION).xz
AWK_RUNTIME_PATH = awk -v RS=' ' -F '/' \

View File

@ -33,9 +33,9 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \
strip -o %o %f \
|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/%b
!collect_pkg_runtime = | $(VERSIONS_SED_FILE) |> ^ packag $(PKG_NAME)^ \
xmllint -schema $(ERRATA_DIR)/runtime.xsd %f \
> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime; \
!collect_pkg_runtime = | $(VERSIONS_SED_FILE) |> ^ package %f^ \
xmllint --noout -schema $(ERRATA_DIR)/runtime.xsd %f; \
cp %f $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime; \
echo $(PKG_DEPENDS) | tr ' ' '\n' | sed \
-e 's|_/\(.*\)/\(.*\)$|local/\1/\2/current|' \
> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives; \