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

IDE: Project options cleanup and formatting.

Browse Source 
git-svn-id: trunk@63544 -
This commit is contained in:
juha 2020-07-11 12:04:22 +00:00
parent e266c8d109
commit f091c464a5
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ide/project.pp
View File

@ -512,9 +512,8 @@ type
FBuildMode: TProjectBuildMode; FBuildMode: TProjectBuildMode;
FProject: TProject; FProject: TProject;
FCompileReasons: TCompileReasons; FCompileReasons: TCompileReasons;
procedure InvalidateOptions;
procedure AfterWriteExec(Sender: TObject; Restore: boolean);
procedure BeforeReadExec(Sender: TObject); procedure BeforeReadExec(Sender: TObject);
procedure AfterWriteExec(Sender: TObject; Restore: boolean);
protected protected
procedure SetTargetCPU(const AValue: string); override; procedure SetTargetCPU(const AValue: string); override;
procedure SetTargetOS(const AValue: string); override; procedure SetTargetOS(const AValue: string); override;
@ -6177,7 +6176,6 @@ end;
procedure TProjectCompilerOptions.SetCustomOptions(const AValue: string); procedure TProjectCompilerOptions.SetCustomOptions(const AValue: string);
begin begin
if CustomOptions=AValue then exit; if CustomOptions=AValue then exit;
InvalidateOptions;
inherited SetCustomOptions(AValue); inherited SetCustomOptions(AValue);
if IsActive then if IsActive then
LazProject.DefineTemplates.CustomDefinesChanged; LazProject.DefineTemplates.CustomDefinesChanged;
@ -6186,56 +6184,48 @@ end;
procedure TProjectCompilerOptions.SetIncludePaths(const AValue: string); procedure TProjectCompilerOptions.SetIncludePaths(const AValue: string);
begin begin
if IncludePath=AValue then exit; if IncludePath=AValue then exit;
InvalidateOptions;
inherited SetIncludePaths(AValue); inherited SetIncludePaths(AValue);
end; end;
procedure TProjectCompilerOptions.SetLibraryPaths(const AValue: string); procedure TProjectCompilerOptions.SetLibraryPaths(const AValue: string);
begin begin
if Libraries=AValue then exit; if Libraries=AValue then exit;
InvalidateOptions;
inherited SetLibraryPaths(AValue); inherited SetLibraryPaths(AValue);
end; end;
procedure TProjectCompilerOptions.SetLinkerOptions(const AValue: string); procedure TProjectCompilerOptions.SetLinkerOptions(const AValue: string);
begin begin
if LinkerOptions=AValue then exit; if LinkerOptions=AValue then exit;
InvalidateOptions;
inherited SetLinkerOptions(AValue); inherited SetLinkerOptions(AValue);
end; end;
procedure TProjectCompilerOptions.SetNamespaces(const AValue: string); procedure TProjectCompilerOptions.SetNamespaces(const AValue: string);
begin begin
if Namespaces=AValue then exit; if Namespaces=AValue then exit;
InvalidateOptions;
inherited SetNamespaces(AValue); inherited SetNamespaces(AValue);
end; end;
procedure TProjectCompilerOptions.SetObjectPath(const AValue: string); procedure TProjectCompilerOptions.SetObjectPath(const AValue: string);
begin begin
if ObjectPath=AValue then exit; if ObjectPath=AValue then exit;
InvalidateOptions;
inherited SetObjectPath(AValue); inherited SetObjectPath(AValue);
end; end;
procedure TProjectCompilerOptions.SetSrcPath(const AValue: string); procedure TProjectCompilerOptions.SetSrcPath(const AValue: string);
begin begin
if SrcPath=AValue then exit; if SrcPath=AValue then exit;
InvalidateOptions;
inherited SetSrcPath(AValue); inherited SetSrcPath(AValue);
end; end;
procedure TProjectCompilerOptions.SetUnitPaths(const AValue: string); procedure TProjectCompilerOptions.SetUnitPaths(const AValue: string);
begin begin
if OtherUnitFiles=AValue then exit; if OtherUnitFiles=AValue then exit;
InvalidateOptions;
inherited SetUnitPaths(AValue); inherited SetUnitPaths(AValue);
end; end;
procedure TProjectCompilerOptions.SetUnitOutputDir(const AValue: string); procedure TProjectCompilerOptions.SetUnitOutputDir(const AValue: string);
begin begin
if UnitOutputDirectory=AValue then exit; if UnitOutputDirectory=AValue then exit;
InvalidateOptions;
inherited SetUnitOutputDir(AValue); inherited SetUnitOutputDir(AValue);
if IsActive then if IsActive then
LazProject.DefineTemplates.OutputDirectoryChanged; LazProject.DefineTemplates.OutputDirectoryChanged;
@ -6245,7 +6235,6 @@ procedure TProjectCompilerOptions.SetConditionals(AValue: string);
begin begin
AValue:=UTF8Trim(AValue,[]); AValue:=UTF8Trim(AValue,[]);
if Conditionals=AValue then exit; if Conditionals=AValue then exit;
InvalidateOptions;
inherited SetConditionals(AValue); inherited SetConditionals(AValue);
end; end;
@ -6298,21 +6287,16 @@ begin
Result:=true; Result:=true;
end; end;
procedure TProjectCompilerOptions.InvalidateOptions; procedure TProjectCompilerOptions.BeforeReadExec(Sender: TObject);
begin begin
//if (LazProject=nil) then exit; if LazProject<>nil then
LazProject.BackupBuildModes;
end; end;
procedure TProjectCompilerOptions.AfterWriteExec(Sender:TObject;Restore:boolean); procedure TProjectCompilerOptions.AfterWriteExec(Sender: TObject; Restore: boolean);
begin begin
if Restore and (LazProject<>nil) then if Restore and (LazProject<>nil) then
LazProject.RestoreBuildModes; LazProject.RestoreBuildModes;
end;
procedure TProjectCompilerOptions.BeforeReadExec(Sender:TObject);
begin
if LazProject<>nil then
LazProject.BackupBuildModes;
end; end;
procedure TProjectCompilerOptions.SetAlternativeCompile(const Command: string; procedure TProjectCompilerOptions.SetAlternativeCompile(const Command: string;