paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-13 10:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed note about wrong laz dir

Browse Source 
git-svn-id: trunk@36548 -
This commit is contained in:
mattias 2012-04-03 17:54:54 +00:00
parent 8afdbf2a7a
commit c4bea1cbab
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ide/environmentopts.pp
View File

@ -1454,7 +1454,6 @@ begin
// pcp=C:\Lazarus\config, lazdir=C:\Lazarus => store '..' // pcp=C:\Lazarus\config, lazdir=C:\Lazarus => store '..'
// pcp=/home/user/.lazarus, lazdir=/home/user/freepascal/lazarus => store ../freepascal/lazarus // pcp=/home/user/.lazarus, lazdir=/home/user/freepascal/lazarus => store ../freepascal/lazarus
CurLazDir:=CreateRelativePath(CurLazDir,GetPrimaryConfigPath); CurLazDir:=CreateRelativePath(CurLazDir,GetPrimaryConfigPath);
if CurLazDir='' then CurLazDir:='.';
end; end;
XMLConfig.SetValue(Path+'LazarusDirectory/Value',CurLazDir); // always store, no SetDeleteValue XMLConfig.SetValue(Path+'LazarusDirectory/Value',CurLazDir); // always store, no SetDeleteValue
end; end;

29
ide/main.pp
View File

@ -14787,23 +14787,20 @@ begin
'PROJECT',nil,@CTMacroFunctionProject); 'PROJECT',nil,@CTMacroFunctionProject);
CodeToolsOpts.AssignTo(CodeToolBoss); CodeToolsOpts.AssignTo(CodeToolBoss);
if (not FileExistsCached(EnvironmentOptions.GetParsedCompilerFilename)) then begin
DebugLn('');
DebugLn('NOTE: Compiler filename not set! (see Environment / Options ... / Environment / Files)');
end;
if (EnvironmentOptions.LazarusDirectory='') if not InteractiveSetup then begin
or not DirPathExists(EnvironmentOptions.GetParsedLazarusDirectory) then begin if (not FileExistsCached(EnvironmentOptions.GetParsedCompilerFilename)) then begin
DebugLn(''); DebugLn('');
DebugLn( DebugLn('NOTE: invalid compiler filename! (see Tools / Options ... / Environment / Files)');
'NOTE: Lazarus source directory not set! (see Environment / Options ... / Environment / Files)'); end;
end; if not DirPathExists(EnvironmentOptions.GetParsedLazarusDirectory) then begin
if (EnvironmentOptions.FPCSourceDirectory='') then DebugLn('');
begin DebugLn('NOTE: Lazarus source directory not set! (see Tools / Options ... / Environment / Files)');
// Note: the FPCSourceDirectory can contain the macro FPCVer, which depend end;
// on the compiler. Do not check if file exists here. if (EnvironmentOptions.GetParsedFPCSourceDirectory='') then begin
DebugLn(''); DebugLn('');
DebugLn('NOTE: FPC source directory not set! (see Environment / Options ... / Environment / Files)'); DebugLn('NOTE: FPC source directory not set! (see Tools / Options ... / Environment / Files)');
end;
end; end;
// create a test unit needed to get from the compiler all macros and search paths // create a test unit needed to get from the compiler all macros and search paths