IDE: show setup dialog if lazarus directory looks suspicious

git-svn-id: trunk@35004 -
This commit is contained in:
mattias 2012-01-28 18:52:38 +00:00
parent f6f75bf248
commit a9b5b5777b
3 changed files with 3 additions and 2 deletions

View File

@ -3851,6 +3851,7 @@ resourcestring
lisPkgSysUnitName = '%s%sUnit Name: %s%s%s';
lisPkgSysFileName = '%s%sFile Name: %s%s%s';
lisPkgSysLPKFilename = '%s%slpk file: %s%s%s';
lisPkgSysTheLpkFileWasNotFound = '%s%sThe lpk file was not found.';
lisPkgSysPackageRegistrationError = 'Package registration error';
lisPkgSysTheRTLFreePascalComponentLibraryProvidesTheBase = 'The RTL - '
+'The Run-Time Library is the basis of all Free Pascal programs.';

View File

@ -14568,7 +14568,7 @@ begin
if InteractiveSetup then
begin
if (not ShowSetupDialog)
and ((CheckLazarusDirectoryQuality(EnvironmentOptions.LazarusDirectory,Note)=sddqInvalid)
and ((CheckLazarusDirectoryQuality(EnvironmentOptions.LazarusDirectory,Note)<>sddqCompatible)
or (CheckCompilerQuality(EnvironmentOptions.GetCompilerFilename,Note,
CodeToolBoss.FPCDefinesCache.TestFilename)=sddqInvalid))
then

View File

@ -1448,7 +1448,7 @@ begin
end else begin
ErrorMsg:='Package: "'+FRegistrationPackage.IDAsString+'"';
if FRegistrationPackage.AutoCreated then
debugln(['TLazPackageGraph.RegistrationError FRegistrationPackage.AutoCreated ',FRegistrationPackage.Filename])
ErrorMsg:=Format(lisPkgSysTheLpkFileWasNotFound, [ErrorMsg, #13])
else
ErrorMsg:=Format(lisPkgSysLPKFilename, [ErrorMsg, #13, '"',
FRegistrationPackage.Filename, '"']);