forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow to select the 'global' compiler for completion and move 'global' definition to the option page dedicated t the compiler paths

This commit is contained in:
Basile Burg 2020-01-19 06:39:23 +01:00
parent 6875764241
commit 1fbe967d76
3 changed files with 223 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
src/u_compilers.lfm
View File

@ -6,13 +6,12 @@ object CompilersPathsEditor: TCompilersPathsEditor
Caption = 'CompilersPathsEditor' Caption = 'CompilersPathsEditor'
ClientHeight = 900 ClientHeight = 900
ClientWidth = 460 ClientWidth = 460
LCLVersion = '2.0.6.0'
object ScrollBox1: TScrollBox object ScrollBox1: TScrollBox
Left = 0 Left = 0
Height = 900 Height = 900
Top = 0 Top = 0
Width = 460 Width = 460
HorzScrollBar.Page = 116 HorzScrollBar.Page = 243
VertScrollBar.Page = 898 VertScrollBar.Page = 898
Align = alClient Align = alClient
AutoSize = True AutoSize = True
@ -21,21 +20,21 @@ object CompilersPathsEditor: TCompilersPathsEditor
TabOrder = 0 TabOrder = 0
object grpDMD: TGroupBox object grpDMD: TGroupBox
Left = 0 Left = 0
Height = 175 Height = 168
Top = 52 Top = 106
Width = 443 Width = 443
Align = alTop Align = alTop
AutoSize = True AutoSize = True
Caption = 'DMD' Caption = 'DMD'
ClientHeight = 157 ClientHeight = 150
ClientWidth = 441 ClientWidth = 441
TabOrder = 0 TabOrder = 0
object selDMDexe: TFileNameEdit object selDMDexe: TFileNameEdit
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the compiler' Hint = 'select the compiler'
Top = 23 Top = 21
Width = 435 Width = 437
FilterIndex = 0 FilterIndex = 0
HideDirectories = False HideDirectories = False
ButtonWidth = 23 ButtonWidth = 23
@ -51,8 +50,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of druntime sources' Hint = 'select the root of druntime sources'
Top = 75 Top = 71
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -67,8 +66,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of phobos sources' Hint = 'select the root of phobos sources'
Top = 127 Top = 121
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -81,9 +80,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText1: TStaticText object StaticText1: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 0 Top = 0
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -92,9 +91,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText2: TStaticText object StaticText2: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 52 Top = 50
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -103,9 +102,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText3: TStaticText object StaticText3: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 104 Top = 100
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -115,21 +114,21 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object grpGDC: TGroupBox object grpGDC: TGroupBox
Left = 0 Left = 0
Height = 175 Height = 168
Top = 227 Top = 274
Width = 443 Width = 443
Align = alTop Align = alTop
AutoSize = True AutoSize = True
Caption = 'GDC' Caption = 'GDC'
ClientHeight = 157 ClientHeight = 150
ClientWidth = 441 ClientWidth = 441
TabOrder = 1 TabOrder = 1
object selGDCexe: TFileNameEdit object selGDCexe: TFileNameEdit
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the compiler' Hint = 'select the compiler'
Top = 23 Top = 21
Width = 435 Width = 437
FilterIndex = 0 FilterIndex = 0
HideDirectories = False HideDirectories = False
ButtonWidth = 23 ButtonWidth = 23
@ -145,8 +144,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of druntime sources' Hint = 'select the root of druntime sources'
Top = 75 Top = 71
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -161,8 +160,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of phobos sources' Hint = 'select the root of phobos sources'
Top = 127 Top = 121
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -175,9 +174,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText4: TStaticText object StaticText4: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 0 Top = 0
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -186,9 +185,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText5: TStaticText object StaticText5: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 52 Top = 50
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -197,9 +196,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText6: TStaticText object StaticText6: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 104 Top = 100
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -209,21 +208,21 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object grpLDC: TGroupBox object grpLDC: TGroupBox
Left = 0 Left = 0
Height = 175 Height = 168
Top = 402 Top = 442
Width = 443 Width = 443
Align = alTop Align = alTop
AutoSize = True AutoSize = True
Caption = 'LDC' Caption = 'LDC'
ClientHeight = 157 ClientHeight = 150
ClientWidth = 441 ClientWidth = 441
TabOrder = 2 TabOrder = 2
object selLDCexe: TFileNameEdit object selLDCexe: TFileNameEdit
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the compiler' Hint = 'select the compiler'
Top = 23 Top = 21
Width = 435 Width = 437
FilterIndex = 0 FilterIndex = 0
HideDirectories = False HideDirectories = False
ButtonWidth = 23 ButtonWidth = 23
@ -239,8 +238,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of LDC runtime & phobos sources (can be a common folder)' Hint = 'select the root of LDC runtime & phobos sources (can be a common folder)'
Top = 75 Top = 71
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -255,8 +254,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of phobos sources (can be empty)' Hint = 'select the root of phobos sources (can be empty)'
Top = 127 Top = 121
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -269,9 +268,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText7: TStaticText object StaticText7: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 0 Top = 0
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -280,9 +279,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText8: TStaticText object StaticText8: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 52 Top = 50
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -291,9 +290,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText9: TStaticText object StaticText9: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 104 Top = 100
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -303,21 +302,21 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object grpUSER1: TGroupBox object grpUSER1: TGroupBox
Left = 0 Left = 0
Height = 175 Height = 168
Top = 577 Top = 610
Width = 443 Width = 443
Align = alTop Align = alTop
AutoSize = True AutoSize = True
Caption = 'User 1' Caption = 'User 1'
ClientHeight = 157 ClientHeight = 150
ClientWidth = 441 ClientWidth = 441
TabOrder = 3 TabOrder = 3
object selUSER1exe: TFileNameEdit object selUSER1exe: TFileNameEdit
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the compiler' Hint = 'select the compiler'
Top = 23 Top = 21
Width = 435 Width = 437
FilterIndex = 0 FilterIndex = 0
HideDirectories = False HideDirectories = False
ButtonWidth = 23 ButtonWidth = 23
@ -333,8 +332,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of druntime sources' Hint = 'select the root of druntime sources'
Top = 75 Top = 71
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -349,8 +348,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of phobos sources' Hint = 'select the root of phobos sources'
Top = 127 Top = 121
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -363,9 +362,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText10: TStaticText object StaticText10: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 0 Top = 0
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -374,9 +373,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText11: TStaticText object StaticText11: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 52 Top = 50
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -385,9 +384,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText12: TStaticText object StaticText12: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 104 Top = 100
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -397,21 +396,21 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object grpUSER2: TGroupBox object grpUSER2: TGroupBox
Left = 0 Left = 0
Height = 175 Height = 168
Top = 752 Top = 778
Width = 443 Width = 443
Align = alTop Align = alTop
AutoSize = True AutoSize = True
Caption = 'User 2' Caption = 'User 2'
ClientHeight = 157 ClientHeight = 150
ClientWidth = 441 ClientWidth = 441
TabOrder = 4 TabOrder = 4
object selUSER2exe: TFileNameEdit object selUSER2exe: TFileNameEdit
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the compiler' Hint = 'select the compiler'
Top = 23 Top = 21
Width = 435 Width = 437
FilterIndex = 0 FilterIndex = 0
HideDirectories = False HideDirectories = False
ButtonWidth = 23 ButtonWidth = 23
@ -427,8 +426,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of druntime sources' Hint = 'select the root of druntime sources'
Top = 75 Top = 71
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -443,8 +442,8 @@ object CompilersPathsEditor: TCompilersPathsEditor
Left = 2 Left = 2
Height = 27 Height = 27
Hint = 'select the root of phobos sources' Hint = 'select the root of phobos sources'
Top = 127 Top = 121
Width = 435 Width = 437
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
NumGlyphs = 1 NumGlyphs = 1
@ -457,9 +456,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText13: TStaticText object StaticText13: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 0 Top = 0
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -468,9 +467,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText14: TStaticText object StaticText14: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 52 Top = 50
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -479,9 +478,9 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object StaticText15: TStaticText object StaticText15: TStaticText
Left = 0 Left = 0
Height = 21 Height = 19
Top = 104 Top = 100
Width = 439 Width = 441
Align = alTop Align = alTop
Alignment = taCenter Alignment = taCenter
AutoSize = True AutoSize = True
@ -491,13 +490,13 @@ object CompilersPathsEditor: TCompilersPathsEditor
end end
object GroupBox6: TGroupBox object GroupBox6: TGroupBox
Left = 0 Left = 0
Height = 52 Height = 51
Top = 0 Top = 0
Width = 443 Width = 443
Align = alTop Align = alTop
AutoSize = True AutoSize = True
Caption = 'Default compiler for completion' Caption = 'Compiler paths used for intellisense'
ClientHeight = 34 ClientHeight = 33
ClientWidth = 441 ClientWidth = 441
TabOrder = 5 TabOrder = 5
object selDefault: TComboBox object selDefault: TComboBox
@ -505,23 +504,36 @@ object CompilersPathsEditor: TCompilersPathsEditor
Height = 25 Height = 25
Hint = 'select which the compiler for which the library paths are used by the completion daemon' Hint = 'select which the compiler for which the library paths are used by the completion daemon'
Top = 4 Top = 4
Width = 431 Width = 433
Align = alClient
BorderSpacing.Around = 4
ItemHeight = 0
Style = csDropDownList
TabOrder = 0
end
end
object GroupBox7: TGroupBox
Left = 0
Height = 55
Top = 51
Width = 443
Align = alTop
AutoSize = True
Caption = 'Compiler selected as "global"'
ClientHeight = 37
ClientWidth = 441
TabOrder = 6
object selGlobal: TComboBox
Left = 4
Height = 29
Hint = 'select which the compiler for which the library paths are used by the completion daemon'
Top = 4
Width = 433
Align = alClient Align = alClient
BorderSpacing.Around = 4 BorderSpacing.Around = 4
ItemHeight = 0 ItemHeight = 0
ItemIndex = 0
Items.Strings = (
'DMD'
'GDC'
'GDMD'
'LDC'
'LDMD'
'USER 1'
'USER 2'
)
Style = csDropDownList Style = csDropDownList
TabOrder = 0 TabOrder = 0
Text = 'DMD'
end end
end end
end end

135
src/u_compilers.pas
View File

@ -14,7 +14,7 @@ type
TCompilersPaths = class(TWritableLfmTextComponent) TCompilersPaths = class(TWritableLfmTextComponent)
strict private strict private
fDefaultCompiler: DCompiler; fPathsForCompletion: DCompiler;
fDmdExeName: string; fDmdExeName: string;
fDmdRuntimePath: string; fDmdRuntimePath: string;
fDmdPhobosPath: string; fDmdPhobosPath: string;
@ -32,7 +32,9 @@ type
fUser2PhobosPath: string; fUser2PhobosPath: string;
fModified: boolean; fModified: boolean;
fWouldNeedRestart: boolean; fWouldNeedRestart: boolean;
procedure setDefaultCompiler(value: DCompiler); fDefinedAsGlobal: DCompiler;
procedure setDefinedAsGlobal(value: DCompiler);
procedure setPathsForCompletion(value: DCompiler);
procedure setDmdExeName(const value: string); procedure setDmdExeName(const value: string);
procedure setDmdRuntimePath(const value: string); procedure setDmdRuntimePath(const value: string);
procedure setDmdPhobosPath(const value: string); procedure setDmdPhobosPath(const value: string);
@ -53,7 +55,8 @@ type
protected protected
procedure afterLoad; override; procedure afterLoad; override;
published published
property defaultCompiler: DCompiler read fDefaultCompiler write setDefaultCompiler; property definedAsGlobal: DCompiler read fDefinedAsGlobal write setDefinedAsGlobal;
property pathsForCompletion: DCompiler read fPathsForCompletion write setPathsForCompletion;
property DmdExeName: string read fDmdExeName write setDmdExeName; property DmdExeName: string read fDmdExeName write setDmdExeName;
property DmdRuntimePath: string read fDmdRuntimePath write setDmdRuntimePath; property DmdRuntimePath: string read fDmdRuntimePath write setDmdRuntimePath;
property DmdPhobosPath: string read fDmdPhobosPath write setDmdPhobosPath; property DmdPhobosPath: string read fDmdPhobosPath write setDmdPhobosPath;
@ -78,7 +81,9 @@ type
{ TCompilersPathsEditor } { TCompilersPathsEditor }
TCompilersPathsEditor = class(TForm, IEditableOptions, ICompilerSelector, IProjectObserver) TCompilersPathsEditor = class(TForm, IEditableOptions, ICompilerSelector, IProjectObserver)
GroupBox7: TGroupBox;
selDefault: TComboBox; selDefault: TComboBox;
selGlobal: TComboBox;
selDMDrt: TDirectoryEdit; selDMDrt: TDirectoryEdit;
selUSER2std: TDirectoryEdit; selUSER2std: TDirectoryEdit;
selDMDstd: TDirectoryEdit; selDMDstd: TDirectoryEdit;
@ -128,6 +133,7 @@ type
procedure selectedRt(sender: TObject; var value: string); procedure selectedRt(sender: TObject; var value: string);
procedure selectedStd(sender: TObject; var value: string); procedure selectedStd(sender: TObject; var value: string);
procedure selectedDefault(sender: TObject); procedure selectedDefault(sender: TObject);
procedure selectedGlobal(sender: TObject);
procedure autoDetectDMD; procedure autoDetectDMD;
procedure autoDetectGDC; procedure autoDetectGDC;
procedure autoDetectLDC; procedure autoDetectLDC;
@ -156,8 +162,8 @@ type
destructor destroy; override; destructor destroy; override;
end; end;
var //var
globalCompiler: DCompiler; // globalCompiler: DCompiler;
implementation implementation
{$R *.lfm} {$R *.lfm}
@ -175,8 +181,64 @@ const
constructor TCompilersPathsEditor.create(aOwner: TComponent); constructor TCompilersPathsEditor.create(aOwner: TComponent);
var var
fname: string; fname: string;
dcomp: DCompiler;
begin begin
inherited; inherited;
selDefault.Items.BeginUpdate;
selGlobal.Items.BeginUpdate;
try for dcomp in DCompiler do
begin
case dcomp of
dmd:
begin
selDefault.Items.Add('DMD');
selGlobal.Items.Add('DMD');
end;
gdc:
begin
selDefault.Items.Add('GDC');
selGlobal.Items.Add('GDC');
end;
gdmd:
begin
selDefault.Items.Add('GDMD (same paths as GDC)');
selGlobal.Items.Add('GDMD (same paths as GDC)');
end;
ldc:
begin
selDefault.Items.Add('LDC');
selGlobal.Items.Add('LDC');
end;
ldmd:
begin
selDefault.Items.Add('GDMD (same paths as LDC)');
selGlobal.Items.Add('GDMD (same paths as LDC)');
end;
user1:
begin
selDefault.Items.Add('USER1');
selGlobal.Items.Add('USER1');
end;
user2:
begin
selDefault.Items.Add('USER2');
selGlobal.Items.Add('USER2');
end;
global:
begin
selDefault.Items.Add('GLOBAL (as defined in the options)');
// 'global' must be everything but 'global'
selGlobal.Items.Add('<N/A>');
end;
else raise Exception.create('missing DCompiler value in a case of');
end;
end;
finally
selDefault.Items.EndUpdate;
selGlobal.Items.EndUpdate;
end;
fPaths:= TCompilersPaths.Create(self); fPaths:= TCompilersPaths.Create(self);
fPathsBackup:= TCompilersPaths.Create(self); fPathsBackup:= TCompilersPaths.Create(self);
@ -229,6 +291,7 @@ begin
selUSER2std.OnEditingDone:= @editedStd; selUSER2std.OnEditingDone:= @editedStd;
selDefault.OnSelect:= @selectedDefault; selDefault.OnSelect:= @selectedDefault;
selGlobal.OnSelect:= @selectedGlobal;
EntitiesConnector.addSingleService(self); EntitiesConnector.addSingleService(self);
EntitiesConnector.addObserver(self); EntitiesConnector.addObserver(self);
@ -243,9 +306,9 @@ end;
procedure TCompilersPaths.checkIfGlobalIsGlobal; procedure TCompilersPaths.checkIfGlobalIsGlobal;
begin begin
if globalCompiler = DCompiler.global then if fDefinedAsGlobal = DCompiler.global then
begin begin
globalCompiler := low(DCompiler); fDefinedAsGlobal := low(DCompiler);
raise Exception.Create('global compiler should not be set to DCompiler.global'); raise Exception.Create('global compiler should not be set to DCompiler.global');
end; end;
end; end;
@ -257,7 +320,7 @@ begin
if source is TCompilersPaths then if source is TCompilersPaths then
begin begin
src := TCompilersPaths(source); src := TCompilersPaths(source);
DefaultCompiler := src.fDefaultCompiler; pathsForCompletion := src.fPathsForCompletion;
DmdExeName := src.fDmdExeName; DmdExeName := src.fDmdExeName;
DmdRuntimePath := src.fDmdRuntimePath; DmdRuntimePath := src.fDmdRuntimePath;
DmdPhobosPath := src.fDmdPhobosPath; DmdPhobosPath := src.fDmdPhobosPath;
@ -277,15 +340,22 @@ begin
else inherited; else inherited;
end; end;
procedure TCompilersPaths.setDefaultCompiler(value: Dcompiler); procedure TCompilersPaths.setPathsForCompletion(value: Dcompiler);
begin begin
if fDefaultCompiler = value then if fPathsForCompletion = value then
exit; exit;
fDefaultCompiler:=value; fPathsForCompletion:=value;
fWouldNeedRestart := true; fWouldNeedRestart := true;
fModified:=true; fModified:=true;
end; end;
procedure TCompilersPaths.setDefinedAsGlobal(value: DCompiler);
begin
if value = DCompiler.global then
value := low(DCompiler);
fDefinedAsGlobal := value;
end;
procedure TCompilersPaths.setDmdExeName(const value: string); procedure TCompilersPaths.setDmdExeName(const value: string);
begin begin
if fDmdExeName = value then if fDmdExeName = value then
@ -300,7 +370,7 @@ begin
exit; exit;
fDmdRuntimePath:=value; fDmdRuntimePath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler = dmd then if fPathsForCompletion = dmd then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -310,7 +380,7 @@ begin
exit; exit;
fDmdPhobosPath:=value; fDmdPhobosPath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler = dmd then if fPathsForCompletion = dmd then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -328,7 +398,7 @@ begin
exit; exit;
fGdcRuntimePath:=value; fGdcRuntimePath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler in [gdc,gdmd] then if fPathsForCompletion in [gdc,gdmd] then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -338,7 +408,7 @@ begin
exit; exit;
fGdcPhobosPath:=value; fGdcPhobosPath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler in [gdc,gdmd] then if fPathsForCompletion in [gdc,gdmd] then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -356,7 +426,7 @@ begin
exit; exit;
fLdcRuntimePath:=value; fLdcRuntimePath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler in [ldc,ldmd] then if fPathsForCompletion in [ldc,ldmd] then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -366,7 +436,7 @@ begin
exit; exit;
fLdcPhobosPath:=value; fLdcPhobosPath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler in [ldc,ldmd] then if fPathsForCompletion in [ldc,ldmd] then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -384,7 +454,7 @@ begin
exit; exit;
fUser1RuntimePath:=value; fUser1RuntimePath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler = user1 then if fPathsForCompletion = user1 then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -394,7 +464,7 @@ begin
exit; exit;
fUser1PhobosPath:=value; fUser1PhobosPath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler = user1 then if fPathsForCompletion = user1 then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -412,7 +482,7 @@ begin
exit; exit;
fUser2RuntimePath:=value; fUser2RuntimePath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler = user2 then if fPathsForCompletion = user2 then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -422,7 +492,7 @@ begin
exit; exit;
fUser2PhobosPath:=value; fUser2PhobosPath:=value;
fModified:=true; fModified:=true;
if fDefaultCompiler = user2 then if fPathsForCompletion = user2 then
fWouldNeedRestart := true; fWouldNeedRestart := true;
end; end;
@ -538,7 +608,7 @@ begin
DCompiler.global: DCompiler.global:
begin begin
fPaths.checkIfGlobalIsGlobal; fPaths.checkIfGlobalIsGlobal;
exit(isCompilerValid(globalCompiler)); exit(isCompilerValid(fPaths.definedAsGlobal));
end; end;
end; end;
end; end;
@ -557,7 +627,7 @@ begin
DCompiler.global: DCompiler.global:
begin begin
checkIfGlobalIsGlobal; checkIfGlobalIsGlobal;
exit(getCompilerPath(globalCompiler)); exit(getCompilerPath(fPaths.definedAsGlobal));
end; end;
end; end;
end; end;
@ -580,7 +650,7 @@ begin
DCompiler.user2: DCompiler.user2:
begin tryAdd(User2RuntimePath); tryAdd(User2PhobosPath); end; begin tryAdd(User2RuntimePath); tryAdd(User2PhobosPath); end;
DCompiler.global: DCompiler.global:
begin checkIfGlobalIsGlobal; getCompilerImports(globalCompiler, paths); end; begin checkIfGlobalIsGlobal; getCompilerImports(fPaths.definedAsGlobal, paths); end;
end; end;
end; end;
{$ENDREGION} {$ENDREGION}
@ -592,7 +662,7 @@ var
begin begin
imprt := TStringList.Create; imprt := TStringList.Create;
try try
getCompilerImports(fPaths.defaultCompiler, imprt); getCompilerImports(fPaths.pathsForCompletion, imprt);
DcdWrapper.addImportFolders(imprt); DcdWrapper.addImportFolders(imprt);
finally finally
imprt.free; imprt.free;
@ -623,7 +693,8 @@ begin
selUSER2rt.Directory := User2RuntimePath; selUSER2rt.Directory := User2RuntimePath;
selUSER2std.Directory := User2PhobosPath; selUSER2std.Directory := User2PhobosPath;
selDefault.ItemIndex := integer(defaultCompiler); selDefault.ItemIndex := integer(pathsForCompletion);
selGlobal.ItemIndex := integer(definedAsGlobal);
end; end;
end; end;
@ -751,7 +822,17 @@ end;
procedure TCompilersPathsEditor.selectedDefault(sender: TObject); procedure TCompilersPathsEditor.selectedDefault(sender: TObject);
begin begin
fPaths.defaultCompiler:= DCompiler(selDefault.ItemIndex); fPaths.pathsForCompletion:= DCompiler(selDefault.ItemIndex);
end;
procedure TCompilersPathsEditor.selectedGlobal(sender: TObject);
var
v: DCompiler;
begin
v := DCompiler(selGlobal.ItemIndex);
if v = DCompiler.global then
v := DCompiler.dmd;
fPaths.definedAsGlobal := v;
end; end;
procedure TCompilersPathsEditor.autoDetectDMD; procedure TCompilersPathsEditor.autoDetectDMD;

11
src/u_main.pas
View File

@ -626,7 +626,6 @@ type
procedure setAdditionalPATH(const value: string); procedure setAdditionalPATH(const value: string);
function getNativeProjecCompiler: DCompiler; function getNativeProjecCompiler: DCompiler;
procedure setNativeProjecCompiler(value: DCompiler); procedure setNativeProjecCompiler(value: DCompiler);
procedure setGlobalCompiler(value: DCompiler);
procedure setSplitterScsrollSpeed(value: byte); procedure setSplitterScsrollSpeed(value: byte);
published published
property additionalPATH: string read getAdditionalPATH write setAdditionalPath; property additionalPATH: string read getAdditionalPATH write setAdditionalPath;
@ -645,7 +644,7 @@ type
property flatLook: boolean read fFlatLook write fFlatLook; property flatLook: boolean read fFlatLook write fFlatLook;
property splitterScrollSpeed: byte read fSplitterScrollSpeed write setSplitterScsrollSpeed; property splitterScrollSpeed: byte read fSplitterScrollSpeed write setSplitterScsrollSpeed;
property showBuildDuration: boolean read fShowBuildDuration write fShowBuildDuration default false; property showBuildDuration: boolean read fShowBuildDuration write fShowBuildDuration default false;
property globalCompiler: DCompiler read fGlobalCompiler write setGLobalCompiler; property globalCompiler: DCompiler write fGlobalCompiler; deprecated;
// property toolBarScaling: TToolBarScaling read fToolBarScaling write fToolBarScaling stored false; // property toolBarScaling: TToolBarScaling read fToolBarScaling write fToolBarScaling stored false;
// published for IEditableOptions but stored by DCD wrapper since it reloads before MainForm // published for IEditableOptions but stored by DCD wrapper since it reloads before MainForm
property dcdPort: word read fDcdPort write fDcdPort stored false; property dcdPort: word read fDcdPort write fDcdPort stored false;
@ -866,14 +865,6 @@ begin
u_ceproject.setCEProjectCompiler(value); u_ceproject.setCEProjectCompiler(value);
end; end;
procedure TApplicationOptionsBase.setGlobalCompiler(value: DCompiler);
begin
if value = DCompiler.global then
value := low(DCompiler);
fGlobalCompiler := value;
u_compilers.globalCompiler := value;
end;
procedure TApplicationOptionsBase.setSplitterScsrollSpeed(value: byte); procedure TApplicationOptionsBase.setSplitterScsrollSpeed(value: byte);
begin begin
if value < 1 then if value < 1 then