Skip to content

Commit 8b3a2a1

Browse files
sglienkesglienke
committed
changes for Delphi 10.4
1 parent a12ccfb commit 8b3a2a1

32 files changed

+2968
-8
lines changed

Diff for: ‎Build.Settings.Compilers.ini

+66
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,12 @@ Platform=OSX32
368368
Keys.BDS=Software\Embarcadero\BDS\20.0
369369
Keys.Library=Library\OSX32
370370

371+
[Delphi10Rio.OSX64]
372+
DisplayName=Delphi 10.3 (OSX64)
373+
Platform=OSX64
374+
Keys.BDS=Software\Embarcadero\BDS\20.0
375+
Keys.Library=Library\OSX64
376+
371377
[Delphi10Rio.Linux64]
372378
DisplayName=Delphi 10.3 (Linux64)
373379
Platform=Linux64
@@ -397,3 +403,63 @@ DisplayName=Delphi 10.3 (Android ARM)
397403
Platform=Android
398404
Keys.BDS=Software\Embarcadero\BDS\20.0
399405
Keys.Library=Library\Android32
406+
407+
[Delphi10Rio.AndroidARM64]
408+
DisplayName=Delphi 10.3 (Android ARM 64)
409+
Platform=Android64
410+
Keys.BDS=Software\Embarcadero\BDS\20.0
411+
Keys.Library=Library\Android64
412+
413+
[Delphi10Sydney.Win32]
414+
DisplayName=Delphi 10.4 (Win32)
415+
Platform=Win32
416+
Keys.BDS=Software\Embarcadero\BDS\21.0
417+
Keys.Library=Library\Win32
418+
419+
[Delphi10Sydney.Win64]
420+
DisplayName=Delphi 10.4 (Win64)
421+
Platform=Win64
422+
Keys.BDS=Software\Embarcadero\BDS\21.0
423+
Keys.Library=Library\Win64
424+
425+
[Delphi10Sydney.OSX32]
426+
DisplayName=Delphi 10.4 (OSX32)
427+
Platform=OSX32
428+
Keys.BDS=Software\Embarcadero\BDS\21.0
429+
Keys.Library=Library\OSX32
430+
431+
[Delphi10Sydney.OSX64]
432+
DisplayName=Delphi 10.4 (OSX64)
433+
Platform=OSX64
434+
Keys.BDS=Software\Embarcadero\BDS\21.0
435+
Keys.Library=Library\OSX64
436+
437+
[Delphi10Sydney.Linux64]
438+
DisplayName=Delphi 10.4 (Linux64)
439+
Platform=Linux64
440+
Keys.BDS=Software\Embarcadero\BDS\21.0
441+
Keys.Library=Library\Linux64
442+
443+
[Delphi10Sydney.iOSSimulator]
444+
DisplayName=Delphi 10.4 (iOS Simulator)
445+
Platform=iOSSimulator
446+
Keys.BDS=Software\Embarcadero\BDS\21.0
447+
Keys.Library=Library\iOSSimulator
448+
449+
[Delphi10Sydney.iOSDevice64]
450+
DisplayName=Delphi 10.4 (iOS Device ARM64)
451+
Platform=iOSDevice64
452+
Keys.BDS=Software\Embarcadero\BDS\21.0
453+
Keys.Library=Library\iOSDevice64
454+
455+
[Delphi10Sydney.AndroidARM]
456+
DisplayName=Delphi 10.4 (Android ARM)
457+
Platform=Android
458+
Keys.BDS=Software\Embarcadero\BDS\21.0
459+
Keys.Library=Library\Android32
460+
461+
[Delphi10Sydney.AndroidARM64]
462+
DisplayName=Delphi 10.4 (Android ARM 64)
463+
Platform=Android64
464+
Keys.BDS=Software\Embarcadero\BDS\21.0
465+
Keys.Library=Library\Android64

Diff for: ‎Build.Settings.ini

+44
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ UnitOutputPaths=Library\Delphi10Rio\$(Platform)\$(Config)
263263
Projects=Packages\Delphi10Rio\Spring4D.groupproj
264264
UnitOutputPaths=Library\Delphi10Rio\$(Platform)\$(Config)
265265

266+
[Delphi10Rio.OSX64]
267+
Projects=Packages\Delphi10Rio\Spring4D.groupproj
268+
UnitOutputPaths=Library\Delphi10Rio\$(Platform)\$(Config)
269+
266270
[Delphi10Rio.Linux64]
267271
Projects=Packages\Delphi10Rio\Spring4D.groupproj
268272
UnitOutputPaths=Library\Delphi10Rio\$(Platform)\$(Config)
@@ -282,3 +286,43 @@ UnitOutputPaths=Library\Delphi10Rio\$(Platform)\$(Config)
282286
[Delphi10Rio.AndroidARM]
283287
Projects=Packages\Delphi10Rio\Spring4D.groupproj
284288
UnitOutputPaths=Library\Delphi10Rio\$(Platform)\$(Config)
289+
290+
[Delphi10Rio.AndroidARM64]
291+
Projects=Packages\Delphi10Rio\Spring4D.groupproj
292+
UnitOutputPaths=Library\Delphi10Rio\$(Platform)\$(Config)
293+
294+
[Delphi10Sydney.Win32]
295+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
296+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
297+
298+
[Delphi10Sydney.Win64]
299+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
300+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
301+
302+
[Delphi10Sydney.OSX32]
303+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
304+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
305+
306+
[Delphi10Sydney.OSX64]
307+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
308+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
309+
310+
[Delphi10Sydney.Linux64]
311+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
312+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
313+
314+
[Delphi10Sydney.iOSSimulator]
315+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
316+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
317+
318+
[Delphi10Sydney.iOSDevice64]
319+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
320+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
321+
322+
[Delphi10Sydney.AndroidARM]
323+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
324+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
325+
326+
[Delphi10Sydney.AndroidARM64]
327+
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
328+
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)

Diff for: ‎Build.exe

15 KB
Binary file not shown.

Diff for: ‎Build/Source/BuildEngine.pas

+5-2
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,13 @@ implementation
195195
Win32,
196196
Win64,
197197
OSX32,
198+
OSX64,
198199
iOSSimulator,
199200
iOSDevice,
200201
iOSDevice32,
201202
iOSDevice64,
202203
Android,
204+
Android64,
203205
Linux64
204206
);
205207

@@ -455,13 +457,14 @@ function TCompilerTarget.GetDccFileName(const targetPlatform: string): string;
455457
'dcc32.exe',
456458
'dcc64.exe',
457459
'dccosx.exe',
460+
'dccosx64.exe',
458461
'dccios32.exe',
459462
'dcciosarm.exe',
460463
'dcciosarm.exe',
461464
'dcciosarm64.exe',
462465
'dccaarm.exe',
463-
'dcclinux64.exe'
464-
);
466+
'dccaarm64.exe',
467+
'dcclinux64.exe' );
465468
var
466469
knownPlatform: TKnownPlatforms;
467470
knownPlatformName: string;

Diff for: ‎Packages/Delphi10Sydney/Spring.Base.dpk

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
package Spring.Base;
2+
3+
{$R *.res}
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS ON}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION OFF}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO ON}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES ON}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$IMAGEBASE $400000}
26+
{$DEFINE DEBUG}
27+
{$ENDIF IMPLICITBUILDING}
28+
{$DESCRIPTION 'Spring4D Base package'}
29+
{$LIBSUFFIX '.Delphi10Sydney'}
30+
{$RUNONLY}
31+
{$IMPLICITBUILD OFF}
32+
33+
{$I Spring.inc}
34+
35+
requires
36+
{$IFDEF FMX}
37+
fmx,
38+
{$ENDIF}
39+
rtl;
40+
41+
contains
42+
Spring in '..\..\Source\Base\Spring.pas',
43+
Spring.Collections in '..\..\Source\Base\Collections\Spring.Collections.pas',
44+
Spring.Collections.Adapters in '..\..\Source\Base\Collections\Spring.Collections.Adapters.pas',
45+
Spring.Collections.Base in '..\..\Source\Base\Collections\Spring.Collections.Base.pas',
46+
Spring.Collections.Dictionaries in '..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas',
47+
Spring.Collections.Events in '..\..\Source\Base\Collections\Spring.Collections.Events.pas',
48+
Spring.Collections.Extensions in '..\..\Source\Base\Collections\Spring.Collections.Extensions.pas',
49+
Spring.Collections.Lists in '..\..\Source\Base\Collections\Spring.Collections.Lists.pas',
50+
Spring.Collections.LinkedLists in '..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas',
51+
Spring.Collections.MultiMaps in '..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas',
52+
Spring.Collections.Queues in '..\..\Source\Base\Collections\Spring.Collections.Queues.pas',
53+
Spring.Collections.Sets in '..\..\Source\Base\Collections\Spring.Collections.Sets.pas',
54+
Spring.Collections.Stacks in '..\..\Source\Base\Collections\Spring.Collections.Stacks.pas',
55+
Spring.Collections.Trees in '..\..\Source\Base\Collections\Spring.Collections.Trees.pas',
56+
Spring.DesignPatterns in '..\..\Source\Base\Spring.DesignPatterns.pas',
57+
Spring.Events in '..\..\Source\Base\Spring.Events.pas',
58+
Spring.Events.Base in '..\..\Source\Base\Spring.Events.Base.pas',
59+
Spring.Helpers in '..\..\Source\Base\Spring.Helpers.pas',
60+
Spring.Logging in '..\..\Source\Base\Logging\Spring.Logging.pas',
61+
Spring.Logging.Appenders in '..\..\Source\Base\Logging\Spring.Logging.Appenders.pas',
62+
Spring.Logging.Appenders.Base in '..\..\Source\Base\Logging\Spring.Logging.Appenders.Base.pas',
63+
Spring.Logging.Controller in '..\..\Source\Base\Logging\Spring.Logging.Controller.pas',
64+
Spring.Logging.Extensions in '..\..\Source\Base\Logging\Spring.Logging.Extensions.pas',
65+
Spring.Logging.Loggers in '..\..\Source\Base\Logging\Spring.Logging.Loggers.pas',
66+
Spring.Logging.NullLogger in '..\..\Source\Base\Logging\Spring.Logging.NullLogger.pas',
67+
Spring.Logging.ResourceStrings in '..\..\Source\Base\Logging\Spring.Logging.ResourceStrings.pas',
68+
Spring.Logging.Serializers in '..\..\Source\Base\Logging\Spring.Logging.Serializers.pas',
69+
Spring.MethodIntercept in '..\..\Source\Base\Spring.MethodIntercept.pas',
70+
Spring.Reflection in '..\..\Source\Base\Spring.Reflection.pas',
71+
Spring.ResourceStrings in '..\..\Source\Base\Spring.ResourceStrings.pas',
72+
Spring.SystemUtils in '..\..\Source\Base\Spring.SystemUtils.pas',
73+
Spring.Times in '..\..\Source\Base\Spring.Times.pas',
74+
Spring.ValueConverters in '..\..\Source\Base\Spring.ValueConverters.pas',
75+
Spring.VirtualClass in '..\..\Source\Base\Spring.VirtualClass.pas',
76+
Spring.VirtualInterface in '..\..\Source\Base\Spring.VirtualInterface.pas';
77+
78+
end.

0 commit comments

Comments
 (0)