just make all-rvi list without being includes since it isn't working

riscv-admin · Nov 6, 2024 · ff42d13 · ff42d13
1 parent bf2f76e
commit ff42d13
Show file tree

Hide file tree

Showing 3 changed files with 351 additions and 14 deletions.
diff --git a/projects/rvi-repo-manifest/Makefile b/projects/rvi-repo-manifest/Makefile
@@ -16,16 +16,14 @@ ORGS_XML := $(addsuffix .xml, $(ORGS))
 
 .PHONY: build-xml build-all-rvi-orgs-xml
 
-default: build-all-rvi-orgs-xml
+default: build-xml $(ALL_ORGS_XML)
 
 build-xml:
 	$(MAKE) $(ORGS_XML)
 
-build-all-rvi-orgs-xml: build-xml
-	@echo '<?xml version="1.0" encoding="UTF-8"?>' > $(BUILD_DIR)/$(ALL_ORGS_XML)
-	@echo '<manifest>' >> $(BUILD_DIR)/$(ALL_ORGS_XML)
-	@for item in $(ORGS_XML); do echo "    <include name=\"$$item\" />" >> $(BUILD_DIR)/$(ALL_ORGS_XML); done
-	@echo '</manifest>' >> $(BUILD_DIR)/$(ALL_ORGS_XML)
+all-orgs-xml:
+	$(TOOL) $(BUILD_DIR)/$(ALL_ORGS_XML) $(ORGS)
+	cp _common.xml $(BUILD_DIR)/.
 
 %.xml:
 	$(TOOL) $(BUILD_DIR)/$@ $*

diff --git a/projects/rvi-repo-manifest/generate-manifests.sh b/projects/rvi-repo-manifest/generate-manifests.sh
@@ -46,7 +46,7 @@ xml_header='<?xml version="1.0" encoding="UTF-8"?>
 echo "$xml_header" > "$output_file"
 
 # Loop through each organization
-for org in "${org_list[@]}"; do
+for org in $org_list; do
     echo "Fetching repositories for organization: $org"
 
     # Get list of repositories for the organization