Merge branch 'bugfix/use_local_kconfiglib_v3.2' into 'release/v3.2'

Use kconfiglib from $IDF_PATH/tools/kconfig_new (v3.2)

See merge request espressif/esp-idf!6081
This commit is contained in:
Angus Gratton 2019-09-13 14:48:04 +08:00
commit 43def55de8
3 changed files with 18 additions and 3 deletions

View File

@ -29,8 +29,12 @@ import tempfile
import json
import gen_kconfig_doc
import kconfiglib
import pprint
try:
from . import kconfiglib
except Exception:
sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
import kconfiglib
__version__ = "0.1"

View File

@ -6,12 +6,17 @@
from __future__ import print_function
import argparse
import json
import kconfiglib
import os
import sys
import confgen
from confgen import FatalError, __version__
try:
from . import kconfiglib
except Exception:
sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
import kconfiglib
def main():
parser = argparse.ArgumentParser(description='confserver.py v%s - Config Generation Tool' % __version__, prog=os.path.basename(sys.argv[0]))

View File

@ -23,7 +23,13 @@
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 = ' '