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

IDE: test directory: fixed using always the parsed value

Browse Source 
git-svn-id: trunk@36056 -
This commit is contained in:
mattias 2012-03-16 01:02:00 +00:00
parent 68d89b080f
commit 9fb3a077c4
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/checkcompileropts.pas
View File

@ -37,7 +37,7 @@ uses
KeywordFuncLists, CodeToolManager, FileProcs, DefineTemplates,
CodeToolsStructs,
// IDEIntf
ProjectIntf, MacroIntf, IDEExternToolIntf,
ProjectIntf, MacroIntf, IDEExternToolIntf, LazIDEIntf,
// IDE
Project, PackageSystem, ExtToolEditDlg, IDEProcs, EnvironmentOpts,
LazarusIDEStrConsts, PackageDefs, CompilerOptions, TransferMacros, LazConf;
@ -302,7 +302,7 @@ begin
TestGroupbox.Caption:=dlgCCOTestCompilingEmptyFile;
// get Test directory
TestDir:=AppendPathDelim(EnvironmentOptions.TestBuildDirectory);
TestDir:=AppendPathDelim(LazarusIDE.GetTestBuildDirectory);
if not DirPathExists(TestDir) then begin
MessageDlg(lisCCOInvalidTestDir,
Format(lisCCOCheckTestDir,[#13]),

19
ide/environmentopts.pp
View File

@ -281,7 +281,6 @@ type
FDebuggerShowStopMessage: Boolean;
FShowCompileDialog: Boolean; // show dialog during compile
FAutoCloseCompileDialog: Boolean; // auto close dialog after succesed compile
FTestBuildDirectory: string;
FTestBuildDirHistory: TStringList;
FDebuggerEventLogClearOnRun: Boolean;
FDebuggerEventLogCheckLineLimit: Boolean;
@ -334,6 +333,7 @@ type
function GetDebuggerEventLogColors(AIndex: TDBGEventType): TDebuggerEventLogColor;
function GetFPCSourceDirectory: string;
function GetLazarusDirectory: string;
function GetTestBuildDirectory: string;
procedure SetCompilerFilename(const AValue: string);
procedure SetDebuggerEventLogColors(AIndex: TDBGEventType;
const AValue: TDebuggerEventLogColor);
@ -504,7 +504,7 @@ type
write FShowCompileDialog;
property AutoCloseCompileDialog: boolean read FAutoCloseCompileDialog
write FAutoCloseCompileDialog;
property TestBuildDirectory: string read FTestBuildDirectory
property TestBuildDirectory: string read GetTestBuildDirectory
write SetTestBuildDirectory;
property TestBuildDirHistory: TStringList read FTestBuildDirHistory
write FTestBuildDirHistory;
@ -1148,7 +1148,7 @@ begin
GetDefaultMakeFilenames(FMakeFileHistory);
TestBuildDirectory:=XMLConfig.GetValue(
Path+'TestBuildDirectory/Value',FTestBuildDirectory);
Path+'TestBuildDirectory/Value',TestBuildDirectory);
LoadRecentList(XMLConfig,FTestBuildDirHistory,
Path+'TestBuildDirectory/History/');
if FTestBuildDirHistory.Count=0 then
@ -1486,7 +1486,7 @@ begin
SaveRecentList(XMLConfig,FMakeFileHistory,
Path+'MakeFilename/History/');
XMLConfig.SetValue(
Path+'TestBuildDirectory/Value',FTestBuildDirectory);
Path+'TestBuildDirectory/Value',TestBuildDirectory);
SaveRecentList(XMLConfig,FTestBuildDirHistory,
Path+'TestBuildDirectory/History/');
XMLConfig.SetValue(
@ -1682,7 +1682,7 @@ end;
function TEnvironmentOptions.GetParsedTestBuildDirectory: string;
begin
Result:=AppendPathDelim(TestBuildDirectory);
Result:=GetParsedValue(eopTestBuildDirectory);
end;
function TEnvironmentOptions.GetParsedFPCSourceDirectory: string;
@ -1903,8 +1903,8 @@ end;
procedure TEnvironmentOptions.SetTestBuildDirectory(const AValue: string);
begin
if FTestBuildDirectory=AValue then exit;
FTestBuildDirectory:=AppendPathDelim(TrimFilename(AValue));
if TestBuildDirectory=AValue then exit;
SetParseValue(eopTestBuildDirectory,AValue);
end;
procedure TEnvironmentOptions.SetLazarusDirectory(const AValue: string);
@ -1953,6 +1953,11 @@ begin
Result:=FParseValues[eopLazarusDirectory].UnparsedValue;
end;
function TEnvironmentOptions.GetTestBuildDirectory: string;
begin
Result:=FParseValues[eopTestBuildDirectory].UnparsedValue;
end;
procedure TEnvironmentOptions.SetDebuggerEventLogColors(AIndex: TDBGEventType; const AValue: TDebuggerEventLogColor);
begin
FDebuggerEventLogColors[AIndex] := AValue;

6
ide/frames/project_application_options.pas
View File

@ -7,8 +7,8 @@ interface
uses
Classes, SysUtils, LCLProc, FileUtil, Forms, Controls, Graphics, Dialogs,
ExtCtrls, StdCtrls, Buttons, ComCtrls, ExtDlgs, Math, LCLType, IDEOptionsIntf,
Project, LazarusIDEStrConsts, EnvironmentOpts, ApplicationBundle, ProjectIcon,
W32Manifest, CompilerOptions;
LazIDEIntf, Project, LazarusIDEStrConsts, EnvironmentOpts, ApplicationBundle,
ProjectIcon, W32Manifest, CompilerOptions;
type
@ -68,7 +68,7 @@ begin
Exit;
end;
if AProject.IsVirtual then
TargetExeName := EnvironmentOptions.GetParsedTestBuildDirectory +
TargetExeName := LazarusIDE.GetTestBuildDirectory +
ExtractFilename(AProject.MainUnitInfo.Filename)
else
TargetExeName := AProject.CompilerOptions.CreateTargetFilename(

13
ide/main.pp
View File

@ -10956,7 +10956,7 @@ begin
// update all lrs files
if sfSaveToTestDir in Flags then
MainBuildBoss.UpdateProjectAutomaticFiles(EnvironmentOptions.TestBuildDirectory)
MainBuildBoss.UpdateProjectAutomaticFiles(EnvironmentOptions.GetParsedTestBuildDirectory)
else
MainBuildBoss.UpdateProjectAutomaticFiles('');
@ -11729,11 +11729,14 @@ begin
end;
function TMainIDE.DoSaveProjectToTestDirectory(Flags: TSaveFlags): TModalResult;
var
TestDir: String;
begin
Result:=mrCancel;
if (EnvironmentOptions.TestBuildDirectory='')
or (not DirPathExists(EnvironmentOptions.TestBuildDirectory)) then begin
if (EnvironmentOptions.TestBuildDirectory<>'') then begin
TestDir:=GetTestBuildDirectory;
if (TestDir='')
or (not DirPathExists(TestDir)) then begin
if (TestDir<>'') then begin
MessageDlg(Format(lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt, [
#13, '"', EnvironmentOptions.TestBuildDirectory, '"', #13]), mtError, [
mbCancel], 0);
@ -12006,7 +12009,7 @@ begin
// create target output directory
TargetExeName := Project1.CompilerOptions.CreateTargetFilename(Project1.MainFilename);
if Project1.IsVirtual and (not FilenameIsAbsolute(TargetExeName)) then
TargetExeName := EnvironmentOptions.GetParsedTestBuildDirectory + TargetExeName;
TargetExeName := GetTestBuildDirectory + TargetExeName;
TargetExeDirectory:=ExtractFilePath(TargetExeName);
if (FilenameIsAbsolute(TargetExeDirectory))
and (not DirPathExistsCached(TargetExeDirectory)) then begin