Skip to content

Commit 2a83b9e

Browse files
committed
Merge tag 'version-4.17.0' into develop
2 parents 336aa34 + b0dcb27 commit 2a83b9e

15 files changed

+105
-12
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
1212
From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
1313

1414

15+
## Release v4.17.0 of 31 July 2020
16+
17+
+ Added support for test compilation with, and detection of, Delphi 10.2 Tokyo, Delphi 10.3 Rio and Delphi 10.4 Sydney compilers.
18+
+ Updated documentation re changes.
19+
+ Updated help file re changes.
20+
21+
1522
## Release v4.16.0 of 31 May 2020
1623

1724
This is a significant update. It's purpose is to remove CodeSnip's dependencies on the delphidabbler.com website and associated web services. This was done because of the expected June 2020 closure or reduced functionality of delphidabbler.com. Some affected features were removed and others replaced with alternatives.

Docs/Design/FileFormats/config.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,15 @@ <h4>
247247
<li>
248248
<em>D101B</em> &ndash; Delphi 10.1 Berlin
249249
</li>
250+
<li>
251+
<em>D102T</em> &ndash; Delphi 10.2 Tokyo
252+
</li>
253+
<li>
254+
<em>D103R</em> &ndash; Delphi 10.3 Rio
255+
</li>
256+
<li>
257+
<em>D104S</em> &ndash; Delphi 10.4 Sydney
258+
</li>
250259
<li>
251260
<em>FPC</em> &ndash; Free Pascal
252261
</li>
@@ -536,6 +545,24 @@ <h4>
536545
<dd>
537546
Indicates whether Delphi 10.1 Berlin was included in the search.
538547
</dd>
548+
<dt>
549+
<code class="key">D102T</code> (Boolean)
550+
</dt>
551+
<dd>
552+
Indicates whether Delphi 10.2 Tokyo was included in the search.
553+
</dd>
554+
<dt>
555+
<code class="key">D103R</code> (Boolean)
556+
</dt>
557+
<dd>
558+
Indicates whether Delphi 10.3 Rio was included in the search.
559+
</dd>
560+
<dt>
561+
<code class="key">D104S</code> (Boolean)
562+
</dt>
563+
<dd>
564+
Indicates whether Delphi 10.4 Sydney was included in the search.
565+
</dd>
539566
<dt>
540567
<code class="key">FPC</code> (Boolean)
541568
</dt>

Docs/Design/FileFormats/export.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,15 @@ <h2>
551551
<li>
552552
<em>d101b</em> &ndash; Delphi 10.1 Berlin compiler
553553
</li>
554+
<li>
555+
<em>d102t</em> &ndash; Delphi 10.2 Tokyo compiler
556+
</li>
557+
<li>
558+
<em>d103r</em> &ndash; Delphi 10.3 Rio compiler
559+
</li>
560+
<li>
561+
<em>d104s</em> &ndash; Delphi 10.4 Sydney compiler
562+
</li>
554563
<li>
555564
<em>fpc</em> &ndash; Free Pascal compiler
556565
</li>

Docs/Design/FileFormats/main-db.html

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ <h4>
196196
DelphiXE8=&lt;Y|N|Q|W&gt;
197197
Delphi10S=&lt;Y|N|Q|W&gt;
198198
Delphi101B=&lt;Y|N|Q|W&gt;
199+
Delphi102T=&lt;Y|N|Q|W&gt;
200+
Delphi103R=&lt;Y|N|Q|W&gt;
201+
Delphi104S=&lt;Y|N|Q|W&gt;
199202
FPC=&lt;Y|N|Q|W&gt;
200203
Extra=&lt;extra-info-REML&gt;
201204
StandardFormat=&lt;0|1&gt;
@@ -403,6 +406,15 @@ <h4>
403406
<li>
404407
<code class="key">Delphi101B</code> – Delphi 10.1 Berlin compiler
405408
</li>
409+
<li>
410+
<code class="key">Delphi102T</code> – Delphi 10.2 Tokyo compiler *
411+
</li>
412+
<li>
413+
<code class="key">Delphi103R</code> – Delphi 10.3 Rio compiler *
414+
</li>
415+
<li>
416+
<code class="key">Delphi104S</code> – Delphi 10.4 Sydney compiler *
417+
</li>
406418
<li>
407419
<code class="key">FPC</code> – Free Pascal compiler
408420
</li>
@@ -430,6 +442,9 @@ <h4>
430442
<p>
431443
Any compiler not recognised by a given version of CodeSnip is ignored.
432444
</p>
445+
<p>
446+
* These compilers are not yet supported by the online <a href="https://github.com/delphidabbler/code-snippets">DelphiDabbler Code Snippets Database</a>.
447+
</p>
433448
</dd>
434449

435450
<dt>

Docs/Design/FileFormats/user-db.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,15 @@ <h3>
569569
<li>
570570
<em>d101b</em> &ndash; Delphi 10.1 Berlin compiler
571571
</li>
572+
<li>
573+
<em>d102t</em> &ndash; Delphi 10.2 Tokyo compiler
574+
</li>
575+
<li>
576+
<em>d103r</em> &ndash; Delphi 10.3 Rio compiler
577+
</li>
578+
<li>
579+
<em>d104s</em> &ndash; Delphi 10.4 Sydney compiler
580+
</li>
572581
<li>
573582
<em>fpc</em> &ndash; Free Pascal compiler
574583
</li>

Docs/ReadMe.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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.1 Berlin
17+
with each installed Win32 version of Delphi from Delphi 2 to Delphi 10.4 Sydney
1818
and Free Pascal.
1919

2020
Compilable Pascal units can be created that contain selected snippets.
@@ -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.1 Berlin) and
204+
Windows 32 version of Delphi (from Delphi 2 to Delphi 10.4 Sydney) and
205205
FreePascal, providing some simple rules are followed.
206206

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

219219
Each user can configure compilers differently.
220220

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

Src/Compilers.UBDS.pas

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@ function TBDSCompiler.GetIDString: string;
144144
Result := 'D10S';
145145
ciD101B:
146146
Result := 'D101B';
147+
ciD102T:
148+
Result := 'D102T';
149+
ciD103R:
150+
Result := 'D103R';
151+
ciD104S:
152+
Result := 'D104S';
147153
else
148154
raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
149155
end;
@@ -162,6 +168,9 @@ function TBDSCompiler.GetName: string;
162168
sDelphiXE8 = 'Delphi XE8'; // name of Delphi XE8 compiler
163169
sDelphi10S = 'Delphi 10 Seattle'; // name of Delphi 10 compiler
164170
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
165174
begin
166175
case GetID of
167176
ciDXE:
@@ -184,6 +193,12 @@ function TBDSCompiler.GetName: string;
184193
Result := sDelphi10S;
185194
ciD101B:
186195
Result := sDelphi101B;
196+
ciD102T:
197+
Result := sDelphi102T;
198+
ciD103R:
199+
Result := sDelphi103R;
200+
ciD104S:
201+
Result := sDelphi104S;
187202
else
188203
Result := Format(sCompilerName, [ProductVersion]);
189204
end;
@@ -214,6 +229,9 @@ function TBDSCompiler.InstallationRegKey: string;
214229
ciDXE8 : Result := '\Software\Embarcadero\BDS\16.0';
215230
ciD10S : Result := '\Software\Embarcadero\BDS\17.0';
216231
ciD101B : Result := '\Software\Embarcadero\BDS\18.0';
232+
ciD102T : Result := '\Software\Embarcadero\BDS\19.0';
233+
ciD103R : Result := '\Software\Embarcadero\BDS\20.0';
234+
ciD104S : Result := '\Software\Embarcadero\BDS\21.0';
217235
else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID');
218236
end;
219237
end;

Src/Compilers.UGlobals.pas

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ interface
4040
ciDXE8, // Delphi XE8
4141
ciD10S, // Delphi 10 Seattle
4242
ciD101B, // Delphi 10.1 Berlin
43+
ciD102T, // Delphi 10.2 Tokyo
44+
ciD103R, // Delphi 10.3 Rio
45+
ciD104S, // Delphi 10.4 Sydney
4346
ciFPC // Free Pascal
4447
);
4548

@@ -52,7 +55,8 @@ interface
5255
/// compilers.</summary>
5356
cBDSCompilers = [
5457
ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2,
55-
ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S, ciD101B
58+
ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S, ciD101B, ciD102T,
59+
ciD103R, ciD104S
5660
];
5761

5862
const

Src/DBIO.UIniDataReader.pas

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

241241
{ TIniDataReader }

Src/FrCodeGenPrefs.pas

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,9 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu;
679679
AddMenuItem('Delphi XE8', 29.0);
680680
AddMenuItem('Delphi 10 Seattle', 30.0);
681681
AddMenuItem('Delphi 10.1 Berlin', 31.0);
682+
AddMenuItem('Delphi 10.2 Tokyo', 32.0);
683+
AddMenuItem('Delphi 10.3 Rio', 33.0);
684+
AddMenuItem('Delphi 10.4 Sydney', 34.0);
682685
end;
683686

684687
procedure TCodeGenPrefsFrame.PreDefCompilerMenuClick(Sender: TObject);

0 commit comments

Comments
 (0)