Skip to content

Commit a653877

Browse files
author
DelphiDabbler
committed
Merge branch 'release/4.15.0'
2 parents 4f4b6f0 + 4772539 commit a653877

18 files changed

+112
-56
lines changed

‎Docs/ChangeLogs/ChangeLog-v4.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
; Change Log for CodeSnip Release 4
1212
; ------------------------------------------------------------------------------
1313

14+
Release v4.15.0 of 13 July 2016
15+
+ Added support for test compilation with, and detection of, Delphi 10.1 Berlin compiler.
16+
+ Tweaked size of compiler list in Configure Compilers dialogue box to accommodate length of Delphi 10.1 Berline compiler name!
17+
+ Updated documentation re changes.
18+
+ Updated help file re changes.
19+
1420
Release v4.14.0 of 19 March 2016
1521
+ Changes to About Box's "Paths" tab:
1622
- Added new buttons to display the contents of the system and per-user config files.

‎Docs/Design/FileFormats/config.html‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at http://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -294,6 +294,9 @@ <h4>
294294
<li>
295295
<em>D10S</em> &ndash; Delphi 10 Seattle
296296
</li>
297+
<li>
298+
<em>D101B</em> &ndash; Delphi 10.1 Berlin
299+
</li>
297300
<li>
298301
<em>FPC</em> &ndash; Free Pascal
299302
</li>
@@ -594,6 +597,12 @@ <h4>
594597
<dd>
595598
Indicates whether Delphi 10 Seattle was included in search.
596599
</dd>
600+
<dt>
601+
<strong>D101B</strong> (Boolean)
602+
</dt>
603+
<dd>
604+
Indicates whether Delphi 10.1 Berlin was included in search.
605+
</dd>
597606
<dt>
598607
<strong>FPC</strong> (Boolean)
599608
</dt>

‎Docs/Design/FileFormats/export.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at http://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -518,6 +518,9 @@ <h2>
518518
<li>
519519
<em>d10s</em> &ndash; Delphi 10 Seattle compiler
520520
</li>
521+
<li>
522+
<em>d101b</em> &ndash; Delphi 10.1 Berlin compiler
523+
</li>
521524
<li>
522525
<em>fpc</em> &ndash; Free Pascal compiler
523526
</li>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at http://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -157,6 +157,7 @@ <h3>
157157
DelphiXE7=&lt;Y|N|Q|W&gt;
158158
DelphiXE8=&lt;Y|N|Q|W&gt;
159159
Delphi10S=&lt;Y|N|Q|W&gt;
160+
Delphi101B=&lt;Y|N|Q|W&gt;
160161
FPC=&lt;Y|N|Q|W&gt;
161162
Extra=&lt;extra-info-REML&gt;
162163
StandardFormat=&lt;0|1&gt;
@@ -347,6 +348,9 @@ <h3>
347348
<li>
348349
<em>Delphi10S</em> &ndash; Delphi 10 Seattle compiler
349350
</li>
351+
<li>
352+
<em>Delphi101B</em> &ndash; Delphi 10.1 Berlin compiler
353+
</li>
350354
<li>
351355
<em>FPC</em> &ndash; Free Pascal compiler
352356
</li>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at http://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -568,6 +568,9 @@ <h3>
568568
<li>
569569
<em>d10s</em> &ndash; Delphi 10 Seattle compiler
570570
</li>
571+
<li>
572+
<em>d101b</em> &ndash; Delphi 10.1 Berlin compiler
573+
</li>
571574
<li>
572575
<em>fpc</em> &ndash; Free Pascal compiler
573576
</li>

‎Docs/ReadMe.txt‎

Lines changed: 2 additions & 2 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 Seattle
17+
with each installed Win32 version of Delphi from Delphi 2 to Delphi 10.1 Berlin
1818
along with Free Pascal.
1919

2020
Compilable Pascal units can be created that contain selected snippets.
@@ -225,7 +225,7 @@ dialogue" in the help file index).
225225

226226
Each user can configure compilers differently.
227227

228-
Delphi XE2 to XE8 and Delphi 10 Seattle may need to be configured to search for
228+
Delphi XE2 to XE8 and Delphi 10.1 Berlin may need to be configured to search for
229229
required units in the correct namespaces. This is explained in the Add/Edit
230230
Snippet Dialogue Box help topic and in the FAQ at
231231
http://delphidabbler.com/url/codesnip-and-xe2.

‎Src/Compilers.UBDS.pas‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2006-2015, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2006-2016, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -145,23 +145,26 @@ function TBDSCompiler.GetIDString: string;
145145
Result := 'DXE8';
146146
ciD10S:
147147
Result := 'D10S';
148+
ciD101B:
149+
Result := 'D101B';
148150
else
149151
raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
150152
end;
151153
end;
152154

153155
function TBDSCompiler.GetName: string;
154156
resourcestring
155-
sCompilerName = 'Delphi %d'; // template for name of compiler
156-
sDelphiXE = 'Delphi XE'; // name of Delphi XE compiler
157-
sDelphiXE2 = 'Delphi XE2'; // name of Delphi XE2 compiler
158-
sDelphiXE3 = 'Delphi XE3'; // name of Delphi XE3 compiler
159-
sDelphiXE4 = 'Delphi XE4'; // name of Delphi XE4 compiler
160-
sDelphiXE5 = 'Delphi XE5'; // name of Delphi XE5 compiler
161-
sDelphiXE6 = 'Delphi XE6'; // name of Delphi XE6 compiler
162-
sDelphiXE7 = 'Delphi XE7'; // name of Delphi XE7 compiler
163-
sDelphiXE8 = 'Delphi XE8'; // name of Delphi XE8 compiler
164-
sDelphi10S = 'Delphi 10 Seattle'; // name of Delphi 10 compiler
157+
sCompilerName = 'Delphi %d'; // template for name of compiler
158+
sDelphiXE = 'Delphi XE'; // name of Delphi XE compiler
159+
sDelphiXE2 = 'Delphi XE2'; // name of Delphi XE2 compiler
160+
sDelphiXE3 = 'Delphi XE3'; // name of Delphi XE3 compiler
161+
sDelphiXE4 = 'Delphi XE4'; // name of Delphi XE4 compiler
162+
sDelphiXE5 = 'Delphi XE5'; // name of Delphi XE5 compiler
163+
sDelphiXE6 = 'Delphi XE6'; // name of Delphi XE6 compiler
164+
sDelphiXE7 = 'Delphi XE7'; // name of Delphi XE7 compiler
165+
sDelphiXE8 = 'Delphi XE8'; // name of Delphi XE8 compiler
166+
sDelphi10S = 'Delphi 10 Seattle'; // name of Delphi 10 compiler
167+
sDelphi101B = 'Delphi 10.1 Berlin'; // name of Delphi 10.1 compiler
165168
begin
166169
case GetID of
167170
ciDXE:
@@ -182,6 +185,8 @@ function TBDSCompiler.GetName: string;
182185
Result := sDelphiXE8;
183186
ciD10S:
184187
Result := sDelphi10S;
188+
ciD101B:
189+
Result := sDelphi101B;
185190
else
186191
Result := Format(sCompilerName, [ProductVersion]);
187192
end;
@@ -211,6 +216,7 @@ function TBDSCompiler.InstallationRegKey: string;
211216
ciDXE7 : Result := '\Software\Embarcadero\BDS\15.0';
212217
ciDXE8 : Result := '\Software\Embarcadero\BDS\16.0';
213218
ciD10S : Result := '\Software\Embarcadero\BDS\17.0';
219+
ciD101B : Result := '\Software\Embarcadero\BDS\18.0';
214220
else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID');
215221
end;
216222
end;

‎Src/Compilers.UGlobals.pas‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2005-2015, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2005-2016, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -42,6 +42,7 @@ interface
4242
ciDXE7, // Delphi XE7
4343
ciDXE8, // Delphi XE8
4444
ciD10S, // Delphi 10 Seattle
45+
ciD101B, // Delphi 10.1 Berlin
4546
ciFPC // Free Pascal
4647
);
4748

@@ -54,7 +55,7 @@ interface
5455
/// compilers.</summary>
5556
cBDSCompilers = [
5657
ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2,
57-
ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S
58+
ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S, ciD101B
5859
];
5960

6061
const

‎Src/DBIO.UIniDataReader.pas‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2005-2015, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2005-2016, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -237,7 +237,8 @@ implementation
237237
'Delphi2', 'Delphi3', 'Delphi4', 'Delphi5', 'Delphi6', 'Delphi7',
238238
'Delphi2005Win32', 'Delphi2006Win32', 'Delphi2007', 'Delphi2009Win32',
239239
'Delphi2010', 'DelphiXE', 'DelphiXE2', 'DelphiXE3', 'DelphiXE4',
240-
'DelphiXE5', 'DelphiXE6', 'DelphiXE7', 'DelphiXE8', 'Delphi10S', 'FPC'
240+
'DelphiXE5', 'DelphiXE6', 'DelphiXE7', 'DelphiXE8', 'Delphi10S',
241+
'Delphi101B', 'FPC'
241242
);
242243

243244
{ TIniDataReader }

‎Src/FirstRun.UConfigFile.pas‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2007-2015, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2007-2016, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -483,6 +483,7 @@ procedure TUserConfigFileUpdater.UpdateNamespaces;
483483
UpdateForCompiler('DXE7');
484484
UpdateForCompiler('DXE8');
485485
UpdateForCompiler('D10S');
486+
UpdateForCompiler('D101B');
486487
end;
487488

488489
{ TCommonConfigFileUpdater }

0 commit comments

Comments
 (0)