Skip to content

Commit b3c0c00

Browse files
committed
Merged revision(s) 4575-4590 from tags/version-4.10.0:
This updates the trunk with changes made in release 4.10.0.
1 parent 741dceb commit b3c0c00

16 files changed

+47
-13
lines changed

Docs/ChangeLogs/ChangeLog-v4.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@
1111
; Change Log for CodeSnip Release 4
1212
; ------------------------------------------------------------------------------
1313

14+
Release v4.10.0 of 12 September 2014
15+
+ Added support for test compilation with, and detection of, Delphi XE7 compiler.
16+
+ Updated documentation re changes.
17+
+ Updated help file re changes.
18+
1419
Release v4.9.0 of 30 April 2014
1520
+ Added support for test compilation with, and detection of, Delphi XE6 compiler.
1621
+ Updated documentation re changes.
1722
+ Updated help file re changes.
1823

1924
Release v4.8.7 of 06 March 2014
20-
+ Changed so that automatic bug checker now correctly records last update date. This fixes bug #93 (http://bit.ly/NmSQUt).
25+
+ Fixed automatic update checker so that it correctly records last update date. This fixes bug #93 (http://bit.ly/NmSQUt).
2126
+ Updated to use v2 of the DelphiDabbler CodeSnip update web service when checking for availability of program updates.
2227
+ Minor corrections to help file.
2328

Docs/Design/FileFormats/config.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ <h4>
285285
<li>
286286
<em>DXE6</em> &ndash; Delphi XE6
287287
</li>
288+
<li>
289+
<em>DXE7</em> &ndash; Delphi XE7
290+
</li>
288291
<li>
289292
<em>FPC</em> &ndash; Free Pascal
290293
</li>
@@ -567,6 +570,12 @@ <h4>
567570
<dd>
568571
Indicates whether Delphi XE6 was included in search.
569572
</dd>
573+
<dt>
574+
<strong>DXE7</strong> (Boolean)
575+
</dt>
576+
<dd>
577+
Indicates whether Delphi XE7 was included in search.
578+
</dd>
570579
<dt>
571580
<strong>FPC</strong> (Boolean)
572581
</dt>

Docs/Design/FileFormats/export.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,9 @@ <h2>
509509
<li>
510510
<em>dXE6</em> &ndash; Delphi XE6 compiler
511511
</li>
512+
<li>
513+
<em>dXE7</em> &ndash; Delphi XE7 compiler
514+
</li>
512515
<li>
513516
<em>fpc</em> &ndash; Free Pascal compiler
514517
</li>

Docs/Design/FileFormats/main-db.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ <h3>
154154
DelphiXE4=&lt;Y|N|Q|W&gt;
155155
DelphiXE5=&lt;Y|N|Q|W&gt;
156156
DelphiXE6=&lt;Y|N|Q|W&gt;
157+
DelphiXE7=&lt;Y|N|Q|W&gt;
157158
FPC=&lt;Y|N|Q|W&gt;
158159
Extra=&lt;extra-info-REML&gt;
159160
StandardFormat=&lt;0|1&gt;
@@ -320,6 +321,9 @@ <h3>
320321
<li>
321322
<em>DelphiXE6</em> &ndash; Delphi XE6 compiler
322323
</li>
324+
<li>
325+
<em>DelphiXE7</em> &ndash; Delphi XE7 compiler
326+
</li>
323327
<li>
324328
<em>FPC</em> &ndash; Free Pascal compiler
325329
</li>

Docs/Design/FileFormats/user-db.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,9 @@ <h3>
559559
<li>
560560
<em>dXE6</em> &ndash; Delphi XE6 compiler
561561
</li>
562+
<li>
563+
<em>dXE7</em> &ndash; Delphi XE7 compiler
564+
</li>
562565
<li>
563566
<em>fpc</em> &ndash; Free Pascal compiler
564567
</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 v2 to XE6 along with Free
17+
with each installed Win32 version of Delphi from v2 to XE7 along with Free
1818
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 XE6 may need to be configured to search for required units in the
228+
Delphi XE2 to XE7 may need to be configured to search for required units in the
229229
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

Src/Compilers.UBDS.pas

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,10 @@ function TBDSCompiler.GetIDString: string;
139139
Result := 'DXE5';
140140
ciDXE6:
141141
Result := 'DXE6';
142-
else raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
142+
ciDXE7:
143+
Result := 'DXE7';
144+
else
145+
raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
143146
end;
144147
end;
145148

@@ -152,6 +155,7 @@ function TBDSCompiler.GetName: string;
152155
sDelphiXE4 = 'Delphi XE4'; // name of Delphi XE4 compiler
153156
sDelphiXE5 = 'Delphi XE5'; // name of Delphi XE5 compiler
154157
sDelphiXE6 = 'Delphi XE6'; // name of Delphi XE6 compiler
158+
sDelphiXE7 = 'Delphi XE7'; // name of Delphi XE7 compiler
155159
begin
156160
case GetID of
157161
ciDXE:
@@ -166,6 +170,8 @@ function TBDSCompiler.GetName: string;
166170
Result := sDelphiXE5;
167171
ciDXE6:
168172
Result := sDelphiXE6;
173+
ciDXE7:
174+
Result := sDelphiXE7;
169175
else
170176
Result := Format(sCompilerName, [ProductVersion]);
171177
end;
@@ -192,6 +198,7 @@ function TBDSCompiler.InstallationRegKey: string;
192198
ciDXE4 : Result := '\Software\Embarcadero\BDS\11.0';
193199
ciDXE5 : Result := '\Software\Embarcadero\BDS\12.0';
194200
ciDXE6 : Result := '\Software\Embarcadero\BDS\14.0';
201+
ciDXE7 : Result := '\Software\Embarcadero\BDS\15.0';
195202
else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID');
196203
end;
197204
end;

Src/Compilers.UGlobals.pas

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ interface
3939
ciDXE4, // Delphi XE4
4040
ciDXE5, // Delphi XE5
4141
ciDXE6, // Delphi XE6
42+
ciDXE7, // Delphi XE7
4243
ciFPC // Free Pascal
4344
);
4445

@@ -51,7 +52,7 @@ interface
5152
/// compilers.</summary>
5253
cBDSCompilers = [
5354
ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2,
54-
ciDXE3, ciDXE4, ciDXE5, ciDXE6
55+
ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7
5556
];
5657

5758
const

Src/DBIO.UIniDataReader.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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', 'DelphiXE6', 'FPC'
240+
'DelphiXE5', 'DelphiXE6', 'DelphiXE7', 'FPC'
241241
);
242242

243243
{ TIniDataReader }

Src/FirstRun.UConfigFile.pas

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ procedure TUserConfigFileUpdater.UpdateNamespaces;
480480
UpdateForCompiler('DXE4');
481481
UpdateForCompiler('DXE5');
482482
UpdateForCompiler('DXE6');
483+
UpdateForCompiler('DXE7');
483484
end;
484485

485486
{ TCommonConfigFileUpdater }

0 commit comments

Comments
 (0)