use xml lint

GSA · Jan 16, 2025 · 2d12b10 · 2d12b10
1 parent f6bea01
commit 2d12b10
Show file tree

Hide file tree

Showing 6 changed files with 33,825 additions and 221 deletions.
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline_profile.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LI-SaaS-baseline_profile.xml
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_LOW-baseline_profile.xml
diff --git a/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml b/dist/content/rev5/baselines/xml/FedRAMP_rev5_MODERATE-baseline_profile.xml
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/content/module.mk b/src/content/module.mk
@@ -7,6 +7,7 @@ DIST_DIR = ./dist
 XML_DIR = $(DIST_DIR)/content/rev5/baselines/xml
 JSON_DIR = $(DIST_DIR)/content/rev5/baselines/json
 YAML_DIR = $(DIST_DIR)/content/rev5/baselines/yaml
+XMLLINT := $(shell command -v xmllint 2>/dev/null || command -v /usr/bin/xmllint 2>/dev/null || command -v /mingw64/bin/xmllint 2>/dev/null)
 
 # Format configuration
 XML_FILES := $(shell find $(XML_DIR) -type f -name "*.xml" 2>/dev/null)
@@ -19,6 +20,8 @@ init-content:
 	$(OSCAL_CLI) use $(OSCAL_CLI_VERSION)
 	$(OSCAL_CLI) server update
 	$(OSCAL_CLI) server start -bg
+	@(command -v xmllint >/dev/null 2>&1 || (command -v apt-get >/dev/null 2>&1 && sudo apt-get install -y libxml2-utils) || (command -v brew >/dev/null 2>&1 && brew install libxml2) || (command -v choco >/dev/null 2>&1 && choco install xsltproc) || echo "Please install xmllint manually")
+
 
 # Generate content and perform conversions
 .PHONY: build-content
@@ -54,7 +57,7 @@ format-xml:
 	@echo "Formatting XML files..."
 	@for file in $(XML_FILES); do \
 		echo "Formatting $$file..."; \
-		xmllint --format --output "$$file" "$$file"; \
+		$(XMLLINT) --format --output "$$file" "$$file"; \
 	done
 
 .PHONY: format-json