Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1763c8f

Browse files
author
DelphiDabbler
committed
Added support for compiling with Delphi 10.1 Berlin compiler.
1 parent e303f84 commit 1763c8f

6 files changed

+29
-19
lines changed

‎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 }

‎Src/FrCodeGenPrefs.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) 2010-2015, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2010-2016, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -681,6 +681,7 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu;
681681
AddMenuItem('Delphi XE7', 28.0);
682682
AddMenuItem('Delphi XE8', 29.0);
683683
AddMenuItem('Delphi 10 Seattle', 30.0);
684+
AddMenuItem('Delphi 10.1 Berlin', 31.0);
684685
end;
685686

686687
procedure TCodeGenPrefsFrame.PreDefCompilerMenuClick(Sender: TObject);

‎Src/UXMLDocConsts.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) 2008-2015, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2008-2016, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -74,7 +74,7 @@ interface
7474
'd2', 'd3', 'd4', 'd5', 'd6', 'd7',
7575
'd2005', 'd2006', 'd2007', 'd2009', 'd2010',
7676
'dXE', 'dXE2', 'dXE3', 'dDX4' {error, but in use},
77-
'dXE5', 'dXE6', 'dXE7', 'dXE8', 'd10s',
77+
'dXE5', 'dXE6', 'dXE7', 'dXE8', 'd10s', 'd101b',
7878
'fpc'
7979
);
8080

0 commit comments

Comments
 (0)