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

IDE: show compiler options: quote compiler filename

Browse Source 
git-svn-id: trunk@60537 -
This commit is contained in:
mattias 2019-02-28 16:55:16 +00:00
parent 3102805a43
commit 4a29d9d91f
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ide/compileroptions.pp
View File

@ -504,6 +504,7 @@ type
function GetEffectiveTargetOS: string; override; function GetEffectiveTargetOS: string; override;
function GetEffectiveTargetCPU: string; override; function GetEffectiveTargetCPU: string; override;
function GetEffectiveLCLWidgetType: string; override; function GetEffectiveLCLWidgetType: string; override;
// parsed CompilerFilename: use ParsedOpts.GetParsedValue(pcosCompilerPath)
function GetUnitPath(RelativeToBaseDir: boolean; function GetUnitPath(RelativeToBaseDir: boolean;
Parsed: TCompilerOptionsParseType = coptParsed; Parsed: TCompilerOptionsParseType = coptParsed;
WithBaseDir: boolean = true): string; override; WithBaseDir: boolean = true): string; override;

14
ide/showcompileropts.lfm
View File

@ -13,7 +13,7 @@ object ShowCompilerOptionsDlg: TShowCompilerOptionsDlg
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
Position = poOwnerFormCenter Position = poOwnerFormCenter
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
object CloseButton: TBitBtn object CloseButton: TBitBtn
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
@ -27,9 +27,11 @@ object ShowCompilerOptionsDlg: TShowCompilerOptionsDlg
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Cancel = True
Caption = '&Close' Caption = '&Close'
Constraints.MinHeight = 22 Constraints.MinHeight = 22
Constraints.MinWidth = 75 Constraints.MinWidth = 75
Default = True
Kind = bkClose Kind = bkClose
TabOrder = 0 TabOrder = 0
end end
@ -46,12 +48,12 @@ object ShowCompilerOptionsDlg: TShowCompilerOptionsDlg
TabOrder = 1 TabOrder = 1
object CmdLineParamsTabSheet: TTabSheet object CmdLineParamsTabSheet: TTabSheet
Caption = 'CmdLineParams' Caption = 'CmdLineParams'
ClientHeight = 353 ClientHeight = 351
ClientWidth = 477 ClientWidth = 477
object CmdLineMemo: TMemo object CmdLineMemo: TMemo
AnchorSideBottom.Control = RelativePathsCheckBox AnchorSideBottom.Control = RelativePathsCheckBox
Left = 6 Left = 6
Height = 317 Height = 315
Top = 6 Top = 6
Width = 465 Width = 465
Align = alTop Align = alTop
@ -69,7 +71,7 @@ object ShowCompilerOptionsDlg: TShowCompilerOptionsDlg
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 6 Left = 6
Height = 24 Height = 24
Top = 329 Top = 327
Width = 155 Width = 155
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = 'RelativePathsCheckBox' Caption = 'RelativePathsCheckBox'
@ -85,7 +87,7 @@ object ShowCompilerOptionsDlg: TShowCompilerOptionsDlg
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 176 Left = 176
Height = 24 Height = 24
Top = 329 Top = 327
Width = 128 Width = 128
BorderSpacing.Left = 15 BorderSpacing.Left = 15
Caption = 'MultilineCheckBox' Caption = 'MultilineCheckBox'
@ -97,7 +99,7 @@ object ShowCompilerOptionsDlg: TShowCompilerOptionsDlg
end end
object InheritedParamsTabSheet: TTabSheet object InheritedParamsTabSheet: TTabSheet
Caption = 'InheritedParams' Caption = 'InheritedParams'
ClientHeight = 353 ClientHeight = 351
ClientWidth = 477 ClientWidth = 477
object InhTreeView: TTreeView object InhTreeView: TTreeView
Left = 0 Left = 0

13
ide/showcompileropts.pas
View File

@ -220,27 +220,30 @@ end;
procedure TShowCompilerOptionsDlg.UpdateMemo; procedure TShowCompilerOptionsDlg.UpdateMemo;
var var
Flags: TCompilerCmdLineOptions; Flags: TCompilerCmdLineOptions;
CurOptions: String; CurOptions, CompPath: String;
ParamList: TStrings; ParamList: TStrings;
begin begin
if CompilerOpts=nil then exit; if CompilerOpts=nil then exit;
Flags:=CompilerOpts.DefaultMakeOptionsFlags+[ccloAddCompilerPath]; Flags:=CompilerOpts.DefaultMakeOptionsFlags;
if not RelativePathsCheckBox.Checked then if not RelativePathsCheckBox.Checked then
Include(Flags,ccloAbsolutePaths); Include(Flags,ccloAbsolutePaths);
CurOptions := CompilerOpts.MakeOptionsString(Flags); CurOptions := CompilerOpts.MakeOptionsString(Flags);
CompPath:=CompilerOpts.ParsedOpts.GetParsedValue(pcosCompilerPath);
if MultilineCheckBox.Checked then begin if MultilineCheckBox.Checked then begin
ParamList:=TStringList.Create; ParamList:=TStringList.Create;
try try
ParamList.Add(CompPath);
SplitCmdLineParams(CurOptions,ParamList); SplitCmdLineParams(CurOptions,ParamList);
CurOptions:=ParamList.Text; CmdLineMemo.Lines.Assign(ParamList);
finally finally
ParamList.Free; ParamList.Free;
end; end;
CmdLineMemo.ScrollBars:=ssAutoBoth; CmdLineMemo.ScrollBars:=ssAutoBoth;
end else end else begin
CmdLineMemo.ScrollBars:=ssAutoVertical; CmdLineMemo.ScrollBars:=ssAutoVertical;
CmdLineMemo.Lines.Text:=CurOptions; CmdLineMemo.Lines.Text:=QuotedStr(CompPath)+' '+CurOptions;
end;
end; end;
procedure TShowCompilerOptionsDlg.UpdateInheritedTree; procedure TShowCompilerOptionsDlg.UpdateInheritedTree;