Skip to content

Commit f9fe2be

Browse files
vincentparrettvincentparrett
committed
Delphi 11 support
1 parent a74c2bd commit f9fe2be

File tree

5 files changed

+1366
-24
lines changed

5 files changed

+1366
-24
lines changed

‎VSoft.Messaging.dspec‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"metadata": {
33
"id": "VSoft.Messaging",
4-
"version": "0.3.0",
4+
"version": "0.3.1",
55
"description": "VSoft.Messaging is a libary that provides an internal synchronous/asynchronous publish/subscribe messaging system for Delphi applications.",
66
"authors": "Vincent Parrett",
77
"projectUrl": "https://github.com/VSoftTechnologies/VSoft.SemanticVersion",
@@ -69,6 +69,11 @@
6969
"compiler": "10.4",
7070
"platforms": "Win32, Win64",
7171
"template": "default"
72+
},
73+
{
74+
"compiler": "11",
75+
"platforms": "Win32, Win64",
76+
"template": "default"
7277
}
7378
],
7479
"templates": [
@@ -77,7 +82,7 @@
7782
"dependencies": [
7883
{
7984
"id": "VSoft.WeakReference",
80-
"version": "[0.1.0,]"
85+
"version": "[0.1.1,]"
8186
}
8287
],
8388
"source": [

‎demos/Fmx/MessageFMXDemo.dproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{8932D13F-25F1-44D8-B62C-A3611C90602B}</ProjectGuid>
44
<ProjectVersion>18.8</ProjectVersion>
@@ -11,11 +11,11 @@
1111
<AppType>Application</AppType>
1212
</PropertyGroup>
1313
<PropertyGroup>
14-
<DPMCompiler>10.2</DPMCompiler>
14+
<DPMCompiler>10.3</DPMCompiler>
1515
<DPMCache Condition="'$(DPMCache)' == ''">$(APPDATA)\.dpm\packages</DPMCache>
1616
<DPM>$(DPMCache)\$(DPMCompiler)\$(Platform)</DPM>
17-
<DPMSearch Condition="'$(Platform)'=='Win32'">$(DPM)\VSoft.WeakReference\0.0.1\src;</DPMSearch>
18-
<DPMSearch Condition="'$(Platform)'=='Win64'">$(DPM)\VSoft.WeakReference\0.0.1\src;</DPMSearch>
17+
<DPMSearch Condition="'$(Platform)'=='Win32'">$(DPM)\VSoft.WeakReference\0.1.1\lib;</DPMSearch>
18+
<DPMSearch Condition="'$(Platform)'=='Win64'">$(DPM)\VSoft.WeakReference\0.1.1\lib;</DPMSearch>
1919
</PropertyGroup>
2020
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
2121
<Base>true</Base>
@@ -1109,8 +1109,8 @@
11091109
</BorlandProject>
11101110
<ProjectFileVersion>12</ProjectFileVersion>
11111111
<DPM>
1112-
<PackageReference id="VSoft.WeakReference" platform="Win32" version="0.0.1"/>
1113-
<PackageReference id="VSoft.WeakReference" platform="Win64" version="0.0.1"/>
1112+
<PackageReference id="VSoft.WeakReference" platform="Win32" version="0.1.1"/>
1113+
<PackageReference id="VSoft.WeakReference" platform="Win64" version="0.1.1"/>
11141114
</DPM>
11151115
</ProjectExtensions>
11161116
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>

‎demos/Vcl/MsgDemo.dproj‎

Lines changed: 66 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{F708E2B6-B602-4A62-A0AD-05B2609DE410}</ProjectGuid>
4-
<ProjectVersion>19.2</ProjectVersion>
4+
<ProjectVersion>19.3</ProjectVersion>
55
<FrameworkType>VCL</FrameworkType>
66
<MainSource>MsgDemo.dpr</MainSource>
77
<Base>True</Base>
@@ -11,11 +11,11 @@
1111
<AppType>Application</AppType>
1212
</PropertyGroup>
1313
<PropertyGroup>
14-
<DPMCompiler>10.4</DPMCompiler>
14+
<DPMCompiler>11</DPMCompiler>
1515
<DPMCache Condition="'$(DPMCache)' == ''">$(APPDATA)\.dpm\packages</DPMCache>
1616
<DPM>$(DPMCache)\$(DPMCompiler)\$(Platform)</DPM>
17-
<DPMSearch Condition="'$(Platform)'=='Win32'">$(DPM)\VSoft.WeakReference\0.1.0\lib;</DPMSearch>
18-
<DPMSearch Condition="'$(Platform)'=='Win64'">$(DPM)\VSoft.WeakReference\0.1.0\lib;</DPMSearch>
17+
<DPMSearch Condition="'$(Platform)'=='Win32'">$(DPM)\VSoft.WeakReference\0.1.1\lib;</DPMSearch>
18+
<DPMSearch Condition="'$(Platform)'=='Win64'">$(DPM)\VSoft.WeakReference\0.1.1\lib;</DPMSearch>
1919
</PropertyGroup>
2020
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
2121
<Base>true</Base>
@@ -128,17 +128,17 @@
128128
<DesignClass>TFrame</DesignClass>
129129
</DCCReference>
130130
<DCCReference Include="MsgDemoMessages.pas"/>
131-
<BuildConfiguration Include="Release">
132-
<Key>Cfg_2</Key>
133-
<CfgParent>Base</CfgParent>
134-
</BuildConfiguration>
135131
<BuildConfiguration Include="Base">
136132
<Key>Base</Key>
137133
</BuildConfiguration>
138134
<BuildConfiguration Include="Debug">
139135
<Key>Cfg_1</Key>
140136
<CfgParent>Base</CfgParent>
141137
</BuildConfiguration>
138+
<BuildConfiguration Include="Release">
139+
<Key>Cfg_2</Key>
140+
<CfgParent>Base</CfgParent>
141+
</BuildConfiguration>
142142
</ItemGroup>
143143
<ProjectExtensions>
144144
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -164,6 +164,16 @@
164164
<Operation>0</Operation>
165165
</Platform>
166166
</DeployClass>
167+
<DeployClass Name="AndroidClasses">
168+
<Platform Name="Android">
169+
<RemoteDir>classes</RemoteDir>
170+
<Operation>64</Operation>
171+
</Platform>
172+
<Platform Name="Android64">
173+
<RemoteDir>classes</RemoteDir>
174+
<Operation>64</Operation>
175+
</Platform>
176+
</DeployClass>
167177
<DeployClass Name="AndroidClassesDexFile">
168178
<Platform Name="Android">
169179
<RemoteDir>classes</RemoteDir>
@@ -465,6 +475,11 @@
465475
<Operation>1</Operation>
466476
<Extensions>.framework</Extensions>
467477
</Platform>
478+
<Platform Name="OSXARM64">
479+
<RemoteDir>Contents\MacOS</RemoteDir>
480+
<Operation>1</Operation>
481+
<Extensions>.framework</Extensions>
482+
</Platform>
468483
<Platform Name="Win32">
469484
<Operation>0</Operation>
470485
</Platform>
@@ -492,6 +507,11 @@
492507
<Operation>1</Operation>
493508
<Extensions>.dylib</Extensions>
494509
</Platform>
510+
<Platform Name="OSXARM64">
511+
<RemoteDir>Contents\MacOS</RemoteDir>
512+
<Operation>1</Operation>
513+
<Extensions>.dylib</Extensions>
514+
</Platform>
495515
<Platform Name="Win32">
496516
<Operation>0</Operation>
497517
<Extensions>.dll;.bpl</Extensions>
@@ -520,6 +540,11 @@
520540
<Operation>1</Operation>
521541
<Extensions>.dylib</Extensions>
522542
</Platform>
543+
<Platform Name="OSXARM64">
544+
<RemoteDir>Contents\MacOS</RemoteDir>
545+
<Operation>1</Operation>
546+
<Extensions>.dylib</Extensions>
547+
</Platform>
523548
<Platform Name="Win32">
524549
<Operation>0</Operation>
525550
<Extensions>.bpl</Extensions>
@@ -549,6 +574,10 @@
549574
<RemoteDir>Contents\Resources\StartUp\</RemoteDir>
550575
<Operation>0</Operation>
551576
</Platform>
577+
<Platform Name="OSXARM64">
578+
<RemoteDir>Contents\Resources\StartUp\</RemoteDir>
579+
<Operation>0</Operation>
580+
</Platform>
552581
<Platform Name="Win32">
553582
<Operation>0</Operation>
554583
</Platform>
@@ -1086,6 +1115,10 @@
10861115
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
10871116
<Operation>1</Operation>
10881117
</Platform>
1118+
<Platform Name="OSXARM64">
1119+
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
1120+
<Operation>1</Operation>
1121+
</Platform>
10891122
</DeployClass>
10901123
<DeployClass Name="ProjectOSXEntitlements">
10911124
<Platform Name="OSX32">
@@ -1096,6 +1129,10 @@
10961129
<RemoteDir>..\</RemoteDir>
10971130
<Operation>1</Operation>
10981131
</Platform>
1132+
<Platform Name="OSXARM64">
1133+
<RemoteDir>..\</RemoteDir>
1134+
<Operation>1</Operation>
1135+
</Platform>
10991136
</DeployClass>
11001137
<DeployClass Name="ProjectOSXInfoPList">
11011138
<Platform Name="OSX32">
@@ -1106,6 +1143,10 @@
11061143
<RemoteDir>Contents</RemoteDir>
11071144
<Operation>1</Operation>
11081145
</Platform>
1146+
<Platform Name="OSXARM64">
1147+
<RemoteDir>Contents</RemoteDir>
1148+
<Operation>1</Operation>
1149+
</Platform>
11091150
</DeployClass>
11101151
<DeployClass Name="ProjectOSXResource">
11111152
<Platform Name="OSX32">
@@ -1116,6 +1157,10 @@
11161157
<RemoteDir>Contents\Resources</RemoteDir>
11171158
<Operation>1</Operation>
11181159
</Platform>
1160+
<Platform Name="OSXARM64">
1161+
<RemoteDir>Contents\Resources</RemoteDir>
1162+
<Operation>1</Operation>
1163+
</Platform>
11191164
</DeployClass>
11201165
<DeployClass Required="true" Name="ProjectOutput">
11211166
<Platform Name="Android">
@@ -1146,6 +1191,10 @@
11461191
<RemoteDir>Contents\MacOS</RemoteDir>
11471192
<Operation>1</Operation>
11481193
</Platform>
1194+
<Platform Name="OSXARM64">
1195+
<RemoteDir>Contents\MacOS</RemoteDir>
1196+
<Operation>1</Operation>
1197+
</Platform>
11491198
<Platform Name="Win32">
11501199
<Operation>0</Operation>
11511200
</Platform>
@@ -1184,16 +1233,17 @@
11841233
<Operation>1</Operation>
11851234
</Platform>
11861235
</DeployClass>
1236+
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
1237+
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
1238+
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1239+
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
1240+
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
11871241
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
1188-
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
1242+
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
11891243
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
1190-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1244+
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
11911245
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
1192-
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
1193-
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
1194-
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
11951246
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
1196-
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
11971247
</Deployment>
11981248
<Platforms>
11991249
<Platform value="Win32">True</Platform>
@@ -1202,8 +1252,8 @@
12021252
</BorlandProject>
12031253
<ProjectFileVersion>12</ProjectFileVersion>
12041254
<DPM>
1205-
<PackageReference id="VSoft.WeakReference" platform="Win32" version="0.1.0"/>
1206-
<PackageReference id="VSoft.WeakReference" platform="Win64" version="0.1.0"/>
1255+
<PackageReference id="VSoft.WeakReference" platform="Win32" version="0.1.1"/>
1256+
<PackageReference id="VSoft.WeakReference" platform="Win64" version="0.1.1"/>
12071257
</DPM>
12081258
</ProjectExtensions>
12091259
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>

‎packages/Rad Studio 11 Alexandria/VSoft.MessagingR.dpk‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package VSoft.MessagingR;
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 'VSoft.Messaging Runtime for 10.4'}
29+
{$LIBSUFFIX AUTO}
30+
{$RUNONLY}
31+
{$IMPLICITBUILD OFF}
32+
33+
requires
34+
rtl;
35+
36+
contains
37+
VSoft.Messaging.Channel in '..\..\src\VSoft.Messaging.Channel.pas',
38+
VSoft.Messaging.Dispatchers in '..\..\src\VSoft.Messaging.Dispatchers.pas',
39+
VSoft.Messaging.Internal in '..\..\src\VSoft.Messaging.Internal.pas',
40+
VSoft.Messaging in '..\..\src\VSoft.Messaging.pas';
41+
42+
end.

0 commit comments

Comments
 (0)