Removed pyangbind and pyang deb pkg from Makefile

[osm/IM.git] / Makefile

diff --git a/Makefile b/Makefile
index 666c9df..22df56d 100644 (file)
--- 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,8 +17,8 @@
 # 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
@@ -36,7 +37,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)
@@ -84,21 +85,11 @@ $(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
+       tox -e build3
+       ./build-docs.sh
 
 pyang-json-schema-plugin:
        git clone https://github.com/cmoberg/pyang-json-schema-plugin
 
 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 pyang-json-schema-plugin $(OUT_DIR) $(TREES_DIR)