Skip to content

Commit 741dceb

Browse files
delphidabblerdelphidabbler
committed
Merged revision(s) 3462-4550, 4566-4577 from tags/version-4.9.0:
This updates the trunk with changes made in release 4.9.0.
1 parent 547821d commit 741dceb

16 files changed

+57
-24
lines changed

‎Docs/ChangeLogs/ChangeLog-v4.txt‎

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

14+
Release v4.9.0 of 30 April 2014
15+
+ Added support for test compilation with, and detection of, Delphi XE6 compiler.
16+
+ Updated documentation re changes.
17+
+ Updated help file re changes.
18+
1419
Release v4.8.7 of 06 March 2014
1520
+ Changed so that automatic bug checker now correctly records last update date. This fixes bug #93 (http://bit.ly/NmSQUt).
1621
+ Updated to use v2 of the DelphiDabbler CodeSnip update web service when checking for availability of program updates.

‎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-2013, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -282,6 +282,9 @@ <h4>
282282
<li>
283283
<em>DXE5</em> &ndash; Delphi XE5
284284
</li>
285+
<li>
286+
<em>DXE6</em> &ndash; Delphi XE6
287+
</li>
285288
<li>
286289
<em>FPC</em> &ndash; Free Pascal
287290
</li>
@@ -558,6 +561,12 @@ <h4>
558561
<dd>
559562
Indicates whether Delphi XE5 was included in search.
560563
</dd>
564+
<dt>
565+
<strong>DXE6</strong> (Boolean)
566+
</dt>
567+
<dd>
568+
Indicates whether Delphi XE6 was included in search.
569+
</dd>
561570
<dt>
562571
<strong>FPC</strong> (Boolean)
563572
</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-2013, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -506,6 +506,9 @@ <h2>
506506
<li>
507507
<em>dXE5</em> &ndash; Delphi XE5 compiler
508508
</li>
509+
<li>
510+
<em>dXE6</em> &ndash; Delphi XE6 compiler
511+
</li>
509512
<li>
510513
<em>fpc</em> &ndash; Free Pascal compiler
511514
</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-2013, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -153,6 +153,7 @@ <h3>
153153
DelphiXE3=&lt;Y|N|Q|W&gt;
154154
DelphiXE4=&lt;Y|N|Q|W&gt;
155155
DelphiXE5=&lt;Y|N|Q|W&gt;
156+
DelphiXE6=&lt;Y|N|Q|W&gt;
156157
FPC=&lt;Y|N|Q|W&gt;
157158
Extra=&lt;extra-info-REML&gt;
158159
StandardFormat=&lt;0|1&gt;
@@ -316,6 +317,9 @@ <h3>
316317
<li>
317318
<em>DelphiXE5</em> &ndash; Delphi XE5 compiler
318319
</li>
320+
<li>
321+
<em>DelphiXE6</em> &ndash; Delphi XE6 compiler
322+
</li>
319323
<li>
320324
<em>FPC</em> &ndash; Free Pascal compiler
321325
</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-2013, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -556,6 +556,9 @@ <h3>
556556
<li>
557557
<em>dXE5</em> &ndash; Delphi XE5 compiler
558558
</li>
559+
<li>
560+
<em>dXE6</em> &ndash; Delphi XE6 compiler
561+
</li>
559562
<li>
560563
<em>fpc</em> &ndash; Free Pascal compiler
561564
</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 v2 to XE5 along with Free
17+
with each installed Win32 version of Delphi from v2 to XE6 along with Free
1818
Pascal.
1919

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

226226
Each user can configure compilers differently.
227227

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

232232

‎Src/Compilers.UBDS.pas‎

Lines changed: 7 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) 2006-2013, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2006-2014, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -137,6 +137,8 @@ function TBDSCompiler.GetIDString: string;
137137
Result := 'DXE4';
138138
ciDXE5:
139139
Result := 'DXE5';
140+
ciDXE6:
141+
Result := 'DXE6';
140142
else raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
141143
end;
142144
end;
@@ -149,6 +151,7 @@ function TBDSCompiler.GetName: string;
149151
sDelphiXE3 = 'Delphi XE3'; // name of Delphi XE3 compiler
150152
sDelphiXE4 = 'Delphi XE4'; // name of Delphi XE4 compiler
151153
sDelphiXE5 = 'Delphi XE5'; // name of Delphi XE5 compiler
154+
sDelphiXE6 = 'Delphi XE6'; // name of Delphi XE6 compiler
152155
begin
153156
case GetID of
154157
ciDXE:
@@ -161,6 +164,8 @@ function TBDSCompiler.GetName: string;
161164
Result := sDelphiXE4;
162165
ciDXE5:
163166
Result := sDelphiXE5;
167+
ciDXE6:
168+
Result := sDelphiXE6;
164169
else
165170
Result := Format(sCompilerName, [ProductVersion]);
166171
end;
@@ -186,6 +191,7 @@ function TBDSCompiler.InstallationRegKey: string;
186191
ciDXE3 : Result := '\Software\Embarcadero\BDS\10.0';
187192
ciDXE4 : Result := '\Software\Embarcadero\BDS\11.0';
188193
ciDXE5 : Result := '\Software\Embarcadero\BDS\12.0';
194+
ciDXE6 : Result := '\Software\Embarcadero\BDS\14.0';
189195
else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID');
190196
end;
191197
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-2013, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2005-2014, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -38,6 +38,7 @@ interface
3838
ciDXE3, // Delphi XE3
3939
ciDXE4, // Delphi XE4
4040
ciDXE5, // Delphi XE5
41+
ciDXE6, // Delphi XE6
4142
ciFPC // Free Pascal
4243
);
4344

@@ -50,7 +51,7 @@ interface
5051
/// compilers.</summary>
5152
cBDSCompilers = [
5253
ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2,
53-
ciDXE3, ciDXE4, ciDXE5
54+
ciDXE3, ciDXE4, ciDXE5, ciDXE6
5455
];
5556

5657
const

‎Src/DBIO.UIniDataReader.pas‎

Lines changed: 2 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-2013, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2005-2014, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -237,7 +237,7 @@ implementation
237237
'Delphi2', 'Delphi3', 'Delphi4', 'Delphi5', 'Delphi6', 'Delphi7',
238238
'Delphi2005Win32', 'Delphi2006Win32', 'Delphi2007', 'Delphi2009Win32',
239239
'Delphi2010', 'DelphiXE', 'DelphiXE2', 'DelphiXE3', 'DelphiXE4',
240-
'DelphiXE5', 'FPC'
240+
'DelphiXE5', 'DelphiXE6', 'FPC'
241241
);
242242

243243
{ 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-2013, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2007-2014, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -479,6 +479,7 @@ procedure TUserConfigFileUpdater.UpdateNamespaces;
479479
UpdateForCompiler('DXE3');
480480
UpdateForCompiler('DXE4');
481481
UpdateForCompiler('DXE5');
482+
UpdateForCompiler('DXE6');
482483
end;
483484

484485
{ TCommonConfigFileUpdater }

0 commit comments

Comments
 (0)