From: hoban Date: Thu, 8 Feb 2018 08:53:47 +0000 (+0100) Subject: Merge "bug 451 clone pyangbind from a fork that solves empty yang type error" X-Git-Tag: v3.0.3^0 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=a045a713f915883fbf6f629eb895bc9e1f9b2ccd;hp=-c Merge "bug 451 clone pyangbind from a fork that solves empty yang type error" --- a045a713f915883fbf6f629eb895bc9e1f9b2ccd diff --combined Makefile index 9315342,0d4ff59..666c9df --- a/Makefile +++ b/Makefile @@@ -63,8 -63,6 +63,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 @@@ -74,8 -72,6 +74,8 @@@ %.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): @@@ -86,8 -82,8 +86,8 @@@ package tox -e build pyangbind: pyang - git clone https://github.com/robshakir/pyangbind - cd pyangbind; python setup.py --command-packages=stdeb.command bdist_deb; cd .. + 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