Skip to content

Commit 4012679

Browse files
committed
tool: fix check for requirements.core.txt
1 parent e7b6faa commit 4012679

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/InnoSetup/IdfToolsSetup.iss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,6 @@ Filename: "{app}\dist\{#GitInstallerName}"; Parameters: "/silent /tasks="""" /no
351351
Filename: "{autodesktop}\{#IDFEclipseShortcutFile}"; Flags: runascurrentuser postinstall shellexec; Description: {cm:RunEclipse}; Components: "{#COMPONENT_ECLIPSE_DESKTOP}"
352352
#endif
353353

354-
#if OFFLINE == 'no'
355-
Filename: "{autodesktop}\{#IDFEclipseShortcutFile}"; Flags: runascurrentuser postinstall shellexec unchecked; Description: {cm:RunEclipse}; Components: "{#COMPONENT_ECLIPSE_DESKTOP}"
356-
#endif
357-
358354
Filename: "{code:GetLauncherPathPowerShell}"; Flags: postinstall shellexec; Description: {cm:RunPowerShell}; Components: "{#COMPONENT_POWERSHELL_DESKTOP} {#COMPONENT_CMD_STARTMENU}"
359355
Filename: "{code:GetLauncherPathCMD}"; Flags: postinstall shellexec; Description: {cm:RunCmd}; Components: "{#COMPONENT_CMD_DESKTOP} {#COMPONENT_CMD_STARTMENU}";
360356

src/InnoSetup/Pages/IdfPage.iss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ function OnIDFPageValidate(Sender: TWizardPage): Boolean;
6666
var
6767
Page: TInputOptionWizardPage;
6868
NotSupportedMsg, IDFPath, IDFPyPath, RequirementsPath: String;
69+
RequirementsPathV5: String;
6970
begin
7071
Page := TInputOptionWizardPage(Sender);
7172
Log('OnIDFPageValidate index=' + IntToStr(Page.SelectedValueIndex));
@@ -109,7 +110,8 @@ begin
109110
end;
110111
111112
RequirementsPath := IDFPath + '\requirements.txt';
112-
if not FileExists(RequirementsPath) then
113+
RequirementsPathV5 := IDFPath + '\requirements.core.txt';
114+
if (not FileExists(RequirementsPath)) and (not FileExists(RequirementsPathV5)) then
113115
begin
114116
MessageBox(NotSupportedMsg +
115117
CustomMessage('UnableToFindRequirementsTxt') + ' ' + IDFPath, mbError, MB_OK);

0 commit comments

Comments
 (0)