Skip to content

Commit 8df6732

Browse files
author
cahamo
committed
Merge branch 'feature/update-delphi-support-to-11' into develop
2 parents 2a5e5a9 + 6eec512 commit 8df6732

15 files changed

+76
-56
lines changed

‎Docs/Design/FileFormats/config.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ <h4>
256256
<li>
257257
<em>D104S</em> &ndash; Delphi 10.4 Sydney
258258
</li>
259+
<li>
260+
<em>D11A</em> &ndash; Delphi 11 Alexandria
261+
</li>
259262
<li>
260263
<em>FPC</em> &ndash; Free Pascal
261264
</li>
@@ -563,6 +566,12 @@ <h4>
563566
<dd>
564567
Indicates whether Delphi 10.4 Sydney was included in the search.
565568
</dd>
569+
<dt>
570+
<code class="key">D11A</code> (Boolean)
571+
</dt>
572+
<dd>
573+
Indicates whether Delphi 11 Alexandria was included in the search.
574+
</dd>
566575
<dt>
567576
<code class="key">FPC</code> (Boolean)
568577
</dt>

‎Docs/Design/FileFormats/export.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,9 @@ <h2>
560560
<li>
561561
<em>d104s</em> &ndash; Delphi 10.4 Sydney compiler
562562
</li>
563+
<li>
564+
<em>d11a</em> &ndash; Delphi 11 Alexandria compiler
565+
</li>
563566
<li>
564567
<em>fpc</em> &ndash; Free Pascal compiler
565568
</li>

‎Docs/Design/FileFormats/main-db.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
22
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
33
<!--
44
* This Source Code Form is subject to the terms of the Mozilla Public License,
@@ -199,6 +199,7 @@ <h4>
199199
Delphi102T=&lt;Y|N|Q|W&gt;
200200
Delphi103R=&lt;Y|N|Q|W&gt;
201201
Delphi104S=&lt;Y|N|Q|W&gt;
202+
Delphi11A=&lt;Y|N|Q|W&gt;
202203
FPC=&lt;Y|N|Q|W&gt;
203204
Extra=&lt;extra-info-REML&gt;
204205
StandardFormat=&lt;0|1&gt;
@@ -415,6 +416,9 @@ <h4>
415416
<li>
416417
<code class="key">Delphi104S</code> – Delphi 10.4 Sydney compiler *
417418
</li>
419+
<li>
420+
<code class="key">Delphi11A</code> – Delphi 11 Alexandria compiler *
421+
</li>
418422
<li>
419423
<code class="key">FPC</code> – Free Pascal compiler
420424
</li>

‎Docs/Design/FileFormats/user-db.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,9 @@ <h3>
578578
<li>
579579
<em>d104s</em> &ndash; Delphi 10.4 Sydney compiler
580580
</li>
581+
<li>
582+
<em>d11a</em> &ndash; Delphi 11 Alexandria compiler
583+
</li>
581584
<li>
582585
<em>fpc</em> &ndash; Free Pascal compiler
583586
</li>

‎Docs/ReadMe.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ online DelphiDabbler Code Snippets database as well as maintain a database of
1414
user-defined snippets.
1515

1616
It displays details of each snippet in the database and can test-compile them
17-
with each installed Win32 version of Delphi from Delphi 2 to Delphi 10.4 Sydney
18-
and Free Pascal.
17+
with each installed Win32 version of Delphi from Delphi 2 to Delphi 11
18+
Alexandria and Free Pascal.
1919

2020
Compilable Pascal units can be created that contain selected snippets.
2121

@@ -201,7 +201,7 @@ Configuring CodeSnip to Work With Your Compilers
201201
================================================================================
202202

203203
A feature of CodeSnip is its ability to test compile snippets with any installed
204-
Windows 32 version of Delphi (from Delphi 2 to Delphi 10.4 Sydney) and
204+
Windows 32 version of Delphi (from Delphi 2 to Delphi 11 Alexandria) and
205205
FreePascal, providing some simple rules are followed.
206206

207207
When CodeSnip is first installed it knows nothing about the available compilers
@@ -218,9 +218,9 @@ dialogue" in the help file index).
218218

219219
Each user can configure compilers differently.
220220

221-
Delphi XE2 to XE8 and Delphi 10.4 Sydney may need to be configured to search for
222-
required units in the correct namespaces. This is explained in the Add/Edit
223-
Snippet Dialogue Box help topic and in the FAQ at
221+
Delphi XE2 and later may need to be configured to search for required units in
222+
the correct namespaces. This is explained in the Add/Edit Snippet Dialogue Box
223+
help topic and in the FAQ at
224224
https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md#faq-1
225225

226226
Any type of snippet other than "freeform" can be test compiled.

‎Src/Compilers.UBDS.pas

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,27 +150,32 @@ function TBDSCompiler.GetIDString: string;
150150
Result := 'D103R';
151151
ciD104S:
152152
Result := 'D104S';
153+
ciD11A:
154+
Result := 'D11A';
153155
else
154156
raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
155157
end;
156158
end;
157159

158160
function TBDSCompiler.GetName: string;
159161
resourcestring
160-
sCompilerName = 'Delphi %d'; // template for name of compiler
161-
sDelphiXE = 'Delphi XE'; // name of Delphi XE compiler
162-
sDelphiXE2 = 'Delphi XE2'; // name of Delphi XE2 compiler
163-
sDelphiXE3 = 'Delphi XE3'; // name of Delphi XE3 compiler
164-
sDelphiXE4 = 'Delphi XE4'; // name of Delphi XE4 compiler
165-
sDelphiXE5 = 'Delphi XE5'; // name of Delphi XE5 compiler
166-
sDelphiXE6 = 'Delphi XE6'; // name of Delphi XE6 compiler
167-
sDelphiXE7 = 'Delphi XE7'; // name of Delphi XE7 compiler
168-
sDelphiXE8 = 'Delphi XE8'; // name of Delphi XE8 compiler
169-
sDelphi10S = 'Delphi 10 Seattle'; // name of Delphi 10 compiler
170-
sDelphi101B = 'Delphi 10.1 Berlin'; // name of Delphi 10.1 compiler
171-
sDelphi102T = 'Delphi 10.2 Tokyo'; // name of Delphi 10.2 compiler
172-
sDelphi103R = 'Delphi 10.3 Rio'; // name of Delphi 10.3 compiler
173-
sDelphi104S = 'Delphi 10.4 Sydney'; // name of Delphi 10.4 compiler
162+
// template for name of compiler with simple integer version number
163+
sCompilerName = 'Delphi %d';
164+
// names of compilers not suitable for use with template
165+
sDelphiXE = 'Delphi XE';
166+
sDelphiXE2 = 'Delphi XE2';
167+
sDelphiXE3 = 'Delphi XE3';
168+
sDelphiXE4 = 'Delphi XE4';
169+
sDelphiXE5 = 'Delphi XE5';
170+
sDelphiXE6 = 'Delphi XE6';
171+
sDelphiXE7 = 'Delphi XE7';
172+
sDelphiXE8 = 'Delphi XE8';
173+
sDelphi10S = 'Delphi 10 Seattle';
174+
sDelphi101B = 'Delphi 10.1 Berlin';
175+
sDelphi102T = 'Delphi 10.2 Tokyo';
176+
sDelphi103R = 'Delphi 10.3 Rio';
177+
sDelphi104S = 'Delphi 10.4 Sydney';
178+
sDelphi11A = 'Delphi 11 Alexandria';
174179
begin
175180
case GetID of
176181
ciDXE:
@@ -199,6 +204,8 @@ function TBDSCompiler.GetName: string;
199204
Result := sDelphi103R;
200205
ciD104S:
201206
Result := sDelphi104S;
207+
ciD11A:
208+
Result := sDelphi11A;
202209
else
203210
Result := Format(sCompilerName, [ProductVersion]);
204211
end;
@@ -232,6 +239,7 @@ function TBDSCompiler.InstallationRegKey: string;
232239
ciD102T : Result := '\Software\Embarcadero\BDS\19.0';
233240
ciD103R : Result := '\Software\Embarcadero\BDS\20.0';
234241
ciD104S : Result := '\Software\Embarcadero\BDS\21.0';
242+
ciD11A : Result := '\Software\Embarcadero\BDS\22.0';
235243
else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID');
236244
end;
237245
end;

‎Src/Compilers.UGlobals.pas

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ interface
4242
ciD101B, // Delphi 10.1 Berlin
4343
ciD102T, // Delphi 10.2 Tokyo
4444
ciD103R, // Delphi 10.3 Rio
45-
ciD104S, // Delphi 10.4 Sydney
45+
ciD104S, // Delphi 10.4 Sydney,
46+
ciD11A, // Delphi 11 Alexandria
4647
ciFPC // Free Pascal
4748
);
4849

@@ -56,7 +57,7 @@ interface
5657
cBDSCompilers = [
5758
ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2,
5859
ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S, ciD101B, ciD102T,
59-
ciD103R, ciD104S
60+
ciD103R, ciD104S, ciD11A
6061
];
6162

6263
const

‎Src/DBIO.UIniDataReader.pas

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ implementation
235235
'Delphi2005Win32', 'Delphi2006Win32', 'Delphi2007', 'Delphi2009Win32',
236236
'Delphi2010', 'DelphiXE', 'DelphiXE2', 'DelphiXE3', 'DelphiXE4',
237237
'DelphiXE5', 'DelphiXE6', 'DelphiXE7', 'DelphiXE8', 'Delphi10S',
238-
'Delphi101B', 'Delphi102T', 'Delphi103R', 'Delphi104S', 'FPC'
238+
'Delphi101B', 'Delphi102T', 'Delphi103R', 'Delphi104S', 'Delphi11A',
239+
'FPC'
239240
);
240241

241242
{ TIniDataReader }

‎Src/FmCompilersDlg.dfm

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
inherited CompilersDlg: TCompilersDlg
22
Caption = 'Configure Compilers'
33
ClientHeight = 381
4-
ClientWidth = 524
5-
ExplicitWidth = 530
4+
ClientWidth = 547
5+
ExplicitWidth = 553
66
ExplicitHeight = 410
77
PixelsPerInch = 96
88
TextHeight = 13
99
inherited pnlBody: TPanel
10-
Width = 505
11-
ExplicitWidth = 505
10+
Width = 531
11+
ExplicitWidth = 531
1212
object pbBanner: TPaintBox
13-
Left = 135
13+
Left = 161
1414
Top = 0
1515
Width = 370
1616
Height = 23
@@ -26,7 +26,7 @@ inherited CompilersDlg: TCompilersDlg
2626
object lbCompilers: TListBox
2727
Left = 0
2828
Top = 0
29-
Width = 129
29+
Width = 155
3030
Height = 292
3131
Style = lbOwnerDrawFixed
3232
Ctl3D = True
@@ -36,7 +36,7 @@ inherited CompilersDlg: TCompilersDlg
3636
TabOrder = 0
3737
end
3838
object pcCompiler: TPageControl
39-
Left = 135
39+
Left = 161
4040
Top = 29
4141
Width = 370
4242
Height = 263
@@ -52,6 +52,8 @@ inherited CompilersDlg: TCompilersDlg
5252
Height = 235
5353
Align = alClient
5454
TabOrder = 0
55+
ExplicitLeft = -4
56+
ExplicitTop = 2
5557
end
5658
end
5759
object tsSwitches: TTabSheet
@@ -123,10 +125,6 @@ inherited CompilersDlg: TCompilersDlg
123125
object tsLog: TTabSheet
124126
Caption = 'Output Log'
125127
ImageIndex = 1
126-
ExplicitLeft = 0
127-
ExplicitTop = 0
128-
ExplicitWidth = 0
129-
ExplicitHeight = 0
130128
inline frmLog: TCompilersDlgLogFrame
131129
Left = 0
132130
Top = 0

‎Src/FmFindCompilerDlg.dfm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ inherited FindCompilerDlg: TFindCompilerDlg
2929
end
3030
object lbCompilerVers: TCheckListBox
3131
Left = 0
32-
Top = 16
33-
Width = 136
32+
Top = 19
33+
Width = 154
3434
Height = 186
3535
OnClickCheck = lbCompilerVersClickCheck
3636
IntegralHeight = True

‎Src/FmSnippetsEditorDlg.dfm

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inherited SnippetsEditorDlg: TSnippetsEditorDlg
66
ClientWidth = 738
77
Position = poDesigned
88
ExplicitWidth = 744
9-
ExplicitHeight = 606
9+
ExplicitHeight = 607
1010
PixelsPerInch = 96
1111
TextHeight = 13
1212
inherited pnlBody: TPanel
@@ -19,7 +19,7 @@ inherited SnippetsEditorDlg: TSnippetsEditorDlg
1919
Top = 0
2020
Width = 662
2121
Height = 504
22-
ActivePage = tsReferences
22+
ActivePage = tsCompileResults
2323
Align = alClient
2424
TabOrder = 0
2525
OnChange = pcMainChange
@@ -193,10 +193,6 @@ inherited SnippetsEditorDlg: TSnippetsEditorDlg
193193
object tsReferences: TTabSheet
194194
Caption = 'References'
195195
ImageIndex = 1
196-
ExplicitLeft = 0
197-
ExplicitTop = 0
198-
ExplicitWidth = 0
199-
ExplicitHeight = 0
200196
object lblXRefs: TLabel
201197
Left = 3
202198
Top = 3
@@ -326,10 +322,6 @@ inherited SnippetsEditorDlg: TSnippetsEditorDlg
326322
object tsCompileResults: TTabSheet
327323
Caption = 'Compile Results'
328324
ImageIndex = 3
329-
ExplicitLeft = 0
330-
ExplicitTop = 0
331-
ExplicitWidth = 0
332-
ExplicitHeight = 0
333325
object lblCompilers: TLabel
334326
Left = 3
335327
Top = 3
@@ -347,8 +339,8 @@ inherited SnippetsEditorDlg: TSnippetsEditorDlg
347339
end
348340
object lblCompResDesc: TLabel
349341
Left = 3
350-
Top = 405
351-
Width = 166
342+
Top = 401
343+
Width = 186
352344
Height = 60
353345
AutoSize = False
354346
Caption =
@@ -359,7 +351,7 @@ inherited SnippetsEditorDlg: TSnippetsEditorDlg
359351
object lbCompilers: TListBox
360352
Left = 3
361353
Top = 22
362-
Width = 166
354+
Width = 186
363355
Height = 373
364356
Style = lbOwnerDrawFixed
365357
ItemHeight = 28

‎Src/FrCodeGenPrefs.pas

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,7 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu;
682682
AddMenuItem('Delphi 10.2 Tokyo', 32.0);
683683
AddMenuItem('Delphi 10.3 Rio', 33.0);
684684
AddMenuItem('Delphi 10.4 Sydney', 34.0);
685+
AddMenuItem('Delphi 11 Alexandria', 35.0);
685686
end;
686687

687688
procedure TCodeGenPrefsFrame.PreDefCompilerMenuClick(Sender: TObject);

‎Src/Help/HTML/about_compiler_checks.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>
3434
</p>
3535
<p>
3636
The supported compilers are the Win32 Delphi compilers from Delphi 2 to
37-
Delphi 10.4 Sydney and Free Pascal.
37+
Delphi 11 Alexandria and Free Pascal.
3838
</p>
3939
<h2>
4040
Configuring CodeSnip

‎Src/Help/HTML/dlg_configcompilers.htm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,9 @@ <h2>
281281
</h2>
282282
<p>
283283
<em>CodeSnip</em> can automatically detect the presence of Win 32 Delphi
284-
compilers from Delphi 2 to Delphi 10.4 Sydney. Click the <em>Detect Delphi
285-
Compilers</em> button to do this. Any supported installed version of
286-
Delphi will be recorded. This can save considerable time and avoid
284+
compilers from Delphi 2 to Delphi 11 Alexandria. Click the <em>Detect
285+
Delphi Compilers</em> button to do this. Any supported installed version
286+
of Delphi will be recorded. This can save considerable time and avoid
287287
errors.
288288
</p>
289289
<p>

‎Src/UXMLDocConsts.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ interface
6666
cCompilerIDs: array[TCompilerID] of string = (
6767
'd2', 'd3', 'd4', 'd5', 'd6', 'd7',
6868
'd2005', 'd2006', 'd2007', 'd2009', 'd2010',
69-
'dXE', 'dXE2', 'dXE3', 'dDX4' {error, but in use},
69+
'dXE', 'dXE2', 'dXE3', 'dDX4' {error, but in use so can't fix},
7070
'dXE5', 'dXE6', 'dXE7', 'dXE8',
71-
'd10s', 'd101b', 'd102t', 'd103r', 'd104s',
71+
'd10s', 'd101b', 'd102t', 'd103r', 'd104s', 'd11a',
7272
'fpc'
7373
);
7474

0 commit comments

Comments
 (0)