Merge branch 'bugfix/ps_export_extra_paths_v4.4' into 'release/v4.4'

tools: export.ps1: define functions for helper python tools (v4.4) See merge request espressif/esp-idf!25142
espressif · Aug 2, 2023 · 681f55b · 681f55b
2 parents 949739c + 2c79e03
commit 681f55b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/export.bat b/export.bat
@@ -47,6 +47,7 @@ if not "%PATH_ADDITIONS%"=="" echo     %PATH_ADDITIONS:;=&echo.    %
 DOSKEY idf.py=python.exe "%IDF_PATH%\tools\idf.py" $*
 DOSKEY esptool.py=python.exe "%IDF_PATH%\components\esptool_py\esptool\esptool.py" $*
 DOSKEY espefuse.py=python.exe "%IDF_PATH%\components\esptool_py\esptool\espefuse.py" $*
+DOSKEY espsecure.py=python.exe "%IDF_PATH%\components\esptool_py\esptool\espsecure.py" $*
 DOSKEY otatool.py=python.exe "%IDF_PATH%\components\app_update\otatool.py" $*
 DOSKEY parttool.py=python.exe "%IDF_PATH%\components\partition_table\parttool.py" $*
 

diff --git a/export.ps1 b/export.ps1
@@ -48,12 +48,11 @@ foreach ($pair  in $envars_array) {
 }
 
 # Allow calling some IDF python tools without specifying the full path
-# ${IDF_PATH}/tools is already added by 'idf_tools.py export'
-$IDF_ADD_PATHS_EXTRAS = [IO.Path]::Combine(${IDF_PATH}, "components", "esptool_py", "esptool")
-$IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "app_update")
-$IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "espcoredump")
-$IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "partition_table")
-$env:PATH = $IDF_ADD_PATHS_EXTRAS + $S + $env:PATH
+function idf.py { &python "$IDF_PATH\tools\idf.py" $args }
+function espefuse.py { &python "$IDF_PATH\components\esptool_py\esptool\espefuse.py" $args }
+function espsecure.py { &python "$IDF_PATH\components\esptool_py\esptool\espsecure.py" $args }
+function otatool.py { &python "$IDF_PATH\components\app_update\otatool.py" $args }
+function parttool.py { &python "$IDF_PATH\components\partition_table\parttool.py" $args }
 
 #Compare Path's OLD vs. NEW
 $NEW_PATH = $env:PATH.split($S) | Select-Object -Unique # array without duplicates