paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 23:19:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Add check on the fpcmkcfg-tool before trying to recreate fppkg configuration files

Browse Source 
git-svn-id: trunk@60746 -
This commit is contained in:
joost 2019-03-22 23:27:11 +00:00
parent 3bb6b19392
commit 828311a70a
2 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ide/initialsetupdlgs.pas
View File

@ -194,6 +194,7 @@ type
procedure ThreadTerminated(Sender: TObject); // called in main thread by fSearchFpcSourceThread.OnTerminate
procedure TranslateResourceStrings;
function CheckFppkgQuality(APrefix: string; out LibPath, Note: string): TSDFilenameQuality;
function CheckFpcmkcfgQuality(out Note: string): TSDFilenameQuality;
public
TVNodeLazarus: TTreeNode;
TVNodeCompiler: TTreeNode;
@ -1394,6 +1395,8 @@ begin
Msg := Note;
if (CheckFPCExeQuality(fLastParsedCompiler,Note, CodeToolBoss.CompilerDefinesCache.TestFilename)<>sddqCompatible) then
Msg := Msg + lisWarning + lisFppkgCompilerProblem +Note;
if CheckFpcmkcfgQuality(Note) <> sddqCompatible then
Msg := Msg + lisWarning + Note;
if Quality=sddqCompatible then
Note := lisOk
@ -1402,7 +1405,7 @@ begin
if Msg<>'' then
begin
Note := Note + LineEnding + Msg;
Note := Note + LineEnding + Msg;
FppkgWriteConfigButton.Enabled := False;
end
else
@ -1660,5 +1663,69 @@ begin
IDEMessageDialog(lisFppkgProblem, lisFppkgWriteConfFailed, mtWarning, [mbOK]);
end;
function TInitialSetupDialog.CheckFpcmkcfgQuality(out Note: string): TSDFilenameQuality;
{$IF FPC_FULLVERSION>30100}
var
FpcmkcfgExecutable: string;
Proc: TProcessUTF8;
S: string;
Ver: TFPVersion;
{$ENDIF}
begin
Result := sddqCompatible;
{$IF FPC_FULLVERSION>30100}
FpcmkcfgExecutable := FindFPCTool('fpcmkcfg'+GetExecutableExt, EnvironmentOptions.GetParsedCompilerFilename);
if FpcmkcfgExecutable = '' then
begin
Note := lisFppkgFpcmkcfgMissing + ' ' + lisFppkgRecentFpcmkcfgNeeded;
Result := sddqInvalid;
end
else
begin
Proc := TProcessUTF8.Create(nil);
try
Proc.Options := proc.Options + [poWaitOnExit,poUsePipes];
// Write fppkg.cfg
Proc.Executable := FpcmkcfgExecutable;
proc.Parameters.Add('-V');
proc.Execute;
if proc.ExitStatus <> 0 then
begin
Note := lisFppkgFpcmkcfgCheckFailed + ' ' + lifFppkgFpcmkcfgProbTooOld + ' ' + lisFppkgRecentFpcmkcfgNeeded;
Result := sddqInvalid;
end
else
begin
SetLength(S, Proc.Output.NumBytesAvailable);
Proc.Output.Read(S[1], Proc.Output.NumBytesAvailable);
Ver := TFPVersion.Create;
try
S := Copy(S, pos(':', S)+2);
Ver.AsString := Trim(S);
if Ver.Major = -1 then
begin
Note := lisFppkgFpcmkcfgCheckFailed + ' ' + lisFppkgFpcmkcfgNeeded + lisFppkgRecentFpcmkcfgNeeded;
Result := sddqInvalid;
end
else if not ((Ver.Major = 0) or (Ver.Major > 3) or (((Ver.Major = 3)) and (Ver.Minor>3))) then
begin
// fpcmkcfg's version must be > 3.1. Older versions need other
// parameters. Version 0 is also allowed, because it is probably
// self-built.
Note := Format( lisFppkgFpcmkcfgTooOld, [Ver.AsString]) + ' ' + lisFppkgFpcmkcfgNeeded + ' ' + lisFppkgRecentFpcmkcfgNeeded;
Result := sddqInvalid;
end;
finally
Ver.Free;
end;
end;
finally
Proc.Free;
end;
end;
{$ENDIF}
end;
end.

10
ide/lazarusidestrconsts.pas
View File

@ -1054,6 +1054,16 @@ resourcestring
'will have to fix the configuration manually or reinstall Free Pascal.';
lisNoFppkgPrefix = 'empty Free Pascal compiler prefix.';
lisFppkgCreateFileFailed = 'Failed to generate the configuration file "%s".';
lisFppkgRecentFpcmkcfgNeeded = 'Make sure a recent version is installed and ' +
'available in the path or alongside the compiler-executable.';
lisFppkgFpcmkcfgCheckFailed = 'Failed to retrieve the version of the fpcmkcfg ' +
'configuration tool.';
lisFppkgFpcmkcfgNeeded = 'An up-to-date version is needed to create the ' +
'configuration files.';
lisFppkgFpcmkcfgTooOld = 'The fpcmkcfg configuration tool it too old [%s].';
lifFppkgFpcmkcfgProbTooOld = 'It is probably too old to create the configuration files.';
lisFppkgFpcmkcfgMissing = 'Could not find the fpcmkcfg configuration tool, ' +
'which is needed to create the configuration files.';
// file dialogs
lisOpenFile = 'Open File';