Merge pull request #323 from espressif/fix/online_installer_version_mark

Fix/minor bugs in online installer

Author: dobairoland

Build-Installer.ps1

@@ -541,6 +541,14 @@ if (('offline' -eq $InstallerType) -or ('espressif-ide' -eq $InstallerType)){
     $IsccParameters += '/DJDKARTIFACTVERSION=' + $JdkArtifactVersion
     $IsccParameters += '/DESPRESSIFIDE=yes'
     $IsccParameters += '/DOFFLINE=no'
+    
+    # Extract version from $env:VERSION (defined in CI job in format: "online-X.Y.Z")
+    # Not filled version results in string "online-"
+    $RawVersion = $env:VERSION
+    if ($RawVersion -match '^online-(.+)$') {
+        $CleanVersion = $Matches[1]
+        $IsccParameters += '/DVERSION=' + $CleanVersion
+    }
 } else {
     $IsccParameters += '/DOFFLINE=no'
 }

src/InnoSetup/Environment.iss

@@ -539,8 +539,12 @@ begin
 
   Log('Installing tools:' + CmdLine);
   DoCmdlineInstall(CustomMessage('InstallingEspIdfTools'), '', CmdLine);
-  CmdLine := IDFToolsPyCmd + ' install esp-clang';
-  DoCmdlineInstall(CustomMessage('InstallingEspIdfTools'), '', CmdLine);
+  
+  { Only install esp-clang if the selected version does not contain 'v5.0' }
+  if (Pos('v5.0', IDFDownloadVersion) = 0) then begin
+    CmdLine := IDFToolsPyCmd + ' install esp-clang';
+    DoCmdlineInstall(CustomMessage('InstallingEspIdfTools'), '', CmdLine);
+  end;
 
   PythonVirtualEnvPath := ExpandConstant('{app}\python_env\')  + GetIDFPythonEnvironmentVersion() + '_env';
   CmdLine := PythonExecutablePath + ' -m venv "' + PythonVirtualEnvPath + '"';

src/InnoSetup/IdfToolsSetup.iss

@@ -14,7 +14,7 @@
 #ifdef VERSION
 #define MyAppVersion VERSION
 #else
-#define MyAppVersion "2.3.1"
+#define MyAppVersion "2.3.4"
 #endif
 
 #define MyAppPublisher "Espressif Systems (Shanghai) Co. Ltd."
@@ -319,19 +319,19 @@ Name: "{#COMPONENT_TARGET_ESP32_C3}"; Description: {cm:ComponentTargetEsp32c3};
 
 #ifndef DISABLE_TARGET_ESP32_C6
 Name: "{#COMPONENT_TARGET_ESP32_C6}"; Description: {cm:ComponentTargetEsp32c6}; Types: full; Flags: checkablealone
-Name: "{#COMPONENT_TARGET_ESP32_H}"; Description: {cm:ComponentTargetEsp32h}; Types: full; Flags: checkablealone
+Name: "{#COMPONENT_TARGET_ESP32_H}"; Description: {cm:ComponentTargetEsp32h}; Types: full;
 Name: "{#COMPONENT_TARGET_ESP32_H2}"; Description: {cm:ComponentTargetEsp32h2}; Types: custom; Flags: checkablealone
 #endif
 
-Name: "{#COMPONENT_TARGET_ESP32_S}"; Description: {cm:ComponentTargetEsp32s}; Types: full; Flags: checkablealone
+Name: "{#COMPONENT_TARGET_ESP32_S}"; Description: {cm:ComponentTargetEsp32s}; Types: full;
 Name: "{#COMPONENT_TARGET_ESP32_S2}"; Description: {cm:ComponentTargetEsp32s2}; Types: full; Flags: checkablealone
 
 #ifndef DISABLE_TARGET_ESP32_S3
 Name: "{#COMPONENT_TARGET_ESP32_S3}"; Description: {cm:ComponentTargetEsp32s3}; Types: full; Flags: checkablealone
 #endif
 
 #ifndef DISABLE_TARGET_ESP32_P4
-Name: "{#COMPONENT_TARGET_ESP32_P}"; Description: {cm:ComponentTargetEsp32p}; Types: full; Flags: checkablealone
+Name: "{#COMPONENT_TARGET_ESP32_P}"; Description: {cm:ComponentTargetEsp32p}; Types: full;
 
 Name: "{#COMPONENT_TARGET_ESP32_P4}"; Description: {cm:ComponentTargetEsp32p4}; Types: full; Flags: checkablealone
 #endif