X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=Makefile;h=0d12dc08266d0fcd09b9778c0e582e98730f3108;hp=22df56d6566b318270c6c551762449a57f798a98;hb=4cdeebbdd947e007154a67ec3c467868791a39ce;hpb=e6ba40aa913089e6fd057dce5ad34879ee4303ce

diff --git a/Makefile b/Makefile
index 22df56d..0d12dc0 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@
 
 # NOTE: pyang and pyangbind are required for build
 
+.PHONY: all clean package trees deps
 PYANG:= pyang
 PYBINDPLUGIN:=$(shell /usr/bin/env python3 -c \
 	            'import pyangbind; import os; print("{}/plugin".format(os.path.dirname(pyangbind.__file__)))')
@@ -23,7 +24,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))
@@ -32,7 +32,6 @@ YANG_RECORD_JSTREES := $(addsuffix .rec.html, $(YANG_RECORD_MODELS))
 OUT_DIR := osm_im
 TREES_DIR := osm_im_trees
 MODEL_DIR := models/yang
-RW_PB_EXT := build/yang/rw-pb-ext.yang
 Q?=@
 
 PYANG_OPTIONS := -Werror
@@ -49,47 +48,45 @@ $(OUT_DIR):
 $(TREES_DIR):
 	$(Q)mkdir -p $(TREES_DIR)
 
-%.py: $(OUT_DIR) $(RW_PB_EXT)
+%.py: $(OUT_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
+	$(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) --plugindir $(PYBINDPLUGIN) -f pybind -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
+	$(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f tree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang
 
 %.html: $(TREES_DIR)
 	$(Q)echo generating $@ from $*.yang
-	$(Q)pyang $(PYANG_OPTIONS) --path build/yang --path $(MODEL_DIR) -f jstree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang
+	$(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f jstree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang
 	$(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|<a href=\"http://www.tail-f.com">|<a href="http://osm.etsi.org">|g' $(TREES_DIR)/$@
 
 %.rec.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
+	$(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f tree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang
 	$(Q)mv $(TREES_DIR)/$@ $(TREES_DIR)/$*.tree.txt
 
 %.rec.html: $(TREES_DIR)
 	$(Q)echo generating $@ from $*.yang
-	$(Q)pyang $(PYANG_OPTIONS) --path build/yang --path $(MODEL_DIR) -f jstree -o $(TREES_DIR)/$@ $(MODEL_DIR)/rw-project.yang $(MODEL_DIR)/$*.yang
+	$(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f jstree -o $(TREES_DIR)/$@ $(MODEL_DIR)/rw-project.yang $(MODEL_DIR)/$*.yang
 	$(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|<a href=\"http://www.tail-f.com">|<a href="http://osm.etsi.org">|g' $(TREES_DIR)/$@
 	$(Q)mv $(TREES_DIR)/$@ $(TREES_DIR)/$*.html
 
-$(RW_PB_EXT):
-	$(Q)mkdir -p $$(dirname $@)
-	$(Q)wget -q https://raw.githubusercontent.com/RIFTIO/RIFT.ware/RIFT.ware-4.4.1/modules/core/util/yangtools/yang/rw-pb-ext.yang -O $@
-
 package:
 	tox -e build
 	tox -e build3
 	./build-docs.sh
 
-pyang-json-schema-plugin:
-	git clone https://github.com/cmoberg/pyang-json-schema-plugin
+deps:
+	$(Q)sudo apt-get -y install git make wget python python-pip debhelper dh-make tox python3 python3-pip maven
+	$(Q)sudo -H python3 -m pip install -U pip
+	$(Q)sudo -H python2 -m pip install -U pip
+	$(Q)sudo -H python3 -m pip install -U pyang pyangbind stdeb
+	$(Q)sudo -H python2 -m pip install -U pyang pyangbind stdeb
+	$(Q)mkdir -p ~/.m2
+	$(Q)cp -n ~/.m2/settings.xml{,.orig} ; wget -q -O - https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml > ~/.m2/settings.xml
 
 clean:
-	$(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz pyang-json-schema-plugin $(OUT_DIR) $(TREES_DIR)
+	$(Q)rm -rf dist osm_im.egg-info deb deb_dist *.gz $(OUT_DIR) $(TREES_DIR)