put all exports in exports dir

Put all exports in the same directory

Author: nedmsmith

.github/workflows/makefile.yml

@@ -22,4 +22,4 @@ jobs:
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         files: |
-          ./exports/coev.cddl ./*-autogen.cddl
+          ./exports/*.cddl

.gitignore

@@ -1,3 +1,2 @@
-*-autogen.cddl
+./cddl/*-autogen.cddl
 draft-ietf-rats-corim
-exports/ce.cddl

Makefile

@@ -2,23 +2,27 @@
 
 SHELL := /bin/bash
 
-IMPORTS_DIR := imports/
-export EXPORTS_DIR := exports/
 CE_DIR := ./
+IMPORTS_DIR := $(CE_DIR)imports/
+EXPORTS_DIR := $(CE_DIR)exports/
 
 include tools.mk
 include funcs.mk
 
 # Get imports frags - no dependencies
 include $(IMPORTS_DIR)import-frags.mk
 IMPORT_DEPS := $(addprefix $(IMPORTS_DIR), $(IMPORT_FRAGS))
-
-check:: check-cose check-cose-examples
-check:: check-eat check-eat-examples
-check:: check-comidx check-comidx-examples
-check:: check-spdm check-spdm-examples
-check:: check-ce check-ce-examples
-check:: exp-coev
+COSE:=cose
+SPDM:=spdm
+CE:=ce
+COMIDX:=comidx
+EAT:=eat
+check:: check-$(COSE) check-$(COSE)-examples
+check:: check-$(EAT) check-$(EAT)-examples
+check:: check-$(COMIDX) check-$(COMIDX)-examples
+check:: check-$(SPDM) check-$(SPDM)-examples
+check:: check-$(CE) check-$(CE)-examples
+check:: export-all
 
 include $(CE_DIR)ce-frags.mk
 CE_DEPS := $(addprefix $(CE_DIR), $(CE_FRAGS))
@@ -29,23 +33,23 @@ SPDM_FRAGS += $(IMPORT_DEPS)
 
 SPDM_EXAMPLES := $(wildcard examples/spdm-*.diag) # spdm toc example filenames have 'spdm-' prefix
 
-$(eval $(call cddl_check_template,spdm,$(SPDM_FRAGS),$(SPDM_EXAMPLES),$(SPDM_START)))
+$(eval $(call cddl_check_template,$(SPDM),$(SPDM_FRAGS),$(SPDM_EXAMPLES),$(SPDM_START)))
 
 EV_START := tagged-concise-evidence
 EV_FRAGS += $(CE_DEPS)
 EV_FRAGS += $(IMPORT_DEPS)
 
 EV_EXAMPLES := $(wildcard examples/ce-*.diag) # concise-evidence example filenames have 'ce-' prefix
 
-$(eval $(call cddl_check_template,ce,$(EV_FRAGS),$(EV_EXAMPLES),$(EV_START)))
+$(eval $(call cddl_check_template,$(CE),$(EV_FRAGS),$(EV_EXAMPLES),$(EV_START)))
 
 COMID_X_START := concise-mid-tag
 COMID_X_FRAGS += $(CE_DEPS)
 COMID_X_FRAGS += $(IMPORT_DEPS)
 
 COMID_X_EXAMPLES := $(wildcard examples/comid-*.diag) # concise-mid-tag example filenames have 'comid-' prefix
 
-$(eval $(call cddl_check_template,comidx,$(COMID_X_FRAGS),$(COMID_X_EXAMPLES),$(COMID_X_START)))
+$(eval $(call cddl_check_template,$(COMIDX),$(COMID_X_FRAGS),$(COMID_X_EXAMPLES),$(COMID_X_START)))
 
 EAT_START := cwt-eat
 EAT_FRAGS += $(CE_DEPS)
@@ -54,7 +58,7 @@ EAT_FRAGS += cwt-eat.cddl
 
 EAT_EXAMPLES := $(wildcard examples/eat-*.diag) # eat example filenames have 'eat-' prefix
 
-$(eval $(call cddl_check_template,eat,$(EAT_FRAGS),$(EAT_EXAMPLES),$(EAT_START)))
+$(eval $(call cddl_check_template,$(EAT),$(EAT_FRAGS),$(EAT_EXAMPLES),$(EAT_START)))
 
 COSE_START := signed-cwt
 COSE_FRAGS += $(CE_DEPS)
@@ -63,14 +67,29 @@ COSE_FRAGS += cwt-eat.cddl
 
 COSE_EXAMPLES := $(wildcard examples/cose-*.diag) # signed cwt example filenames have 'cose-' prefix
 
-$(eval $(call cddl_check_template,cose,$(COSE_FRAGS),$(COSE_EXAMPLES),$(COSE_START)))
+$(eval $(call cddl_check_template,$(COSE),$(COSE_FRAGS),$(COSE_EXAMPLES),$(COSE_START)))
 
 $(IMPORT_DEPS): check-imports
 
 check-imports:
 	$(MAKE) -C $(IMPORTS_DIR)
 
-# Make coev.cddl export file - used by cddl-releases
+# Make exports - used by cddl-releases
 $(eval $(call cddl_exp_template,coev,$(CE_DEPS),$(EXPORTS_DIR),$(IMPORT_FRAGS)))
+AUTOGEN_FRAGS := $(addprefix $(CE_DIR), $(COSE)-autogen.cddl)
+AUTOGEN_FRAGS += $(addprefix $(CE_DIR), $(SPDM)-autogen.cddl)
+AUTOGEN_FRAGS += $(addprefix $(CE_DIR), $(CE)-autogen.cddl)
+AUTOGEN_FRAGS += $(addprefix $(CE_DIR), $(COMIDX)-autogen.cddl)
+AUTOGEN_FRAGS += $(addprefix $(CE_DIR), $(EAT)-autogen.cddl)
+
+AUTOGEN_EXPORTS := $(addprefix $(EXPORTS_DIR), $(COSE)-autogen.cddl)
+AUTOGEN_EXPORTS += $(addprefix $(EXPORTS_DIR), $(SPDM)-autogen.cddl)
+AUTOGEN_EXPORTS += $(addprefix $(EXPORTS_DIR), $(CE)-autogen.cddl)
+AUTOGEN_EXPORTS += $(addprefix $(EXPORTS_DIR), $(COMIDX)-autogen.cddl)
+AUTOGEN_EXPORTS += $(addprefix $(EXPORTS_DIR), $(EAT)-autogen.cddl)
+
+export-all: exp-coev check-$(COSE) check-$(COMIDX) check-$(SPDM) check-$(CE) check-$(EAT)
+	cp $(AUTOGEN_FRAGS) $(EXPORTS_DIR)
+CLEANFILES += $(AUTOGEN_EXPORTS)
 
 clean: ; rm -f $(CLEANFILES); $(MAKE) -C $(IMPORTS_DIR) clean