Merge branch 'feature/tools_installer_v2.2' into 'master'
tools: bump windows tools installer version to v2.2 Closes IDFGH-2036 and IDFGH-2202 See merge request espressif/esp-idf!6999
This commit is contained in:
commit
433d046a2a
|
@ -24,7 +24,7 @@ ESP-IDF Tools Installer
|
||||||
|
|
||||||
The easiest way to install ESP-IDF's prerequisites is to download the ESP-IDF Tools installer from this URL:
|
The easiest way to install ESP-IDF's prerequisites is to download the ESP-IDF Tools installer from this URL:
|
||||||
|
|
||||||
https://dl.espressif.com/dl/esp-idf-tools-setup-2.1.exe
|
https://dl.espressif.com/dl/esp-idf-tools-setup-2.2.exe
|
||||||
|
|
||||||
The installer includes the cross-compilers, OpenOCD, cmake_ and Ninja_ build tool. The installer can also download and run installers for Python_ 3.7 and `Git For Windows`_ if they are not already installed on the computer.
|
The installer includes the cross-compilers, OpenOCD, cmake_ and Ninja_ build tool. The installer can also download and run installers for Python_ 3.7 and `Git For Windows`_ if they are not already installed on the computer.
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ ESP-IDF 工具安装器
|
||||||
|
|
||||||
要安装 ESP-IDF 必备工具,最简易的方式是下载 ESP-IDF 工具安装器,地址如下:
|
要安装 ESP-IDF 必备工具,最简易的方式是下载 ESP-IDF 工具安装器,地址如下:
|
||||||
|
|
||||||
https://dl.espressif.com/dl/esp-idf-tools-setup-2.0.exe
|
https://dl.espressif.com/dl/esp-idf-tools-setup-2.2.exe
|
||||||
|
|
||||||
本安装器可为您安装所需的交叉编译器、OpenOCD、cmake_ 和 Ninja_ 编译工具,以及一款 mconf-idf_ 配置工具。此外,本安装器还可在有需要时下载、运行 Python_ 3.7 和 `Git For Windows` 的安装器。
|
本安装器可为您安装所需的交叉编译器、OpenOCD、cmake_ 和 Ninja_ 编译工具,以及一款 mconf-idf_ 配置工具。此外,本安装器还可在有需要时下载、运行 Python_ 3.7 和 `Git For Windows` 的安装器。
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#include <idp.iss>
|
#include <idp.iss>
|
||||||
|
|
||||||
#define MyAppName "ESP-IDF Tools"
|
#define MyAppName "ESP-IDF Tools"
|
||||||
#define MyAppVersion "2.1"
|
#define MyAppVersion "2.2"
|
||||||
#define MyAppPublisher "Espressif Systems (Shanghai) Co. Ltd."
|
#define MyAppPublisher "Espressif Systems (Shanghai) Co. Ltd."
|
||||||
#define MyAppURL "https://github.com/espressif/esp-idf"
|
#define MyAppURL "https://github.com/espressif/esp-idf"
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ Type: filesandordirs; Name: "{app}\dist"
|
||||||
Type: filesandordirs; Name: "{app}\releases"
|
Type: filesandordirs; Name: "{app}\releases"
|
||||||
Type: filesandordirs; Name: "{app}\tools"
|
Type: filesandordirs; Name: "{app}\tools"
|
||||||
Type: filesandordirs; Name: "{app}\python_env"
|
Type: filesandordirs; Name: "{app}\python_env"
|
||||||
Type: files; Name: "{autostartmenu}\Programs\ESP-IDF\{#IDFCmdExeShortcutFile}"
|
Type: files; Name: "{group}\{#IDFCmdExeShortcutFile}"
|
||||||
Type: files; Name: "{autodesktop}\{#IDFCmdExeShortcutFile}"
|
Type: files; Name: "{autodesktop}\{#IDFCmdExeShortcutFile}"
|
||||||
|
|
||||||
[Tasks]
|
[Tasks]
|
||||||
|
@ -84,7 +84,7 @@ Name: wdexcl; Description: "Register the ESP-IDF Tools executables as Windows De
|
||||||
[Run]
|
[Run]
|
||||||
Filename: "{app}\dist\{#PythonInstallerName}"; Parameters: "/passive PrependPath=1 InstallLauncherAllUsers=0 Include_dev=0 Include_tcltk=0 Include_launcher=0 Include_test=0 Include_doc=0"; Description: "Installing Python"; Check: PythonInstallRequired
|
Filename: "{app}\dist\{#PythonInstallerName}"; Parameters: "/passive PrependPath=1 InstallLauncherAllUsers=0 Include_dev=0 Include_tcltk=0 Include_launcher=0 Include_test=0 Include_doc=0"; Description: "Installing Python"; Check: PythonInstallRequired
|
||||||
Filename: "{app}\dist\{#GitInstallerName}"; Parameters: "/silent /tasks="""" /norestart"; Description: "Installing Git"; Check: GitInstallRequired
|
Filename: "{app}\dist\{#GitInstallerName}"; Parameters: "/silent /tasks="""" /norestart"; Description: "Installing Git"; Check: GitInstallRequired
|
||||||
Filename: "{autostartmenu}\Programs\ESP-IDF\{#IDFCmdExeShortcutFile}"; Flags: postinstall shellexec; Description: "Run ESP-IDF Command Prompt (cmd.exe)"; Check: InstallationSuccessful
|
Filename: "{group}\{#IDFCmdExeShortcutFile}"; Flags: postinstall shellexec; Description: "Run ESP-IDF Command Prompt (cmd.exe)"; Check: InstallationSuccessful
|
||||||
|
|
||||||
[UninstallRun]
|
[UninstallRun]
|
||||||
Filename: "powershell.exe"; \
|
Filename: "powershell.exe"; \
|
||||||
|
|
|
@ -35,11 +35,6 @@ $retVal = 1
|
||||||
|
|
||||||
Try
|
Try
|
||||||
{
|
{
|
||||||
#check the Defender module availability
|
|
||||||
if (!(Get-Module "Defender")) {
|
|
||||||
Write-Output "Windows Defender module not available, aborting"
|
|
||||||
[Environment]::Exit(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
Import-Module Defender
|
Import-Module Defender
|
||||||
|
|
||||||
|
@ -59,7 +54,6 @@ Try
|
||||||
if( [string]::IsNullOrEmpty($logFile) ) {
|
if( [string]::IsNullOrEmpty($logFile) ) {
|
||||||
$tempFileName = Get-Date -UFormat "%Y%m%d%H%M%s"
|
$tempFileName = Get-Date -UFormat "%Y%m%d%H%M%s"
|
||||||
$lf = Join-Path -Path $env:TEMP -ChildPath "WDEspLog$tempFileName.log"
|
$lf = Join-Path -Path $env:TEMP -ChildPath "WDEspLog$tempFileName.log"
|
||||||
#Write-Output "Logfile: $lf"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$newProcess = new-object System.Diagnostics.ProcessStartInfo "PowerShell"
|
$newProcess = new-object System.Diagnostics.ProcessStartInfo "PowerShell"
|
||||||
|
@ -77,7 +71,6 @@ Try
|
||||||
Remove-Item $lf
|
Remove-Item $lf
|
||||||
}
|
}
|
||||||
|
|
||||||
#Write-Output "Process finished with code " $proc.ExitCode
|
|
||||||
exit $proc.ExitCode
|
exit $proc.ExitCode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,13 +88,6 @@ Try
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#check the Defender module availability
|
|
||||||
$wdModuleDir = Join-Path -Path $env:SystemRoot -ChildPath "System32\WindowsPowerShell\v1.0\Modules\Defender"
|
|
||||||
if( -not (Test-Path -Path $wdModuleDir) ) {
|
|
||||||
Write-Output "Windows Defender module not found, aborting"
|
|
||||||
[Environment]::Exit($retVal)
|
|
||||||
}
|
|
||||||
|
|
||||||
Import-Module Defender
|
Import-Module Defender
|
||||||
|
|
||||||
#self-elevation support
|
#self-elevation support
|
||||||
|
@ -119,7 +112,6 @@ Try
|
||||||
if( $bOwnLogFile ) {
|
if( $bOwnLogFile ) {
|
||||||
$tempFileName = Get-Date -UFormat "%Y%m%d%H%M%s"
|
$tempFileName = Get-Date -UFormat "%Y%m%d%H%M%s"
|
||||||
$lf = Join-Path -Path $env:TEMP -ChildPath "WDEspLog$tempFileName.log"
|
$lf = Join-Path -Path $env:TEMP -ChildPath "WDEspLog$tempFileName.log"
|
||||||
Write-Output "Logfile: $lf"
|
|
||||||
}
|
}
|
||||||
else { $lf = $logFile }
|
else { $lf = $logFile }
|
||||||
|
|
||||||
|
@ -164,37 +156,24 @@ Try
|
||||||
|
|
||||||
#ADD exclusion paths
|
#ADD exclusion paths
|
||||||
if( $bAddPath ) {
|
if( $bAddPath ) {
|
||||||
#foreach ($wdPath in $AddExclPath) {
|
|
||||||
# $pathsToExclude.Add( $wdPath )
|
|
||||||
#}
|
|
||||||
$pathsToExclude.Add( $AddExclPath )
|
$pathsToExclude.Add( $AddExclPath )
|
||||||
}
|
}
|
||||||
|
|
||||||
#ADD exclusion files
|
#ADD exclusion files
|
||||||
if( $bAddFile ) {
|
if( $bAddFile ) {
|
||||||
#foreach ($wdFile in $AddExclFile) {
|
|
||||||
# $filesToExclude.Add( $wdFile )
|
|
||||||
#}
|
|
||||||
$filesToExclude.Add( $AddExclFile )
|
$filesToExclude.Add( $AddExclFile )
|
||||||
}
|
}
|
||||||
|
|
||||||
#REMOVE exclusion paths
|
#REMOVE exclusion paths
|
||||||
if( $bRmPath ) {
|
if( $bRmPath ) {
|
||||||
#foreach ($wdPath in $RmExclPath) {
|
|
||||||
# $pathsToInclude.Add( $wdPath )
|
|
||||||
#}
|
|
||||||
$pathsToInclude.Add( $RmExclPath )
|
$pathsToInclude.Add( $RmExclPath )
|
||||||
}
|
}
|
||||||
|
|
||||||
#ADD exclusion file
|
#ADD exclusion file
|
||||||
if( $bAddFile ) {
|
if( $bAddFile ) {
|
||||||
#foreach ($wdFile in $RmExclFile) {
|
|
||||||
# $filesToRemove.Add( $wdFile )
|
|
||||||
#}
|
|
||||||
$filesToRemove.Add( $RmExclFile )
|
$filesToRemove.Add( $RmExclFile )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#default: throw exception
|
|
||||||
else {
|
else {
|
||||||
throw (New-Object -TypeName System.ArgumentException -ArgumentList "Mandatory parameter(s) missing")
|
throw (New-Object -TypeName System.ArgumentException -ArgumentList "Mandatory parameter(s) missing")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue