Merge "bug 451 clone pyangbind from a fork that solves empty yang type error"

[osm/IM.git] / Makefile

diff --git a/Makefile b/Makefile
index 5f3b235..666c9df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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
 %.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|<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
 
 %.rec.tree.txt: $(TREES_DIR)
        $(Q)echo generating $@ from $*.yang


@@ -72,6 +74,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
 %.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|<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)mv $(TREES_DIR)/$@ $(TREES_DIR)/$*.html
 
 $(RW_PB_EXT):


@@ -82,8 +86,8 @@ package:
        tox -e build
 
 pyangbind: pyang
        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
 
        mkdir -p deb_dist
        cp pyangbind/deb_dist/*.deb deb_dist