Skip to content

Commit c947266

Browse files
sglienkesglienke
committed
XE7 support
1 parent 368bbe9 commit c947266

15 files changed

+1671
-111
lines changed

Diff for: ‎Build.Settings.Compilers.ini

+36
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,39 @@ DisplayName=RAD Studio XE6 (Android ARM)
137137
Platform=Android
138138
Keys.BDS=Software\Embarcadero\BDS\14.0
139139
Keys.Library=Library\Android32
140+
141+
[DelphiXE7.Win32]
142+
DisplayName=RAD Studio XE7 (Win32)
143+
Platform=Win32
144+
Keys.BDS=Software\Embarcadero\BDS\15.0
145+
Keys.Library=Library\Win32
146+
147+
[DelphiXE7.Win64]
148+
DisplayName=RAD Studio XE7 (Win64)
149+
Platform=Win64
150+
Keys.BDS=Software\Embarcadero\BDS\15.0
151+
Keys.Library=Library\Win64
152+
153+
[DelphiXE7.OSX32]
154+
DisplayName=RAD Studio XE7 (OSX32)
155+
Platform=OSX32
156+
Keys.BDS=Software\Embarcadero\BDS\15.0
157+
Keys.Library=Library\OSX32
158+
159+
[DelphiXE7.iOSSimulator]
160+
DisplayName=RAD Studio XE7 (iOS Simulator)
161+
Platform=iOSSimulator
162+
Keys.BDS=Software\Embarcadero\BDS\15.0
163+
Keys.Library=Library\iOSSimulator
164+
165+
[DelphiXE7.iOSDevice]
166+
DisplayName=RAD Studio XE7 (iOS Device ARM)
167+
Platform=iOSDevice
168+
Keys.BDS=Software\Embarcadero\BDS\15.0
169+
Keys.Library=Library\iOSDevice
170+
171+
[DelphiXE7.AndroidARM]
172+
DisplayName=RAD Studio XE7 (Android ARM)
173+
Platform=Android
174+
Keys.BDS=Software\Embarcadero\BDS\15.0
175+
Keys.Library=Library\Android32

Diff for: ‎Build.Settings.ini

+133-109
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,136 @@
1-
[Globals]
2-
Name=Spring Framework for Delphi
3-
Homepage=http://www.spring4d.org
4-
BaseDir=.
1+
[Globals]
2+
Name=Spring Framework for Delphi
3+
Homepage=http://www.spring4d.org
4+
BaseDir=.
55
Config=Release
6-
SourceBaseDir=Source
7-
SourcePaths=Base;Base\Collections;Base\Reflection;Core\Services;Core\Container;Extensions\Utils;Extensions\Cryptography
6+
SourceBaseDir=Source
7+
SourcePaths=Base;Base\Collections;Base\Reflection;Core\Services;Core\Container;Extensions\Utils;Extensions\Cryptography
88
SelectedTasks=
99
RunTests=0
10-
ModifyDelphiRegistrySettings=0
11-
OnlyShowInstalledVersions=1
12-
PauseAfterEachStep=0
13-
14-
[Delphi2010]
15-
Projects=Packages\Delphi2010\Spring4D.groupproj
16-
UnitOutputPaths=Library\Delphi2010\$(Config)
17-
18-
[DelphiXE]
19-
Projects=Packages\DelphiXE\Spring4D.groupproj
20-
UnitOutputPaths=Library\DelphiXE\$(Config)
21-
22-
[DelphiXE2.Win32]
23-
Projects=Packages\DelphiXE2\Spring4D.groupproj
24-
UnitOutputPaths=Library\DelphiXE2\$(Platform)\$(Config)
25-
26-
[DelphiXE2.Win64]
27-
Projects=Packages\DelphiXE2\Spring4D.groupproj
28-
UnitOutputPaths=Library\DelphiXE2\$(Platform)\$(Config)
29-
30-
[DelphiXE2.OSX32]
31-
Projects=Packages\DelphiXE2\Spring4D.groupproj
32-
UnitOutputPaths=Library\DelphiXE2\$(Platform)\$(Config)
33-
34-
[DelphiXE3.Win32]
35-
Projects=Packages\DelphiXE3\Spring4D.groupproj
36-
UnitOutputPaths=Library\DelphiXE3\$(Platform)\$(Config)
37-
38-
[DelphiXE3.Win64]
39-
Projects=Packages\DelphiXE3\Spring4D.groupproj
40-
UnitOutputPaths=Library\DelphiXE3\$(Platform)\$(Config)
41-
42-
[DelphiXE3.OSX32]
43-
Projects=Packages\DelphiXE3\Spring4D.groupproj
44-
UnitOutputPaths=Library\DelphiXE3\$(Platform)\$(Config)
45-
46-
[DelphiXE4.Win32]
47-
Projects=Packages\DelphiXE4\Spring4D.groupproj
48-
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
49-
50-
[DelphiXE4.Win64]
51-
Projects=Packages\DelphiXE4\Spring4D.groupproj
52-
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
53-
54-
[DelphiXE4.OSX32]
55-
Projects=Packages\DelphiXE4\Spring4D.groupproj
56-
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
57-
58-
[DelphiXE4.iOSSimulator]
59-
Projects=Packages\DelphiXE4\Spring4D.groupproj
60-
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
61-
62-
[DelphiXE4.iOSDevice]
63-
Projects=Packages\DelphiXE4\Spring4D.groupproj
64-
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
65-
66-
[DelphiXE5.Win32]
67-
Projects=Packages\DelphiXE5\Spring4D.groupproj
68-
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
69-
70-
[DelphiXE5.Win64]
71-
Projects=Packages\DelphiXE5\Spring4D.groupproj
72-
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
73-
74-
[DelphiXE5.OSX32]
75-
Projects=Packages\DelphiXE5\Spring4D.groupproj
76-
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
77-
78-
[DelphiXE5.iOSSimulator]
79-
Projects=Packages\DelphiXE5\Spring4D.groupproj
80-
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
81-
82-
[DelphiXE5.iOSDevice]
83-
Projects=Packages\DelphiXE5\Spring4D.groupproj
84-
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
85-
86-
[DelphiXE5.AndroidARM]
87-
Projects=Packages\DelphiXE5\Spring4D.groupproj
88-
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
89-
90-
[DelphiXE6.Win32]
91-
Projects=Packages\DelphiXE6\Spring4D.groupproj
92-
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
93-
94-
[DelphiXE6.Win64]
95-
Projects=Packages\DelphiXE6\Spring4D.groupproj
96-
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
97-
98-
[DelphiXE6.OSX32]
99-
Projects=Packages\DelphiXE6\Spring4D.groupproj
100-
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
101-
102-
[DelphiXE6.iOSSimulator]
103-
Projects=Packages\DelphiXE6\Spring4D.groupproj
104-
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
105-
106-
[DelphiXE6.iOSDevice]
107-
Projects=Packages\DelphiXE6\Spring4D.groupproj
108-
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
109-
110-
[DelphiXE6.AndroidARM]
111-
Projects=Packages\DelphiXE6\Spring4D.groupproj
112-
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
10+
ModifyDelphiRegistrySettings=0
11+
OnlyShowInstalledVersions=1
12+
PauseAfterEachStep=0
13+
14+
[Delphi2010]
15+
Projects=Packages\Delphi2010\Spring4D.groupproj
16+
UnitOutputPaths=Library\Delphi2010\$(Config)
17+
18+
[DelphiXE]
19+
Projects=Packages\DelphiXE\Spring4D.groupproj
20+
UnitOutputPaths=Library\DelphiXE\$(Config)
21+
22+
[DelphiXE2.Win32]
23+
Projects=Packages\DelphiXE2\Spring4D.groupproj
24+
UnitOutputPaths=Library\DelphiXE2\$(Platform)\$(Config)
25+
26+
[DelphiXE2.Win64]
27+
Projects=Packages\DelphiXE2\Spring4D.groupproj
28+
UnitOutputPaths=Library\DelphiXE2\$(Platform)\$(Config)
29+
30+
[DelphiXE2.OSX32]
31+
Projects=Packages\DelphiXE2\Spring4D.groupproj
32+
UnitOutputPaths=Library\DelphiXE2\$(Platform)\$(Config)
33+
34+
[DelphiXE3.Win32]
35+
Projects=Packages\DelphiXE3\Spring4D.groupproj
36+
UnitOutputPaths=Library\DelphiXE3\$(Platform)\$(Config)
37+
38+
[DelphiXE3.Win64]
39+
Projects=Packages\DelphiXE3\Spring4D.groupproj
40+
UnitOutputPaths=Library\DelphiXE3\$(Platform)\$(Config)
41+
42+
[DelphiXE3.OSX32]
43+
Projects=Packages\DelphiXE3\Spring4D.groupproj
44+
UnitOutputPaths=Library\DelphiXE3\$(Platform)\$(Config)
45+
46+
[DelphiXE4.Win32]
47+
Projects=Packages\DelphiXE4\Spring4D.groupproj
48+
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
49+
50+
[DelphiXE4.Win64]
51+
Projects=Packages\DelphiXE4\Spring4D.groupproj
52+
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
53+
54+
[DelphiXE4.OSX32]
55+
Projects=Packages\DelphiXE4\Spring4D.groupproj
56+
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
57+
58+
[DelphiXE4.iOSSimulator]
59+
Projects=Packages\DelphiXE4\Spring4D.groupproj
60+
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
61+
62+
[DelphiXE4.iOSDevice]
63+
Projects=Packages\DelphiXE4\Spring4D.groupproj
64+
UnitOutputPaths=Library\DelphiXE4\$(Platform)\$(Config)
65+
66+
[DelphiXE5.Win32]
67+
Projects=Packages\DelphiXE5\Spring4D.groupproj
68+
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
69+
70+
[DelphiXE5.Win64]
71+
Projects=Packages\DelphiXE5\Spring4D.groupproj
72+
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
73+
74+
[DelphiXE5.OSX32]
75+
Projects=Packages\DelphiXE5\Spring4D.groupproj
76+
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
77+
78+
[DelphiXE5.iOSSimulator]
79+
Projects=Packages\DelphiXE5\Spring4D.groupproj
80+
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
81+
82+
[DelphiXE5.iOSDevice]
83+
Projects=Packages\DelphiXE5\Spring4D.groupproj
84+
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
85+
86+
[DelphiXE5.AndroidARM]
87+
Projects=Packages\DelphiXE5\Spring4D.groupproj
88+
UnitOutputPaths=Library\DelphiXE5\$(Platform)\$(Config)
89+
90+
[DelphiXE6.Win32]
91+
Projects=Packages\DelphiXE6\Spring4D.groupproj
92+
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
93+
94+
[DelphiXE6.Win64]
95+
Projects=Packages\DelphiXE6\Spring4D.groupproj
96+
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
97+
98+
[DelphiXE6.OSX32]
99+
Projects=Packages\DelphiXE6\Spring4D.groupproj
100+
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
101+
102+
[DelphiXE6.iOSSimulator]
103+
Projects=Packages\DelphiXE6\Spring4D.groupproj
104+
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
105+
106+
[DelphiXE6.iOSDevice]
107+
Projects=Packages\DelphiXE6\Spring4D.groupproj
108+
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
109+
110+
[DelphiXE6.AndroidARM]
111+
Projects=Packages\DelphiXE6\Spring4D.groupproj
112+
UnitOutputPaths=Library\DelphiXE6\$(Platform)\$(Config)
113+
114+
[DelphiXE7.Win32]
115+
Projects=Packages\DelphiXE7\Spring4D.groupproj
116+
UnitOutputPaths=Library\DelphiXE7\$(Platform)\$(Config)
117+
118+
[DelphiXE7.Win64]
119+
Projects=Packages\DelphiXE7\Spring4D.groupproj
120+
UnitOutputPaths=Library\DelphiXE7\$(Platform)\$(Config)
121+
122+
[DelphiXE7.OSX32]
123+
Projects=Packages\DelphiXE7\Spring4D.groupproj
124+
UnitOutputPaths=Library\DelphiXE7\$(Platform)\$(Config)
125+
126+
[DelphiXE7.iOSSimulator]
127+
Projects=Packages\DelphiXE7\Spring4D.groupproj
128+
UnitOutputPaths=Library\DelphiXE7\$(Platform)\$(Config)
129+
130+
[DelphiXE7.iOSDevice]
131+
Projects=Packages\DelphiXE7\Spring4D.groupproj
132+
UnitOutputPaths=Library\DelphiXE7\$(Platform)\$(Config)
133+
134+
[DelphiXE7.AndroidARM]
135+
Projects=Packages\DelphiXE7\Spring4D.groupproj
136+
UnitOutputPaths=Library\DelphiXE7\$(Platform)\$(Config)

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

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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+
{$DEFINE SPRING_NO_WARNING}
28+
{$ENDIF IMPLICITBUILDING}
29+
{$LIBSUFFIX '.DelphiXE7'}
30+
{$RUNONLY}
31+
{$IMPLICITBUILD OFF}
32+
33+
requires
34+
rtl;
35+
36+
contains
37+
Spring in '..\..\Source\Base\Spring.pas',
38+
Spring.Collections in '..\..\Source\Base\Collections\Spring.Collections.pas',
39+
Spring.Collections.Adapters in '..\..\Source\Base\Collections\Spring.Collections.Adapters.pas',
40+
Spring.Collections.Base in '..\..\Source\Base\Collections\Spring.Collections.Base.pas',
41+
Spring.Collections.Dictionaries in '..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas',
42+
Spring.Collections.Events in '..\..\Source\Base\Collections\Spring.Collections.Events.pas',
43+
Spring.Collections.Extensions in '..\..\Source\Base\Collections\Spring.Collections.Extensions.pas',
44+
Spring.Collections.Lists in '..\..\Source\Base\Collections\Spring.Collections.Lists.pas',
45+
Spring.Collections.LinkedLists in '..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas',
46+
Spring.Collections.MultiMaps in '..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas',
47+
Spring.Collections.Queues in '..\..\Source\Base\Collections\Spring.Collections.Queues.pas',
48+
Spring.Collections.Sets in '..\..\Source\Base\Collections\Spring.Collections.Sets.pas',
49+
Spring.Collections.Stacks in '..\..\Source\Base\Collections\Spring.Collections.Stacks.pas',
50+
Spring.DesignPatterns in '..\..\Source\Base\Spring.DesignPatterns.pas',
51+
Spring.Events in '..\..\Source\Base\Spring.Events.pas',
52+
Spring.Events.Base in '..\..\Source\Base\Spring.Events.Base.pas',
53+
Spring.Helpers in '..\..\Source\Base\Spring.Helpers.pas',
54+
Spring.Reflection in '..\..\Source\Base\Reflection\Spring.Reflection.pas',
55+
Spring.Reflection.Activator in '..\..\Source\Base\Reflection\Spring.Reflection.Activator.pas',
56+
Spring.Reflection.ValueConverters in '..\..\Source\Base\Reflection\Spring.Reflection.ValueConverters.pas',
57+
Spring.ResourceStrings in '..\..\Source\Base\Spring.ResourceStrings.pas',
58+
Spring.SystemUtils in '..\..\Source\Base\Spring.SystemUtils.pas';
59+
60+
end.

0 commit comments

Comments
 (0)