mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-19 06:39:13 +02:00
IDE: removed compiler options page inherited
git-svn-id: trunk@41621 -
This commit is contained in:
mattias
parent
bd4dd3da15
commit
0427e271f2
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -4986,8 +4986,6 @@ ide/frames/compiler_codegen_options.lfm svneol=native#text/plain
|
||||
ide/frames/compiler_codegen_options.pas svneol=native#text/pascal
|
||||
ide/frames/compiler_compilation_options.lfm svneol=native#text/plain
|
||||
ide/frames/compiler_compilation_options.pas svneol=native#text/pascal
|
||||
ide/frames/compiler_inherited_options.lfm svneol=native#text/plain
|
||||
ide/frames/compiler_inherited_options.pas svneol=native#text/pascal
|
||||
ide/frames/compiler_linking_options.lfm svneol=native#text/plain
|
||||
ide/frames/compiler_linking_options.pas svneol=native#text/pascal
|
||||
ide/frames/compiler_messages_options.lfm svneol=native#text/plain
|
||||
|
||||
@ -197,7 +197,6 @@ begin
|
||||
P.Sources.AddSrc('frames/compiler_buildmacro_options.pas');
|
||||
P.Sources.AddSrc('frames/compiler_codegen_options.pas');
|
||||
P.Sources.AddSrc('frames/compiler_compilation_options.pas');
|
||||
P.Sources.AddSrc('frames/compiler_inherited_options.pas');
|
||||
P.Sources.AddSrc('frames/compiler_linking_options.pas');
|
||||
P.Sources.AddSrc('frames/compiler_messages_options.pas');
|
||||
P.Sources.AddSrc('frames/compiler_other_options.pas');
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
object CompilerInheritedOptionsFrame: TCompilerInheritedOptionsFrame
|
||||
Left = 0
|
||||
Height = 444
|
||||
Top = 0
|
||||
Width = 576
|
||||
ClientHeight = 444
|
||||
ClientWidth = 576
|
||||
TabOrder = 0
|
||||
Visible = False
|
||||
DesignLeft = 246
|
||||
DesignTop = 162
|
||||
object InhNoteLabel: TLabel
|
||||
Left = 0
|
||||
Height = 16
|
||||
Top = 0
|
||||
Width = 576
|
||||
Align = alTop
|
||||
Caption = 'InhNoteLabel'
|
||||
ParentColor = False
|
||||
end
|
||||
object InhTreeView: TTreeView
|
||||
Left = 0
|
||||
Height = 247
|
||||
Top = 16
|
||||
Width = 576
|
||||
Align = alTop
|
||||
DefaultItemHeight = 18
|
||||
ReadOnly = True
|
||||
RightClickSelect = True
|
||||
TabOrder = 0
|
||||
OnSelectionChanged = InhTreeViewSelectionChanged
|
||||
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
|
||||
end
|
||||
object InhItemMemo: TMemo
|
||||
Left = 0
|
||||
Height = 176
|
||||
Top = 268
|
||||
Width = 576
|
||||
Align = alClient
|
||||
ReadOnly = True
|
||||
ScrollBars = ssAutoVertical
|
||||
TabOrder = 1
|
||||
end
|
||||
object InhSplitter: TSplitter
|
||||
Cursor = crVSplit
|
||||
Left = 0
|
||||
Height = 5
|
||||
Top = 263
|
||||
Width = 576
|
||||
Align = alTop
|
||||
ResizeAnchor = akTop
|
||||
end
|
||||
end
|
||||
@ -1,374 +0,0 @@
|
||||
{ /***************************************************************************
|
||||
compileroptions.pp - Lazarus IDE unit
|
||||
---------------------------------------
|
||||
Compiler options sets the switches for the project
|
||||
file for the FPC compiler.
|
||||
|
||||
|
||||
Initial Revision : Sat May 10 23:15:32 CST 1999
|
||||
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
***************************************************************************
|
||||
* *
|
||||
* This source is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This code is distributed in the hope that it will be useful, but *
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
|
||||
* General Public License for more details. *
|
||||
* *
|
||||
* A copy of the GNU General Public License is available on the World *
|
||||
* Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also *
|
||||
* obtain it by writing to the Free Software Foundation, *
|
||||
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
* *
|
||||
***************************************************************************
|
||||
}
|
||||
unit compiler_inherited_options;
|
||||
|
||||
{$mode objfpc}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, SysUtils, LCLProc, FileUtil, Forms, Controls, Graphics, Dialogs,
|
||||
StdCtrls, ComCtrls, ExtCtrls,
|
||||
CodeToolsCfgScript, IDEOptionsIntf, IDEImagesIntf, ProjectIntf, CompOptsIntf,
|
||||
Project, PackageDefs, ModeMatrixOpts, CompilerOptions,
|
||||
LazarusIDEStrConsts, IDEProcs;
|
||||
|
||||
type
|
||||
|
||||
{ TCompilerInheritedOptionsFrame }
|
||||
|
||||
TCompilerInheritedOptionsFrame = class(TAbstractIDEOptionsEditor)
|
||||
InhItemMemo: TMemo;
|
||||
InhNoteLabel: TLabel;
|
||||
InhSplitter: TSplitter;
|
||||
InhTreeView: TTreeView;
|
||||
procedure InhTreeViewSelectionChanged(Sender: TObject);
|
||||
private
|
||||
FLastOptions: TBaseCompilerOptions;
|
||||
ImageIndexInherited: Integer;
|
||||
ImageIndexRequired: Integer;
|
||||
ImageIndexPackage: Integer;
|
||||
InheritedChildDatas: TList; // list of PInheritedNodeData
|
||||
procedure ClearInheritedTree;
|
||||
protected
|
||||
procedure VisibleChanged; override;
|
||||
public
|
||||
destructor Destroy; override;
|
||||
function GetTitle: string; override;
|
||||
procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
|
||||
procedure ReadSettings(AOptions: TAbstractIDEOptions); override;
|
||||
procedure WriteSettings(AOptions: TAbstractIDEOptions); override;
|
||||
class function SupportedOptionsClass: TAbstractIDEOptionsClass; override;
|
||||
property LastOptions: TBaseCompilerOptions read FLastOptions;
|
||||
procedure UpdateInheritedTree(CompilerOpts: TBaseCompilerOptions);
|
||||
end;
|
||||
|
||||
implementation
|
||||
|
||||
{$R *.lfm}
|
||||
|
||||
type
|
||||
TInheritedNodeData = record
|
||||
FullText: string;
|
||||
Option: TInheritedCompilerOption;
|
||||
end;
|
||||
PInheritedNodeData = ^TInheritedNodeData;
|
||||
|
||||
|
||||
{ TCompilerInheritedOptionsFrame }
|
||||
|
||||
function TCompilerInheritedOptionsFrame.GetTitle: string;
|
||||
begin
|
||||
Result := dlgCOInherited;
|
||||
end;
|
||||
|
||||
procedure TCompilerInheritedOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
|
||||
begin
|
||||
ImageIndexPackage := IDEImages.LoadImage(16, 'item_package');
|
||||
ImageIndexRequired := IDEImages.LoadImage(16, 'pkg_required');
|
||||
ImageIndexInherited := IDEImages.LoadImage(16, 'pkg_inherited');
|
||||
InhTreeView.Images := IDEImages.Images_16;
|
||||
InhItemMemo.Text := lisSelectANode;
|
||||
end;
|
||||
|
||||
procedure TCompilerInheritedOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
|
||||
begin
|
||||
UpdateInheritedTree(AOptions as TBaseCompilerOptions);
|
||||
end;
|
||||
|
||||
procedure TCompilerInheritedOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
|
||||
begin
|
||||
|
||||
end;
|
||||
|
||||
class function TCompilerInheritedOptionsFrame.SupportedOptionsClass:
|
||||
TAbstractIDEOptionsClass;
|
||||
begin
|
||||
Result := TBaseCompilerOptions;
|
||||
end;
|
||||
|
||||
procedure TCompilerInheritedOptionsFrame.UpdateInheritedTree(
|
||||
CompilerOpts: TBaseCompilerOptions);
|
||||
var
|
||||
OptionsList: TFPList;
|
||||
i: integer;
|
||||
AncestorOptions: TAdditionalCompilerOptions;
|
||||
AncestorNode: TTreeNode;
|
||||
AncestorBaseOpts: TBaseCompilerOptions;
|
||||
Vars: TCTCfgScriptVariables;
|
||||
Macro: TLazBuildMacro;
|
||||
j: Integer;
|
||||
|
||||
procedure AddChildNode(const NewNodeName, Value: string;
|
||||
Option: TInheritedCompilerOption);
|
||||
var
|
||||
VisibleValue: string;
|
||||
ChildNode: TTreeNode;
|
||||
ChildData: PInheritedNodeData;
|
||||
begin
|
||||
if Value = '' then
|
||||
exit;
|
||||
New(ChildData);
|
||||
ChildData^.FullText := Value;
|
||||
ChildData^.Option := Option;
|
||||
if InheritedChildDatas = nil then
|
||||
InheritedChildDatas := TList.Create;
|
||||
InheritedChildDatas.Add(ChildData);
|
||||
|
||||
if UTF8Length(Value) > 100 then
|
||||
VisibleValue := UTF8Copy(Value, 1, 100) + '[...]'
|
||||
else
|
||||
VisibleValue := Value;
|
||||
ChildNode := InhTreeView.Items.AddChildObject(AncestorNode,
|
||||
NewNodeName + ' = "' + VisibleValue + '"', ChildData);
|
||||
ChildNode.ImageIndex := ImageIndexRequired;
|
||||
ChildNode.SelectedIndex := ChildNode.ImageIndex;
|
||||
end;
|
||||
|
||||
var
|
||||
SkippedPkgList: TFPList;
|
||||
AProject: TProject;
|
||||
Pkg: TLazPackage;
|
||||
t: TBuildMatrixGroupType;
|
||||
|
||||
procedure AddMatrixGroupNode(Grp: TBuildMatrixGroupType);
|
||||
begin
|
||||
if AncestorNode<>nil then exit;
|
||||
AncestorNode := InhTreeView.Items.Add(nil, '');
|
||||
case Grp of
|
||||
bmgtEnvironment: AncestorNode.Text:=dlgGroupEnvironment;
|
||||
bmgtProject: AncestorNode.Text:=dlgProject;
|
||||
bmgtSession: AncestorNode.Text:=lisProjectSession;
|
||||
end;
|
||||
AncestorNode.ImageIndex := ImageIndexPackage;
|
||||
AncestorNode.SelectedIndex := AncestorNode.ImageIndex;
|
||||
end;
|
||||
|
||||
procedure AddMatrixGroup(Grp: TBuildMatrixGroupType);
|
||||
var
|
||||
CustomOptions: String;
|
||||
OutDir: String;
|
||||
begin
|
||||
AncestorNode := nil;
|
||||
CustomOptions:='';
|
||||
OnAppendCustomOption(CompilerOpts,CustomOptions,[Grp]);
|
||||
if CustomOptions<>'' then begin
|
||||
AddMatrixGroupNode(Grp);
|
||||
AddChildNode(liscustomOptions, CustomOptions, icoCustomOptions);
|
||||
end;
|
||||
OutDir:='.*';
|
||||
OnGetOutputDirectoryOverride(CompilerOpts,OutDir,[Grp]);
|
||||
if OutDir<>'.*' then begin
|
||||
AddMatrixGroupNode(Grp);
|
||||
AddChildNode('Output directory', OutDir, icoNone);
|
||||
end;
|
||||
if AncestorNode<>nil then
|
||||
AncestorNode.Expand(true);
|
||||
end;
|
||||
|
||||
begin
|
||||
FLastOptions:=CompilerOpts;
|
||||
if not Visible then exit;
|
||||
|
||||
OptionsList := nil;
|
||||
//debugln(['TCompilerInheritedOptionsFrame.UpdateInheritedTree START CompilerOpts=',DbgSName(CompilerOpts)]);
|
||||
CompilerOpts.GetInheritedCompilerOptions(OptionsList);
|
||||
SkippedPkgList:=nil;
|
||||
try
|
||||
if CompilerOpts is TProjectCompilerOptions then begin
|
||||
AProject:=TProjectCompilerOptions(CompilerOpts).LazProject;
|
||||
AProject.GetAllRequiredPackages(SkippedPkgList);
|
||||
if (SkippedPkgList<>nil)
|
||||
and (not (pfUseDesignTimePackages in AProject.Flags)) then begin
|
||||
// keep design time only packages
|
||||
for i:=SkippedPkgList.Count-1 downto 0 do
|
||||
if TLazPackage(SkippedPkgList[i]).PackageType<>lptDesignTime then
|
||||
SkippedPkgList.Delete(i);
|
||||
end;
|
||||
end;
|
||||
//debugln(['TCompilerInheritedOptionsFrame.UpdateInheritedTree END']);
|
||||
InhTreeView.BeginUpdate;
|
||||
ClearInheritedTree;
|
||||
if OptionsList <> nil then
|
||||
begin
|
||||
Vars:=GetBuildMacroValues(CompilerOpts,false);
|
||||
// add All node
|
||||
AncestorNode := InhTreeView.Items.Add(nil, lisAllInheritedOptions);
|
||||
AncestorNode.ImageIndex := ImageIndexInherited;
|
||||
AncestorNode.SelectedIndex := AncestorNode.ImageIndex;
|
||||
with CompilerOpts do
|
||||
begin
|
||||
AddChildNode(lisunitPath,
|
||||
GetInheritedOption(icoUnitPath, True), icoUnitPath);
|
||||
AddChildNode(lisincludePath,
|
||||
GetInheritedOption(icoIncludePath, True), icoIncludePath);
|
||||
AddChildNode(lisobjectPath,
|
||||
GetInheritedOption(icoObjectPath, True), icoObjectPath);
|
||||
AddChildNode(lislibraryPath,
|
||||
GetInheritedOption(icoLibraryPath, True), icoLibraryPath);
|
||||
AddChildNode(lislinkerOptions, GetInheritedOption(icoLinkerOptions, True),
|
||||
icoLinkerOptions);
|
||||
AddChildNode(liscustomOptions, GetInheritedOption(icoCustomOptions, True),
|
||||
icoCustomOptions);
|
||||
end;
|
||||
AncestorNode.Expanded := True;
|
||||
// add detail nodes
|
||||
for i := 0 to OptionsList.Count - 1 do
|
||||
begin
|
||||
AncestorOptions := TAdditionalCompilerOptions(OptionsList[i]);
|
||||
AncestorNode := InhTreeView.Items.Add(nil, '');
|
||||
AncestorNode.Text := AncestorOptions.GetOwnerName;
|
||||
AncestorNode.ImageIndex := ImageIndexPackage;
|
||||
AncestorNode.SelectedIndex := AncestorNode.ImageIndex;
|
||||
AncestorBaseOpts:=AncestorOptions.GetBaseCompilerOptions;
|
||||
with AncestorOptions.ParsedOpts do
|
||||
begin
|
||||
AddChildNode(lisunitPath,
|
||||
CreateRelativeSearchPath(GetParsedValue(pcosUnitPath),CompilerOpts.BaseDirectory),
|
||||
icoUnitPath);
|
||||
AddChildNode(lisincludePath,
|
||||
CreateRelativeSearchPath(GetParsedValue(pcosIncludePath),CompilerOpts.BaseDirectory),
|
||||
icoIncludePath);
|
||||
AddChildNode(lisobjectPath,
|
||||
CreateRelativeSearchPath(GetParsedValue(pcosObjectPath),CompilerOpts.BaseDirectory),
|
||||
icoObjectPath);
|
||||
AddChildNode(lislibraryPath,
|
||||
CreateRelativeSearchPath(GetParsedValue(pcosLibraryPath),CompilerOpts.BaseDirectory),
|
||||
icoLibraryPath);
|
||||
AddChildNode(lislinkerOptions, GetParsedValue(pcosLinkerOptions),
|
||||
icoLinkerOptions);
|
||||
AddChildNode(liscustomOptions, GetParsedValue(pcosCustomOptions),
|
||||
icoCustomOptions);
|
||||
end;
|
||||
if (AncestorBaseOpts<>nil) and (Vars<>nil) then begin
|
||||
for j:=0 to AncestorBaseOpts.BuildMacros.Count-1 do
|
||||
begin
|
||||
Macro:=AncestorBaseOpts.BuildMacros[j];
|
||||
AddChildNode(Macro.Identifier,Vars.Values[Macro.Identifier],icoNone);
|
||||
end;
|
||||
end;
|
||||
AncestorNode.Expanded := True;
|
||||
end;
|
||||
OptionsList.Free;
|
||||
end else
|
||||
begin
|
||||
InhTreeView.Items.Add(nil, lisNoCompilerOptionsInherited);
|
||||
end;
|
||||
if SkippedPkgList<>nil then begin
|
||||
for i:=0 to SkippedPkgList.Count-1 do begin
|
||||
Pkg:=TLazPackage(SkippedPkgList[i]);
|
||||
AncestorNode := InhTreeView.Items.Add(nil, '');
|
||||
AncestorNode.Text := Format(lisExcludedAtRunTime, [Pkg.Name]);
|
||||
AncestorNode.ImageIndex := ImageIndexPackage;
|
||||
AncestorNode.SelectedIndex := AncestorNode.ImageIndex;
|
||||
end;
|
||||
end;
|
||||
|
||||
// add matrix options
|
||||
for t:=low(TBuildMatrixGroupType) to high(TBuildMatrixGroupType) do
|
||||
AddMatrixGroup(t);
|
||||
|
||||
InhTreeView.EndUpdate;
|
||||
finally
|
||||
SkippedPkgList.Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
destructor TCompilerInheritedOptionsFrame.Destroy;
|
||||
begin
|
||||
ClearInheritedTree;
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
procedure TCompilerInheritedOptionsFrame.ClearInheritedTree;
|
||||
var
|
||||
i: integer;
|
||||
ChildData: PInheritedNodeData;
|
||||
begin
|
||||
if InhTreeView = nil then
|
||||
exit;
|
||||
InhTreeView.BeginUpdate;
|
||||
// dispose all child data
|
||||
if InheritedChildDatas <> nil then
|
||||
begin
|
||||
for i := 0 to InheritedChildDatas.Count - 1 do
|
||||
begin
|
||||
ChildData := PInheritedNodeData(InheritedChildDatas[i]);
|
||||
Dispose(ChildData);
|
||||
end;
|
||||
InheritedChildDatas.Free;
|
||||
InheritedChildDatas := nil;
|
||||
end;
|
||||
InhTreeView.Items.Clear;
|
||||
InhTreeView.EndUpdate;
|
||||
end;
|
||||
|
||||
procedure TCompilerInheritedOptionsFrame.VisibleChanged;
|
||||
begin
|
||||
inherited VisibleChanged;
|
||||
if IsVisible and (LastOptions<>nil) then
|
||||
UpdateInheritedTree(LastOptions);
|
||||
end;
|
||||
|
||||
procedure TCompilerInheritedOptionsFrame.InhTreeViewSelectionChanged(Sender: TObject);
|
||||
var
|
||||
ANode: TTreeNode;
|
||||
ChildData: PInheritedNodeData;
|
||||
sl: TStrings;
|
||||
begin
|
||||
ANode := InhTreeView.Selected;
|
||||
if (ANode = nil) or (ANode.Data = nil) then
|
||||
begin
|
||||
InhItemMemo.Lines.Text := lisSelectANode;
|
||||
end
|
||||
else
|
||||
begin
|
||||
ChildData := PInheritedNodeData(ANode.Data);
|
||||
if ChildData^.Option in icoAllSearchPaths then
|
||||
begin
|
||||
sl := SplitString(ChildData^.FullText, ';');
|
||||
InhItemMemo.Lines.Assign(sl);
|
||||
sl.Free;
|
||||
end
|
||||
else
|
||||
InhItemMemo.Lines.Text := ChildData^.FullText;
|
||||
end;
|
||||
end;
|
||||
|
||||
initialization
|
||||
RegisterIDEOptionsEditor(GroupCompiler, TCompilerInheritedOptionsFrame,
|
||||
CompilerOptionsInherited);
|
||||
RegisterIDEOptionsEditor(GroupPkgCompiler, TCompilerInheritedOptionsFrame,
|
||||
CompilerOptionsInherited);
|
||||
|
||||
end.
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
|
||||
ToDo:
|
||||
- add checkbox Show build modes
|
||||
- move inherited to show options
|
||||
- move IDE macros only for package usage
|
||||
- move conditionals to Other
|
||||
- set default conditionals to comments with examples
|
||||
|
||||
@ -131,8 +131,7 @@ uses
|
||||
// project compiler option frames
|
||||
compiler_path_options, compiler_parsing_options, compiler_codegen_options,
|
||||
compiler_linking_options, compiler_verbosity_options, compiler_messages_options,
|
||||
compiler_other_options, compiler_inherited_options, compiler_compilation_options,
|
||||
compiler_buildmacro_options,
|
||||
compiler_other_options, compiler_compilation_options, compiler_buildmacro_options,
|
||||
Compiler_ModeMatrix,
|
||||
// package option frames
|
||||
package_usage_options, package_description_options, package_integration_options,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user