Use kconfiglib from $IDF_PATH/tools/kconfig_new

diff --git a/tools/kconfig_new/confgen.py b/tools/kconfig_new/confgen.py
index 0af2be1bcc36a183bfd209ef6293c0a62942ab07..11b3427e77334f0a3a7404a82de1e8963566c4d0 100755 (executable)
--- a/tools/kconfig_new/confgen.py
+++ b/tools/kconfig_new/confgen.py
@@ -30,7 +30,12 @@ import sys
 import tempfile
 
 import gen_kconfig_doc
-import kconfiglib
+
+try:
+    from . import kconfiglib
+except Exception:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+    import kconfiglib
 
 __version__ = "0.1"
 

diff --git a/tools/kconfig_new/confserver.py b/tools/kconfig_new/confserver.py
index cddb572c92208f3036b867d7f459946c7e6cf308..b02a2f1ceb5c9d9db5c42c3f84706af6c7c4f242 100755 (executable)
--- a/tools/kconfig_new/confserver.py
+++ b/tools/kconfig_new/confserver.py
@@ -7,12 +7,17 @@ from __future__ import print_function
 import argparse
 import confgen
 import json
-import kconfiglib
 import os
 import sys
 import tempfile
 from confgen import FatalError, __version__
 
+try:
+    from . import kconfiglib
+except Exception:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+    import kconfiglib
+
 # Min/Max supported protocol versions
 MIN_PROTOCOL_VERSION = 1
 MAX_PROTOCOL_VERSION = 2

diff --git a/tools/kconfig_new/gen_kconfig_doc.py b/tools/kconfig_new/gen_kconfig_doc.py
index 6d6d7b1fafe81ab62a6e26a00a0c1975432da1f3..5d9f41c0c1c530f56ab9d437c5640450f99b68f9 100644 (file)
--- a/tools/kconfig_new/gen_kconfig_doc.py
+++ b/tools/kconfig_new/gen_kconfig_doc.py
@@ -21,8 +21,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import print_function
+import os
 import re
-import kconfiglib
+import sys
+
+try:
+    from . import kconfiglib
+except Exception:
+    sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
+    import kconfiglib
 
 # Indentation to be used in the generated file
 INDENT = '    '

diff --git a/tools/ldgen/sdkconfig.py b/tools/ldgen/sdkconfig.py
index 943013dfcf81e593245cd676eea3a0aa8dc6b5b6..28ea6b0f45457c63a53ff6f54ca460b7bf91574d 100644 (file)
--- a/tools/ldgen/sdkconfig.py
+++ b/tools/ldgen/sdkconfig.py
@@ -19,11 +19,11 @@ from pyparsing import Word, alphanums, printables, Combine, Literal, hexnums, qu
 
 import sys
 try:
-    import kconfiglib
-except ImportError:
+    from . import kconfiglib
+except Exception:
     parent_dir_name = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
     kconfig_new_dir = os.path.abspath(parent_dir_name + "/kconfig_new")
-    sys.path.append(kconfig_new_dir)
+    sys.path.insert(0, kconfig_new_dir)
     import kconfiglib