Skip to content

Commit f64c504

Browse files
committed
Updated for Delphi 10
1 parent c34ca1e commit f64c504

File tree

2 files changed

+23
-171
lines changed

2 files changed

+23
-171
lines changed

Test/openssl-client/delphi_openssl_client.dproj

Lines changed: 12 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,20 @@
55
<FrameworkType>None</FrameworkType>
66
<MainSource>delphi_openssl_client.dpr</MainSource>
77
<Base>True</Base>
8-
<Config Condition="'$(Config)'==''">Release</Config>
9-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
10-
<TargetedPlatforms>3</TargetedPlatforms>
8+
<Config Condition="'$(Config)'==''">Debug</Config>
9+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
10+
<TargetedPlatforms>1</TargetedPlatforms>
1111
<AppType>Console</AppType>
1212
<ProjectName Condition="'$(ProjectName)'==''">delphi_openssl_client</ProjectName>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1515
<Base>true</Base>
1616
</PropertyGroup>
17-
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
18-
<Base_Android>true</Base_Android>
19-
<CfgParent>Base</CfgParent>
20-
<Base>true</Base>
21-
</PropertyGroup>
22-
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
23-
<Base_Android64>true</Base_Android64>
24-
<CfgParent>Base</CfgParent>
25-
<Base>true</Base>
26-
</PropertyGroup>
2717
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
2818
<Base_Win32>true</Base_Win32>
2919
<CfgParent>Base</CfgParent>
3020
<Base>true</Base>
3121
</PropertyGroup>
32-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
33-
<Base_Win64>true</Base_Win64>
34-
<CfgParent>Base</CfgParent>
35-
<Base>true</Base>
36-
</PropertyGroup>
3722
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
3823
<Cfg_1>true</Cfg_1>
3924
<CfgParent>Base</CfgParent>
@@ -45,12 +30,6 @@
4530
<Cfg_1>true</Cfg_1>
4631
<Base>true</Base>
4732
</PropertyGroup>
48-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
49-
<Cfg_1_Win64>true</Cfg_1_Win64>
50-
<CfgParent>Cfg_1</CfgParent>
51-
<Cfg_1>true</Cfg_1>
52-
<Base>true</Base>
53-
</PropertyGroup>
5433
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
5534
<Cfg_2>true</Cfg_2>
5635
<CfgParent>Base</CfgParent>
@@ -62,12 +41,6 @@
6241
<Cfg_2>true</Cfg_2>
6342
<Base>true</Base>
6443
</PropertyGroup>
65-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
66-
<Cfg_2_Win64>true</Cfg_2_Win64>
67-
<CfgParent>Cfg_2</CfgParent>
68-
<Cfg_2>true</Cfg_2>
69-
<Base>true</Base>
70-
</PropertyGroup>
7144
<PropertyGroup Condition="'$(Base)'!=''">
7245
<SanitizedProjectName>delphi_openssl_client</SanitizedProjectName>
7346
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
@@ -80,25 +53,6 @@
8053
<DCC_K>false</DCC_K>
8154
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
8255
</PropertyGroup>
83-
<PropertyGroup Condition="'$(Base_Android)'!=''">
84-
<Android_NotificationIcon24>$(BDS)\bin\Artwork\Android\FM_NotificationIcon_24x24.png</Android_NotificationIcon24>
85-
<Android_NotificationIcon36>$(BDS)\bin\Artwork\Android\FM_NotificationIcon_36x36.png</Android_NotificationIcon36>
86-
<Android_NotificationIcon48>$(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png</Android_NotificationIcon48>
87-
<Android_NotificationIcon72>$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png</Android_NotificationIcon72>
88-
<Android_NotificationIcon96>$(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png</Android_NotificationIcon96>
89-
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
90-
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
91-
<BT_BuildType>Debug</BT_BuildType>
92-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
93-
<EnabledSysJars>activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar</EnabledSysJars>
94-
</PropertyGroup>
95-
<PropertyGroup Condition="'$(Base_Android64)'!=''">
96-
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
97-
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
98-
<BT_BuildType>Debug</BT_BuildType>
99-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
100-
<EnabledSysJars>activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar</EnabledSysJars>
101-
</PropertyGroup>
10256
<PropertyGroup Condition="'$(Base_Win32)'!=''">
10357
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
10458
<VerInfo_Locale>1033</VerInfo_Locale>
@@ -110,16 +64,6 @@
11064
<Manifest_File>(None)</Manifest_File>
11165
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
11266
</PropertyGroup>
113-
<PropertyGroup Condition="'$(Base_Win64)'!=''">
114-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
115-
<BT_BuildType>Debug</BT_BuildType>
116-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
117-
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
118-
<VerInfo_Locale>1033</VerInfo_Locale>
119-
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
120-
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
121-
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
122-
</PropertyGroup>
12367
<PropertyGroup Condition="'$(Cfg_1)'!=''">
12468
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
12569
<DCC_DebugDCUs>true</DCC_DebugDCUs>
@@ -143,17 +87,6 @@
14387
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
14488
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
14589
</PropertyGroup>
146-
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
147-
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
148-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
149-
<VerInfo_Locale>1033</VerInfo_Locale>
150-
<DCC_ExeOutput>.</DCC_ExeOutput>
151-
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
152-
<UsePackages>true</UsePackages>
153-
<Debugger_DebugSourcePath>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\src\opensslHdrs\;$(Debugger_DebugSourcePath)</Debugger_DebugSourcePath>
154-
<Debugger_HostApplication>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server\delphi_openssl_server.exe</Debugger_HostApplication>
155-
<Debugger_CWD>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-client</Debugger_CWD>
156-
</PropertyGroup>
15790
<PropertyGroup Condition="'$(Cfg_2)'!=''">
15891
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
15992
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
@@ -164,33 +97,28 @@
16497
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
16598
</PropertyGroup>
16699
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
100+
<Debugger_CWD>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-client</Debugger_CWD>
101+
<Debugger_HostApplication>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-client\delphi_openssl_client.exe</Debugger_HostApplication>
102+
<UsePackages>true</UsePackages>
167103
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
168104
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
169105
</PropertyGroup>
170-
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
171-
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
172-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
173-
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
174-
<UsePackages>true</UsePackages>
175-
<Debugger_HostApplication>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-client\delphi_openssl_client.exe</Debugger_HostApplication>
176-
<Debugger_CWD>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-client</Debugger_CWD>
177-
</PropertyGroup>
178106
<ItemGroup>
179107
<DelphiCompile Include="$(MainSource)">
180108
<MainSource>MainSource</MainSource>
181109
</DelphiCompile>
182110
<DCCReference Include="TestClient.pas"/>
111+
<BuildConfiguration Include="Release">
112+
<Key>Cfg_2</Key>
113+
<CfgParent>Base</CfgParent>
114+
</BuildConfiguration>
183115
<BuildConfiguration Include="Base">
184116
<Key>Base</Key>
185117
</BuildConfiguration>
186118
<BuildConfiguration Include="Debug">
187119
<Key>Cfg_1</Key>
188120
<CfgParent>Base</CfgParent>
189121
</BuildConfiguration>
190-
<BuildConfiguration Include="Release">
191-
<Key>Cfg_2</Key>
192-
<CfgParent>Base</CfgParent>
193-
</BuildConfiguration>
194122
</ItemGroup>
195123
<ProjectExtensions>
196124
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -201,15 +129,12 @@
201129
<Source Name="MainSource">delphi_openssl_client.dpr</Source>
202130
</Source>
203131
<Excluded_Packages>
204-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
205-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
132+
<Excluded_Packages Name="$(BDSBIN)\dclIndyCore240.bpl">Indy 10 Core Design Time</Excluded_Packages>
133+
<Excluded_Packages Name="$(BDSBIN)\dclIndyProtocols240.bpl">Indy 10 Protocols Design Time</Excluded_Packages>
206134
</Excluded_Packages>
207135
</Delphi.Personality>
208136
<Platforms>
209-
<Platform value="Android">False</Platform>
210-
<Platform value="Android64">False</Platform>
211137
<Platform value="Win32">True</Platform>
212-
<Platform value="Win64">True</Platform>
213138
</Platforms>
214139
<Deployment Version="4">
215140
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">

0 commit comments

Comments
 (0)