paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 03:59:56 +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 GetEffectiveTargetCPU: string; override;
function GetEffectiveLCLWidgetType: string; override;
// parsed CompilerFilename: use ParsedOpts.GetParsedValue(pcosCompilerPath)
function GetUnitPath(RelativeToBaseDir: boolean;
Parsed: TCompilerOptionsParseType = coptParsed;
WithBaseDir: boolean = true): string; override;

14
ide/showcompileropts.lfm
View File

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

13
ide/showcompileropts.pas
View File

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