From 6b584a06a5c753be2ec6f340743db74bbfd0870d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraj=20Mich=C3=A1lek?= <juraj.michalek@espressif.com>
Date: Fri, 24 Sep 2021 09:14:23 +0200
Subject: [PATCH] use Eclipse without root folder

---
 Build-Installer.ps1             | 8 ++++----
 src/InnoSetup/Eclipse.iss       | 2 +-
 src/InnoSetup/IdfToolsSetup.iss | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Build-Installer.ps1 b/Build-Installer.ps1
index cbe6f75..8b3c8aa 100644
--- a/Build-Installer.ps1
+++ b/Build-Installer.ps1
@@ -124,10 +124,10 @@ function PrepareIdfPythonWheels {
 }
 
 function PrepareIdfEclipse {
-    PrepareIdfPackage -BasePath build\$InstallerType\tools\idf-eclipse\2021-06-R-win-iep220 `
-        -FilePath eclipse\eclipse.exe `
-        -DistZip idf-eclipse-2021-06-R-win-iep220.zip `
-        -DownloadUrl https://s3.cn-north-1.amazonaws.com.cn/espdldata/dl/idf-eclipse/eclipse-cpp-2021-06-R-win-iep220.zip
+    PrepareIdfPackage -BasePath build\$InstallerType\tools\idf-eclipse\2021-09 `
+        -FilePath eclipse.exe `
+        -DistZip idf-eclipse-2021-09-win64.zip `
+        -DownloadUrl https://dl.espressif.com/dl/idf-eclipse/idf-eclipse-2021-09-win64.zip
 }
 
 function PrepareIdfDriver {
diff --git a/src/InnoSetup/Eclipse.iss b/src/InnoSetup/Eclipse.iss
index 7b064f4..fc5c3c5 100644
--- a/src/InnoSetup/Eclipse.iss
+++ b/src/InnoSetup/Eclipse.iss
@@ -4,7 +4,7 @@
 
 function GetEclipsePath(FileName:String): String;
 begin
-  Result := ExpandConstant('{app}\tools\idf-eclipse\{#ECLIPSE_VERSION}\eclipse\') + FileName;
+  Result := ExpandConstant('{app}\tools\idf-eclipse\{#ECLIPSE_VERSION}\') + FileName;
 end;
 
 function GetEclipseExePath():String;
diff --git a/src/InnoSetup/IdfToolsSetup.iss b/src/InnoSetup/IdfToolsSetup.iss
index 2ffb380..0302ad8 100644
--- a/src/InnoSetup/IdfToolsSetup.iss
+++ b/src/InnoSetup/IdfToolsSetup.iss
@@ -25,9 +25,9 @@
 #define GitInstallerName "idf-git-" + GITVERSION + "-win64.zip"
 #define GitInstallerDownloadURL "https://dl.espressif.com/dl/idf-git/" + GitInstallerName
 
-#define ECLIPSE_VERSION "2021-06-R-win-iep220"
-#define ECLIPSE_INSTALLER "eclipse-cpp-" + ECLIPSE_VERSION + ".zip"
-#define ECLIPSE_DOWNLOADURL "https://s3.cn-north-1.amazonaws.com.cn/espdldata/dl/idf-eclipse/" + ECLIPSE_INSTALLER
+#define ECLIPSE_VERSION "2021-09"
+#define ECLIPSE_INSTALLER "idf-eclipse-" + ECLIPSE_VERSION + "-win64.zip"
+#define ECLIPSE_DOWNLOADURL "https://dl.espressif.com/dl/idf-eclipse/" + ECLIPSE_INSTALLER
 
 #define IDFVersionsURL "https://dl.espressif.com/dl/esp-idf/idf_versions.txt"