paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 04:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: environment options, fixed checking FPCSrcDir with macros

Browse Source 
git-svn-id: trunk@21751 -
This commit is contained in:
mattias 2009-09-17 22:28:12 +00:00
parent eaf9985829
commit ede3c52deb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/environmentopts.pp
View File

@ -593,7 +593,7 @@ begin
exit; exit;
end; end;
SubResult:=CheckDirPathExists(NewDir,lisEnvOptDlgDirectoryNotFound, SubResult:=CheckDirPathExists(NewDir,lisEnvOptDlgDirectoryNotFound,
NotFoundErrMsg); NotFoundErrMsg);
if SubResult=mrIgnore then begin if SubResult=mrIgnore then begin
Result:=true; Result:=true;
exit; exit;
@ -1384,10 +1384,8 @@ begin
lisTestDirectory,@MacroFuncTestDir,[])); lisTestDirectory,@MacroFuncTestDir,[]));
AMacroList.Add(TTransferMacro.Create('ConfDir','', AMacroList.Add(TTransferMacro.Create('ConfDir','',
lisProjectSrcPath,@MacroFuncConfDir,[])); lisProjectSrcPath,@MacroFuncConfDir,[]));
{$IFNDEF Ver2_2_0}
AMacroList.Add(TTransferMacro.Create('Home',GetUserDir, AMacroList.Add(TTransferMacro.Create('Home',GetUserDir,
lisUserSHomeDirectory, nil, [])); lisUserSHomeDirectory, nil, []));
{$ENDIF}
end; end;
function TEnvironmentOptions.MacroFuncCompPath(const s: string; function TEnvironmentOptions.MacroFuncCompPath(const s: string;

9
ide/frames/files_options.pas
View File

@ -26,7 +26,8 @@ interface
uses uses
Classes, SysUtils, FileUtil, LResources, Forms, StdCtrls, Dialogs, Controls, Classes, SysUtils, FileUtil, LResources, Forms, StdCtrls, Dialogs, Controls,
EnvironmentOpts, LazarusIDEStrConsts, InputHistory, LazConf, IDEProcs, IDEOptionsIntf; EnvironmentOpts, MacroIntf, LazarusIDEStrConsts, InputHistory, LazConf,
IDEProcs, IDEOptionsIntf;
type type
@ -321,6 +322,12 @@ var
StopChecking: boolean; StopChecking: boolean;
begin begin
NewFPCSrcDir:=FPCSourceDirComboBox.Text; NewFPCSrcDir:=FPCSourceDirComboBox.Text;
Result:=IDEMacros.SubstituteMacros(NewFPCSrcDir);
if not Result then begin
Result:=(MessageDlg(Format(lisEnvOptDlgInvalidFPCSrcDir,[NewFPCSrcDir]),
mtWarning,[mbIgnore,mbCancel],0)=mrIgnore);
exit;
end;
Result:=SimpleDirectoryCheck(FOldFPCSourceDir,NewFPCSrcDir, Result:=SimpleDirectoryCheck(FOldFPCSourceDir,NewFPCSrcDir,
lisEnvOptDlgFPCSrcDirNotFoundMsg,StopChecking); lisEnvOptDlgFPCSrcDirNotFoundMsg,StopChecking);
if (not Result) or StopChecking then exit; if (not Result) or StopChecking then exit;