From 001b335c34b30990a4ece04070eb9a66a34ddd27 Mon Sep 17 00:00:00 2001 From: "A.J. Stein" Date: Wed, 11 Oct 2023 17:07:37 -0400 Subject: [PATCH] Include missing catalogs for conversions for #116. As picked up in review with Nikita, we are converting the source XML files to JSON and YAML, but not all. We need to adjust the make vars that collect the source files for conversion to minified JSON to Include the resolved catalogs from profiles from the previous step. Reviewing the auto-committed test content confirm these files were being missed in conversion to JSON and YAML and we obviously need those. --- build/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Makefile b/build/Makefile index 99215fe6..327dd8f3 100644 --- a/build/Makefile +++ b/build/Makefile @@ -6,10 +6,10 @@ SRC_READMES:=$(shell find $(SRC_DIR) -iname 'README.md') GEN_CONTENT_DIR:=generated GEN_READMES:=$(patsubst $(SRC_DIR)/%,$(GEN_CONTENT_DIR)/%,$(SRC_READMES)) GEN_XML_FILES:=$(patsubst $(SRC_DIR)/%,$(GEN_CONTENT_DIR)/%,$(SRC_FILES)) -GEN_XML_PROFILES:=$(subst _profile.xml,-resolved-profile_catalog.xml,$(patsubst $(SRC_DIR)/%,$(GEN_CONTENT_DIR)/%,$(SRC_XML_PROFILES))) +GEN_XML_RESOLVED_CATALOGS:=$(subst _profile.xml,-resolved-profile_catalog.xml,$(patsubst $(SRC_DIR)/%,$(GEN_CONTENT_DIR)/%,$(SRC_XML_PROFILES))) GEN_JSON_FILES:=$(subst xml,json,$(GEN_XML_FILES)) -GEN_MIN_JSON_FILES:=$(subst .json,-min.json,$(subst xml,json,$(GEN_XML_FILES))) -GEN_YAML_FILES:=$(subst xml,yaml,$(GEN_XML_FILES)) +GEN_MIN_JSON_FILES:=$(subst .json,-min.json,$(subst xml,json,$(GEN_XML_FILES) $(GEN_XML_RESOLVED_CATALOGS))) +GEN_YAML_FILES:=$(subst xml,yaml,$(GEN_XML_FILES) $(GEN_XML_RESOLVED_CATALOGS)) CURL_INSTALL_OPTS:=--silent --location JQ_BIN:=jq-linux-amd64 JQ_PATH:=$(shell pwd)/jq @@ -88,7 +88,7 @@ $(GEN_CONTENT_DIR)/%.xml: $(SRC_DIR)/%.xml @cp $(SRC_DIR)/$*.xml $(GEN_CONTENT_DIR)/$*.xml .PHONY: resolve-xml-profiles -resolve-xml-profiles: $(GEN_XML_PROFILES) ## Resolve OSCAL XML profiles for custom catalogs +resolve-xml-profiles: $(GEN_XML_RESOLVED_CATALOGS) ## Resolve OSCAL XML profiles for custom catalogs $(GEN_CONTENT_DIR)/%-resolved-profile_catalog.xml: $(SRC_DIR)/%_profile.xml mkdir -p $(@D)