Skip to content

Commit

Permalink
Delphi 11 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@vincentparrett
vincentparrett committed Sep 10, 2021
1 parent a74c2bd commit f9fe2be
Show file tree
Hide file tree
Showing 5 changed files with 1,366 additions and 24 deletions.
9 changes: 7 additions & 2 deletions VSoft.Messaging.dspec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"metadata": {
"id": "VSoft.Messaging",
"version": "0.3.0",
"version": "0.3.1",
"description": "VSoft.Messaging is a libary that provides an internal synchronous/asynchronous publish/subscribe messaging system for Delphi applications.",
"authors": "Vincent Parrett",
"projectUrl": "https://github.com/VSoftTechnologies/VSoft.SemanticVersion",
Expand Down Expand Up @@ -69,6 +69,11 @@
"compiler": "10.4",
"platforms": "Win32, Win64",
"template": "default"
},
{
"compiler": "11",
"platforms": "Win32, Win64",
"template": "default"
}
],
"templates": [
Expand All @@ -77,7 +82,7 @@
"dependencies": [
{
"id": "VSoft.WeakReference",
"version": "[0.1.0,]"
"version": "[0.1.1,]"
}
],
"source": [
Expand Down
12 changes: 6 additions & 6 deletions demos/Fmx/MessageFMXDemo.dproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{8932D13F-25F1-44D8-B62C-A3611C90602B}</ProjectGuid>
<ProjectVersion>18.8</ProjectVersion>
Expand All @@ -11,11 +11,11 @@
<AppType>Application</AppType>
</PropertyGroup>
<PropertyGroup>
<DPMCompiler>10.2</DPMCompiler>
<DPMCompiler>10.3</DPMCompiler>
<DPMCache Condition="'$(DPMCache)' == ''">$(APPDATA)\.dpm\packages</DPMCache>
<DPM>$(DPMCache)\$(DPMCompiler)\$(Platform)</DPM>
<DPMSearch Condition="'$(Platform)'=='Win32'">$(DPM)\VSoft.WeakReference\0.0.1\src;</DPMSearch>
<DPMSearch Condition="'$(Platform)'=='Win64'">$(DPM)\VSoft.WeakReference\0.0.1\src;</DPMSearch>
<DPMSearch Condition="'$(Platform)'=='Win32'">$(DPM)\VSoft.WeakReference\0.1.1\lib;</DPMSearch>
<DPMSearch Condition="'$(Platform)'=='Win64'">$(DPM)\VSoft.WeakReference\0.1.1\lib;</DPMSearch>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
Expand Down Expand Up @@ -1109,8 +1109,8 @@
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
<DPM>
<PackageReference id="VSoft.WeakReference" platform="Win32" version="0.0.1"/>
<PackageReference id="VSoft.WeakReference" platform="Win64" version="0.0.1"/>
<PackageReference id="VSoft.WeakReference" platform="Win32" version="0.1.1"/>
<PackageReference id="VSoft.WeakReference" platform="Win64" version="0.1.1"/>
</DPM>
</ProjectExtensions>
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
Expand Down
82 changes: 66 additions & 16 deletions demos/Vcl/MsgDemo.dproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{F708E2B6-B602-4A62-A0AD-05B2609DE410}</ProjectGuid>
<ProjectVersion>19.2</ProjectVersion>
<ProjectVersion>19.3</ProjectVersion>
<FrameworkType>VCL</FrameworkType>
<MainSource>MsgDemo.dpr</MainSource>
<Base>True</Base>
Expand All @@ -11,11 +11,11 @@
<AppType>Application</AppType>
</PropertyGroup>
<PropertyGroup>
<DPMCompiler>10.4</DPMCompiler>
<DPMCompiler>11</DPMCompiler>
<DPMCache Condition="'$(DPMCache)' == ''">$(APPDATA)\.dpm\packages</DPMCache>
<DPM>$(DPMCache)\$(DPMCompiler)\$(Platform)</DPM>
<DPMSearch Condition="'$(Platform)'=='Win32'">$(DPM)\VSoft.WeakReference\0.1.0\lib;</DPMSearch>
<DPMSearch Condition="'$(Platform)'=='Win64'">$(DPM)\VSoft.WeakReference\0.1.0\lib;</DPMSearch>
<DPMSearch Condition="'$(Platform)'=='Win32'">$(DPM)\VSoft.WeakReference\0.1.1\lib;</DPMSearch>
<DPMSearch Condition="'$(Platform)'=='Win64'">$(DPM)\VSoft.WeakReference\0.1.1\lib;</DPMSearch>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
Expand Down Expand Up @@ -128,17 +128,17 @@
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="MsgDemoMessages.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
<BuildConfiguration Include="Debug">
<Key>Cfg_1</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
Expand All @@ -164,6 +164,16 @@
<Operation>0</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidClasses">
<Platform Name="Android">
<RemoteDir>classes</RemoteDir>
<Operation>64</Operation>
</Platform>
<Platform Name="Android64">
<RemoteDir>classes</RemoteDir>
<Operation>64</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidClassesDexFile">
<Platform Name="Android">
<RemoteDir>classes</RemoteDir>
Expand Down Expand Up @@ -465,6 +475,11 @@
<Operation>1</Operation>
<Extensions>.framework</Extensions>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents\MacOS</RemoteDir>
<Operation>1</Operation>
<Extensions>.framework</Extensions>
</Platform>
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
Expand Down Expand Up @@ -492,6 +507,11 @@
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents\MacOS</RemoteDir>
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
Expand Down Expand Up @@ -520,6 +540,11 @@
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents\MacOS</RemoteDir>
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.bpl</Extensions>
Expand Down Expand Up @@ -549,6 +574,10 @@
<RemoteDir>Contents\Resources\StartUp\</RemoteDir>
<Operation>0</Operation>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents\Resources\StartUp\</RemoteDir>
<Operation>0</Operation>
</Platform>
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
Expand Down Expand Up @@ -1086,6 +1115,10 @@
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXEntitlements">
<Platform Name="OSX32">
Expand All @@ -1096,6 +1129,10 @@
<RemoteDir>..\</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>..\</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXInfoPList">
<Platform Name="OSX32">
Expand All @@ -1106,6 +1143,10 @@
<RemoteDir>Contents</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32">
Expand All @@ -1116,6 +1157,10 @@
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Required="true" Name="ProjectOutput">
<Platform Name="Android">
Expand Down Expand Up @@ -1146,6 +1191,10 @@
<RemoteDir>Contents\MacOS</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="OSXARM64">
<RemoteDir>Contents\MacOS</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
Expand Down Expand Up @@ -1184,16 +1233,17 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
</Deployment>
<Platforms>
<Platform value="Win32">True</Platform>
Expand All @@ -1202,8 +1252,8 @@
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
<DPM>
<PackageReference id="VSoft.WeakReference" platform="Win32" version="0.1.0"/>
<PackageReference id="VSoft.WeakReference" platform="Win64" version="0.1.0"/>
<PackageReference id="VSoft.WeakReference" platform="Win32" version="0.1.1"/>
<PackageReference id="VSoft.WeakReference" platform="Win64" version="0.1.1"/>
</DPM>
</ProjectExtensions>
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
Expand Down
42 changes: 42 additions & 0 deletions packages/Rad Studio 11 Alexandria/VSoft.MessagingR.dpk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package VSoft.MessagingR;

{$R *.res}
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO OFF}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION OFF}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DEFINE DEBUG}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'VSoft.Messaging Runtime for 10.4'}
{$LIBSUFFIX AUTO}
{$RUNONLY}
{$IMPLICITBUILD OFF}

requires
rtl;

contains
VSoft.Messaging.Channel in '..\..\src\VSoft.Messaging.Channel.pas',
VSoft.Messaging.Dispatchers in '..\..\src\VSoft.Messaging.Dispatchers.pas',
VSoft.Messaging.Internal in '..\..\src\VSoft.Messaging.Internal.pas',
VSoft.Messaging in '..\..\src\VSoft.Messaging.pas';

end.

0 comments on commit f9fe2be

Please sign in to comment.