|
40 | 40 | DefaultEnvironment,
|
41 | 41 | )
|
42 | 42 |
|
43 |
| -from platformio import fs, __version__ |
| 43 | +from platformio import fs |
44 | 44 | from platformio.compat import IS_WINDOWS
|
45 | 45 | from platformio.proc import exec_command
|
46 | 46 | from platformio.builder.tools.piolib import ProjectAsLibBuilder
|
47 | 47 | from platformio.project.config import ProjectConfig
|
48 | 48 | from platformio.package.version import get_original_version, pepver_to_semver
|
49 | 49 |
|
50 |
| -# Added to avoid conflicts between installed Python packages from |
51 |
| -# the IDF virtual environment and PlatformIO Core |
52 |
| -# Note: This workaround can be safely deleted when PlatformIO 6.1.7 is released |
53 |
| -if os.environ.get("PYTHONPATH"): |
54 |
| - del os.environ["PYTHONPATH"] |
55 | 50 |
|
56 | 51 | env = DefaultEnvironment()
|
57 | 52 | env.SConscript("_embed_files.py", exports="env")
|
@@ -1839,12 +1834,21 @@ def get_python_exe():
|
1839 | 1834 | LIBSOURCE_DIRS=[os.path.join(ARDUINO_FRAMEWORK_DIR, "libraries")]
|
1840 | 1835 | )
|
1841 | 1836 |
|
| 1837 | +# Set ESP-IDF version environment variables (needed for proper Kconfig processing) |
| 1838 | +framework_version = get_framework_version() |
| 1839 | +major_version = framework_version.split('.')[0] + '.' + framework_version.split('.')[1] |
| 1840 | +os.environ["ESP_IDF_VERSION"] = major_version |
| 1841 | + |
| 1842 | +# Configure CMake arguments with ESP-IDF version |
1842 | 1843 | extra_cmake_args = [
|
1843 | 1844 | "-DIDF_TARGET=" + idf_variant,
|
1844 | 1845 | "-DPYTHON_DEPS_CHECKED=1",
|
1845 | 1846 | "-DEXTRA_COMPONENT_DIRS:PATH=" + ";".join(extra_components),
|
1846 | 1847 | "-DPYTHON=" + get_python_exe(),
|
1847 | 1848 | "-DSDKCONFIG=" + SDKCONFIG_PATH,
|
| 1849 | + f"-DESP_IDF_VERSION={major_version}", |
| 1850 | + f"-DESP_IDF_VERSION_MAJOR={framework_version.split('.')[0]}", |
| 1851 | + f"-DESP_IDF_VERSION_MINOR={framework_version.split('.')[1]}", |
1848 | 1852 | ]
|
1849 | 1853 |
|
1850 | 1854 | # This will add the linker flag for the map file
|
|
0 commit comments