X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=Makefile;h=b543314f6c9aa2dbf17e27275063bc0d6aefd2d6;hp=0d4ff593f4a7f5d2234e71f7b8a3ec2582683123;hb=1dbd25781e9ab9ecd6d024067be200d9faee0ffd;hpb=a0c88dcc52421e9821cb4f4549c47e222e762098
diff --git a/Makefile b/Makefile
index 0d4ff59..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
@@ -16,13 +17,12 @@
# NOTE: pyang and pyangbind are required for build
PYANG:= pyang
-PYBINDPLUGIN:=$(shell /usr/bin/env python -c \
- 'import pyangbind; import os; print "%s/plugin" % os.path.dirname(pyangbind.__file__)')
+PYBINDPLUGIN:=$(shell /usr/bin/env python3 -c \
+ 'import pyangbind; import os; print("{}/plugin".format(os.path.dirname(pyangbind.__file__)))')
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
+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
@@ -63,6 +59,8 @@ $(TREES_DIR):
%.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)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)/$@
%.rec.tree.txt: $(TREES_DIR)
$(Q)echo generating $@ from $*.yang
@@ -72,6 +70,8 @@ $(TREES_DIR):
%.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)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)/$@
$(Q)mv $(TREES_DIR)/$@ $(TREES_DIR)/$*.html
$(RW_PB_EXT):
@@ -80,21 +80,8 @@ $(RW_PB_EXT):
package:
tox -e build
-
-pyangbind: pyang
- git clone https://github.com/alf-tierno/pyangbind
- cd pyangbind; git checkout issue151; python 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; 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
+ tox -e build3
+ ./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)