X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=Makefile;h=b543314f6c9aa2dbf17e27275063bc0d6aefd2d6;hp=26e38432e137ab23286ad9fb36a69f147beeffe9;hb=1dbd25781e9ab9ecd6d024067be200d9faee0ffd;hpb=ce4a73dd085130a30440c749ee7ec6bdd67f9d2c

diff --git a/Makefile b/Makefile
index 26e3843..b543314 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 # Copyright 2017 Sandvine
+# Copyright 2017-2018 Telefonica
 # All Rights Reserved.
 # 
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -22,7 +23,6 @@ PYBINDPLUGIN:=$(shell /usr/bin/env python3 -c \
 YANG_DESC_MODELS := vnfd nsd
 YANG_RECORD_MODELS := vnfr nsr
 PYTHON_MODELS := $(addsuffix .py, $(YANG_DESC_MODELS))
-PYTHON_JSONSCHEMAS := $(addsuffix .jsonschema, $(YANG_DESC_MODELS))
 YANG_DESC_TREES := $(addsuffix .tree.txt, $(YANG_DESC_MODELS))
 YANG_DESC_JSTREES := $(addsuffix .html, $(YANG_DESC_MODELS))
 YANG_RECORD_TREES := $(addsuffix .rec.tree.txt, $(YANG_RECORD_MODELS))
@@ -36,7 +36,7 @@ Q?=@
 
 PYANG_OPTIONS := -Werror
 
-all: $(PYTHON_MODELS) pyangbind trees
+all: $(PYTHON_MODELS) trees
 	$(MAKE) package
 
 trees: $(YANG_DESC_TREES) $(YANG_DESC_JSTREES) $(YANG_RECORD_TREES) $(YANG_RECORD_JSTREES)
@@ -52,10 +52,6 @@ $(TREES_DIR):
 	$(Q)echo generating $@ from $*.yang
 	$(Q)pyang $(PYANG_OPTIONS) --path build/yang --path $(MODEL_DIR) --plugindir $(PYBINDPLUGIN) -f pybind -o $(OUT_DIR)/$@ $(MODEL_DIR)/$*.yang
 
-%.jsonschema: $(OUT_DIR) $(RW_PB_EXT) pyang-json-schema-plugin
-	$(Q)echo generating $@ from $*.yang
-	$(Q)pyang $(PYANG_OPTIONS) --path build/yang --path $(MODEL_DIR) --plugindir pyang-json-schema-plugin -f json-schema -o $(OUT_DIR)/$@ $(MODEL_DIR)/$*.yang
-
 %.tree.txt: $(TREES_DIR)
 	$(Q)echo generating $@ from $*.yang
 	$(Q)pyang $(PYANG_OPTIONS) --path build/yang --path $(MODEL_DIR) -f tree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang
@@ -85,27 +81,7 @@ $(RW_PB_EXT):
 package:
 	tox -e build
 	tox -e build3
-
-pyangbind: pyang
-	git clone https://github.com/alf-tierno/pyangbind
-	cd pyangbind; git checkout issue151; \
-       python setup.py --command-packages=stdeb.command bdist_deb; \
-       python3 setup.py --command-packages=stdeb.command bdist_deb; \
-       cd ..
-	mkdir -p deb_dist
-	cp pyangbind/deb_dist/*.deb deb_dist
-
-pyang:
-	git clone https://github.com/mbj4668/pyang
-	cd pyang; \
-       python setup.py --command-packages=stdeb.command bdist_deb;  \
-       python3 setup.py --command-packages=stdeb.command bdist_deb;  \
-       cd ..
-	mkdir -p deb_dist
-	cp pyang/deb_dist/*.deb deb_dist
-
-pyang-json-schema-plugin:
-	git clone https://github.com/cmoberg/pyang-json-schema-plugin
+	./build-docs.sh
 
 clean:
-	$(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz pyang pyangbind pyang-json-schema-plugin $(OUT_DIR) $(TREES_DIR)
+	$(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz $(OUT_DIR) $(TREES_DIR)