paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 12:39:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: consider empty lazarusdirectory as pcp, empty fpcsrcdir as lazdir, epty testdir as lazdir

Browse Source 
git-svn-id: trunk@36546 -
This commit is contained in:
mattias 2012-04-03 16:01:36 +00:00
parent 6ead435909
commit 63512ed1c7
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ide/environmentopts.pp
View File

@ -1707,10 +1707,18 @@ begin
case o of
eopLazarusDirectory:
// lazarus directory
ParsedValue:=TrimAndExpandDirectory(ParsedValue,GetPrimaryConfigPath);
begin
ParsedValue:=TrimAndExpandDirectory(ParsedValue,GetPrimaryConfigPath);
if ParsedValue='' then
ParsedValue:=GetPrimaryConfigPath;
end;
eopFPCSourceDirectory,eopTestBuildDirectory:
// directory
ParsedValue:=TrimAndExpandDirectory(ParsedValue,GetParsedLazarusDirectory);
begin
ParsedValue:=TrimAndExpandDirectory(ParsedValue,GetParsedLazarusDirectory);
if ParsedValue='' then
ParsedValue:=GetParsedLazarusDirectory;
end;
eopCompilerMessagesFilename:
// data file
ParsedValue:=TrimAndExpandFilename(ParsedValue,GetParsedLazarusDirectory);

3
ide/initialsetupdlgs.pas
View File

@ -1274,16 +1274,19 @@ var
begin
UpdateLazarusDirCandidates;
LazDirComboBox.Text:=EnvironmentOptions.LazarusDirectory;
FLastParsedLazDir:='. .';
UpdateLazDirNote;
FLazarusDirChanged:=false;
UpdateCompilerFilenameCandidates;
CompilerComboBox.Text:=EnvironmentOptions.CompilerFilename;
fLastParsedCompiler:='. .';
UpdateCompilerNote;
fCompilerFilenameChanged:=false;
UpdateFPCSrcDirCandidates;
FPCSrcDirComboBox.Text:=EnvironmentOptions.FPCSourceDirectory;
fLastParsedFPCSrcDir:='. .';
UpdateFPCSrcDirNote;
// select first error