blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 09:39:10 -04:00
Code Issues Projects Releases Wiki Activity

refactor(idf_tools): IDF version is acquired only from version or header file

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/13385
This commit is contained in:
Jakub Kocka 2024-03-18 13:22:36 +01:00
parent 9f7eacb089
commit 13fea024e5
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/idf_tools.py
View File

@ -1362,44 +1362,33 @@ def get_python_exe_and_subdir() -> Tuple[str, str]:
def get_idf_version() -> str: def get_idf_version() -> str:
version_file_path = os.path.join(global_idf_path, 'version.txt') # type: ignore """
Return ESP-IDF version.
"""
idf_version: Optional[str] = None
version_file_path = os.path.join(str(global_idf_path), 'version.txt')
if os.path.exists(version_file_path): if os.path.exists(version_file_path):
with open(version_file_path, 'r') as version_file: with open(version_file_path, 'r') as version_file:
idf_version_str = version_file.read() idf_version_str = version_file.read()
else:
idf_version_str = '' match = re.match(r'^v([0-9]+\.[0-9]+).*', idf_version_str)
if match:
idf_version = match.group(1)
if idf_version is None:
try: try:
idf_version_str = subprocess.check_output(['git', 'describe'], with open(os.path.join(str(global_idf_path), 'components', 'esp_common', 'include', 'esp_idf_version.h')) as f:
cwd=global_idf_path, env=os.environ,
stderr=subprocess.DEVNULL).decode()
except OSError:
# OSError should cover FileNotFoundError and WindowsError
warn('Git was not found')
except subprocess.CalledProcessError:
# This happens quite often when the repo is shallow. Don't print a warning because there are other
# possibilities for version detection.
pass
match = re.match(r'^v([0-9]+\.[0-9]+).*', idf_version_str)
if match:
idf_version = match.group(1) # type: Optional[str]
else:
idf_version = None
# fallback when IDF is a shallow clone
try:
with open(os.path.join(global_idf_path, 'components', 'esp_common', 'include', 'esp_idf_version.h')) as f: # type: ignore
m = re.search(r'^#define\s+ESP_IDF_VERSION_MAJOR\s+(\d+).+?^#define\s+ESP_IDF_VERSION_MINOR\s+(\d+)', m = re.search(r'^#define\s+ESP_IDF_VERSION_MAJOR\s+(\d+).+?^#define\s+ESP_IDF_VERSION_MINOR\s+(\d+)',
f.read(), re.DOTALL | re.MULTILINE) f.read(), re.DOTALL | re.MULTILINE)
if m: if m:
idf_version = '.'.join((m.group(1), m.group(2))) idf_version = '.'.join((m.group(1), m.group(2)))
else: else:
warn('Reading IDF version from C header file failed!') fatal('Reading IDF version from C header file failed!')
raise SystemExit(1)
except Exception as e: except Exception as e:
warn('Is it not possible to determine the IDF version: {}'.format(e)) fatal(f'It is not possible to determine the IDF version: {e}')
raise SystemExit(1)
if idf_version is None:
fatal('IDF version cannot be determined')
raise SystemExit(1)
return idf_version return idf_version