From f3c839e2a97ec3bcf918a69685e2959576dd5d7e Mon Sep 17 00:00:00 2001 From: garciaale Date: Mon, 4 Jan 2021 15:14:49 -0300 Subject: [PATCH] Fixes bug 1395 by specifying an augments directory on pyang tree command Change-Id: I0ad0d6ac4164fd8cde623dc26e65d04e78a1cfe0 Signed-off-by: garciaale --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 325fd9d..be0faa3 100644 --- a/Makefile +++ b/Makefile @@ -62,12 +62,14 @@ $(TREES_DIR): %.tree.txt: $(TREES_DIR) yang-ietf $(Q)echo generating $@ from $*.yang $(if $(findstring etsi,$@), $(eval DIR=$(SOL006_MODEL_DIR)),$(eval DIR = $(MODEL_DIR))) - $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) -f tree -o $(TREES_DIR)/$@ $(DIR)/$*.yang + $(if $(findstring etsi,$@), $(eval AUGMENTS_DIR=$(SOL006_AUGMENTS_DIR)),$(eval AUGMENTS_DIR=)) + $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) -f tree -o $(TREES_DIR)/$@ $(DIR)/$*.yang $(AUGMENTS_DIR) %.html: $(TREES_DIR) yang-ietf $(Q)echo generating $@ from $*.yang $(if $(findstring etsi,$@), $(eval DIR=$(SOL006_MODEL_DIR)),$(eval DIR = $(MODEL_DIR))) - $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) -f jstree -o $(TREES_DIR)/$@ $(DIR)/$*.yang + $(if $(findstring etsi,$@), $(eval AUGMENTS_DIR=$(SOL006_AUGMENTS_DIR)),$(eval AUGMENTS_DIR=)) + $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) -f jstree -o $(TREES_DIR)/$@ $(DIR)/$*.yang $(AUGMENTS_DIR) $(Q)sed -r -i 's|data\:image/gif\;base64,R0lGODlhS.*RCAA7|https://osm.etsi.org/images/OSM-logo.png\" width=\"175\" height=\"60|g' $(TREES_DIR)/$@ $(Q)sed -r -i 's|||g' $(TREES_DIR)/$@ -- 2.17.1