resolving lazarus directory even if started with search path

git-svn-id: trunk@3838 -
This commit is contained in:
mattias 2003-02-07 18:46:35 +00:00
parent 086e9810a1
commit 0a3aaf8cc3
3 changed files with 7 additions and 6 deletions

View File

@ -331,7 +331,7 @@ begin
XMLConfig:=TXMLConfig.Create(FFileName);
FileVersion:=XMLConfig.GetValue('CodeToolsOptions/Version/Value',0);
if (FileVersion<>0) and (FileVersion<CodeToolsOptionsVersion) then
writeln('Note: loading old codetools options file: ',FFileName);
writeln('NOTE: loading old codetools options file: ',FFileName);
// General
FSrcPath:=XMLConfig.GetValue('CodeToolsOptions/SrcPath/Value','');
@ -457,8 +457,7 @@ begin
XMLConfig.Flush;
XMLConfig.Free;
except
// ToDo
writeln('[TEnvironmentOptions.Save] error writing "',FFilename,'"');
writeln('ERROR: error while writing codetools options "',FFilename,'"');
end;
end;
@ -475,7 +474,7 @@ begin
GetPrimaryConfigPath+'/'+DefaultCodeToolsOptsFile);
CopySecondaryConfigFile(DefaultCodeToolsOptsFile);
if (not FileExists(ConfFileName)) then begin
writeln('Note: codetools config file not found - using defaults');
writeln('NOTE: codetools config file not found - using defaults');
end;
FFilename:=ConfFilename;
end;

View File

@ -1048,7 +1048,7 @@ begin
ConfFileName:=SetDirSeparators(GetPrimaryConfigPath+'/'+EditOptsConfFileName);
CopySecondaryConfigFile(EditOptsConfFileName);
if (not FileExists(ConfFileName)) then begin
writeln('NOTE: editor options config file not found');
writeln('NOTE: editor options config file not found - using defaults');
end;
XMLConfig:=TXMLConfig.Create(ConfFileName);

View File

@ -96,7 +96,6 @@ var
begin
for i:=Low(DefaultFPCSrcDirs) to High(DefaultFPCSrcDirs) do begin
Result:=DefaultFPCSrcDirs[i];
writeln('FindDefaultFPCSrcDirectory A ',Result,' ',CheckFPCSourceDir(Result));
if CheckFPCSourceDir(Result) then exit;
end;
Result:='';
@ -109,6 +108,9 @@ end.
{
$Log$
Revision 1.12 2003/02/07 18:46:35 mattias
resolving lazarus directory even if started with search path
Revision 1.11 2003/02/06 20:46:51 mattias
default fpc src dirs and clean ups