Skip to content

Commit b326411

Browse files
authored
tools: allow installation of drivers without rest of the stack (#132)
1 parent 724b315 commit b326411

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

src/InnoSetup/IdfToolsSetup.iss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ Name: "minimal"; Description: {cm:InstallationMinimal}
245245
Name: "custom"; Description: {cm:InstallationCustom}; Flags: iscustom
246246

247247
[Components]
248-
Name: "{#COMPONENT_FRAMEWORK}"; Description: "Frameworks"; Types: full custom; Flags: checkablealone
248+
Name: "{#COMPONENT_FRAMEWORK}"; Description: "Frameworks"; Types: full minimal custom;
249249

250250
#ifdef FRAMEWORK_ESP_IDF
251251
Name: "{#COMPONENT_FRAMEWORK_ESP_IDF}"; Description: "ESP-IDF {#FRAMEWORK_ESP_IDF}"; Types: full custom; Flags: checkablealone
252252
#endif
253253

254-
Name: "{#COMPONENT_IDE}"; Description: {cm:ComponentIde}; Types: full custom; Flags: fixed
254+
Name: "{#COMPONENT_IDE}"; Description: {cm:ComponentIde}; Types: full custom;
255255

256256
#ifdef ESPRESSIFIDE
257257
Name: "{#COMPONENT_ECLIPSE}"; Description: {cm:ComponentEclipse}; Types: custom; Flags: checkablealone
@@ -272,7 +272,7 @@ Name: "{#COMPONENT_POWERSHELL_STARTMENU}"; Description: {cm:ComponentStartMenuSh
272272
Name: "{#COMPONENT_CMD}"; Description: {cm:ComponentCommandPrompt}; Types: full; Flags: checkablealone
273273
Name: "{#COMPONENT_CMD_DESKTOP}"; Description: {cm:ComponentDesktopShortcut}; Types: full
274274
Name: "{#COMPONENT_CMD_STARTMENU}"; Description: {cm:ComponentStartMenuShortcut}; Types: full
275-
Name: "{#COMPONENT_DRIVER}"; Description: {cm:ComponentDrivers}; Types: full; Flags: checkablealone
275+
Name: "{#COMPONENT_DRIVER}"; Description: {cm:ComponentDrivers}; Types: full;
276276
Name: "{#COMPONENT_DRIVER_ESPRESSIF}"; Description: {cm:ComponentDriverEspressif}; Types: full; Flags: checkablealone
277277
Name: "{#COMPONENT_DRIVER_FTDI}"; Description: {cm:ComponentDriverFtdi}; Types: full; Flags: checkablealone
278278
Name: "{#COMPONENT_DRIVER_SILABS}"; Description: {cm:ComponentDriverSilabs}; Types: full; Flags: checkablealone

src/InnoSetup/PostInstall.iss

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -224,22 +224,21 @@ begin
224224
try
225225
AddPythonGitToPath();
226226
227-
if not IDFUseExisting then begin
228-
if not (IsOfflineMode) then begin
229-
IDFDownloadInstall();
230-
end;
231-
end;
232-
233-
InstallRust();
234-
InstallToit();
235-
236227
if (WizardIsComponentSelected('{#COMPONENT_OPTIMIZATION_ESPRESSIF_DOWNLOAD}')) then
237228
begin
238229
SetEnvironmentVariable('IDF_GITHUB_ASSETS', 'dl.espressif.com/github_assets')
239230
end;
240231
241-
IDFToolsSetup();
242-
SaveIdfConfiguration(ExpandConstant('{app}\esp_idf.json'));
232+
if (WizardIsComponentSelected('{#COMPONENT_FRAMEWORK}')) then begin
233+
if not IDFUseExisting then begin
234+
if not (IsOfflineMode) then begin
235+
IDFDownloadInstall();
236+
end;
237+
end;
238+
239+
IDFToolsSetup();
240+
SaveIdfConfiguration(ExpandConstant('{app}\esp_idf.json'));
241+
end;
243242
244243
if (WizardIsComponentSelected('{#COMPONENT_POWERSHELL_WINDOWS_TERMINAL}')) then begin
245244
CreateIDFWindowsTerminalShortcut();
@@ -273,6 +272,9 @@ begin
273272
CreateIDFEclipseShortcut('{autodesktop}');
274273
end;
275274
275+
InstallRust();
276+
InstallToit();
277+
276278
except
277279
SetupAborted := True;
278280
if MessageBox(CustomMessage('InstallationLogCreated') + #13#10

0 commit comments

Comments
 (0)