Skip to content

Commit 0c64806

Browse files
MWASoftwareMWASoftware
committed
Put package to top of build order in AllTests project group
1 parent 17fc1d3 commit 0c64806

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

‎Test/AllTests.groupproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProjectGuid>{7FF639E9-73F0-4139-BA19-816A6C3F32D8}</ProjectGuid>
44
</PropertyGroup>
55
<ItemGroup>
6+
<Projects Include="..\delphi\IndyTLSOpenSSL290.dproj">
7+
<Dependencies/>
8+
</Projects>
69
<Projects Include="openssl-client\delphi_openssl_client.dproj">
710
<Dependencies>..\delphi\IndyTLSOpenSSL290.dproj</Dependencies>
811
</Projects>
912
<Projects Include="openssl-server\delphi_openssl_server.dproj">
1013
<Dependencies/>
1114
</Projects>
12-
<Projects Include="..\delphi\IndyTLSOpenSSL290.dproj">
13-
<Dependencies/>
14-
</Projects>
1515
</ItemGroup>
1616
<ProjectExtensions>
1717
<Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -20,6 +20,15 @@
2020
<Default.Personality/>
2121
</BorlandProject>
2222
</ProjectExtensions>
23+
<Target Name="IndyTLSOpenSSL290">
24+
<MSBuild Projects="..\delphi\IndyTLSOpenSSL290.dproj"/>
25+
</Target>
26+
<Target Name="IndyTLSOpenSSL290:Clean">
27+
<MSBuild Projects="..\delphi\IndyTLSOpenSSL290.dproj" Targets="Clean"/>
28+
</Target>
29+
<Target Name="IndyTLSOpenSSL290:Make">
30+
<MSBuild Projects="..\delphi\IndyTLSOpenSSL290.dproj" Targets="Make"/>
31+
</Target>
2332
<Target Name="delphi_openssl_client" DependsOnTargets="IndyTLSOpenSSL290">
2433
<MSBuild Projects="openssl-client\delphi_openssl_client.dproj"/>
2534
</Target>
@@ -38,23 +47,14 @@
3847
<Target Name="delphi_openssl_server:Make">
3948
<MSBuild Projects="openssl-server\delphi_openssl_server.dproj" Targets="Make"/>
4049
</Target>
41-
<Target Name="IndyTLSOpenSSL290">
42-
<MSBuild Projects="..\delphi\IndyTLSOpenSSL290.dproj"/>
43-
</Target>
44-
<Target Name="IndyTLSOpenSSL290:Clean">
45-
<MSBuild Projects="..\delphi\IndyTLSOpenSSL290.dproj" Targets="Clean"/>
46-
</Target>
47-
<Target Name="IndyTLSOpenSSL290:Make">
48-
<MSBuild Projects="..\delphi\IndyTLSOpenSSL290.dproj" Targets="Make"/>
49-
</Target>
5050
<Target Name="Build">
51-
<CallTarget Targets="delphi_openssl_client;delphi_openssl_server;IndyTLSOpenSSL290"/>
51+
<CallTarget Targets="IndyTLSOpenSSL290;delphi_openssl_client;delphi_openssl_server"/>
5252
</Target>
5353
<Target Name="Clean">
54-
<CallTarget Targets="delphi_openssl_client:Clean;delphi_openssl_server:Clean;IndyTLSOpenSSL290:Clean"/>
54+
<CallTarget Targets="IndyTLSOpenSSL290:Clean;delphi_openssl_client:Clean;delphi_openssl_server:Clean"/>
5555
</Target>
5656
<Target Name="Make">
57-
<CallTarget Targets="delphi_openssl_client:Make;delphi_openssl_server:Make;IndyTLSOpenSSL290:Make"/>
57+
<CallTarget Targets="IndyTLSOpenSSL290:Make;delphi_openssl_client:Make;delphi_openssl_server:Make"/>
5858
</Target>
5959
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
6060
</Project>

‎Test/openssl-client/delphi_openssl_client.dproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<MainSource>delphi_openssl_client.dpr</MainSource>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Release</Config>
9-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
1010
<TargetedPlatforms>3</TargetedPlatforms>
1111
<AppType>Console</AppType>
1212
<ProjectName Condition="'$(ProjectName)'==''">delphi_openssl_client</ProjectName>
@@ -102,6 +102,8 @@
102102
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
103103
<Manifest_File>(None)</Manifest_File>
104104
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
105+
<Debugger_HostApplication>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-client\delphi_openssl_client.exe</Debugger_HostApplication>
106+
<Debugger_CWD>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-client</Debugger_CWD>
105107
</PropertyGroup>
106108
<PropertyGroup Condition="'$(Base_Win64)'!=''">
107109
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
@@ -112,6 +114,8 @@
112114
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
113115
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
114116
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
117+
<Debugger_HostApplication>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-client\delphi_openssl_client.exe</Debugger_HostApplication>
118+
<Debugger_CWD>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-client</Debugger_CWD>
115119
</PropertyGroup>
116120
<PropertyGroup Condition="'$(Cfg_1)'!=''">
117121
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -130,7 +134,6 @@
130134
<DCC_ExeOutput>.</DCC_ExeOutput>
131135
<DCC_DcuOutput>$(Platform)\$(Config)</DCC_DcuOutput>
132136
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
133-
<Debugger_HostApplication>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server\delphi_openssl_server.exe</Debugger_HostApplication>
134137
<VerInfo_Locale>1033</VerInfo_Locale>
135138
<DCC_RemoteDebug>false</DCC_RemoteDebug>
136139
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>

‎Test/openssl-server/delphi_openssl_server.dproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<MainSource>delphi_openssl_server.dpr</MainSource>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Release</Config>
9-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
1010
<TargetedPlatforms>3</TargetedPlatforms>
1111
<AppType>Console</AppType>
1212
<ProjectName Condition="'$(ProjectName)'==''">delphi_openssl_server</ProjectName>
@@ -98,6 +98,8 @@
9898
<VerInfo_Locale>1033</VerInfo_Locale>
9999
<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>
100100
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
101+
<Debugger_HostApplication>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server\delphi_openssl_server.exe</Debugger_HostApplication>
102+
<Debugger_CWD>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server</Debugger_CWD>
101103
</PropertyGroup>
102104
<PropertyGroup Condition="'$(Base_Win64)'!=''">
103105
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
@@ -108,6 +110,8 @@
108110
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
109111
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
110112
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
113+
<Debugger_HostApplication>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server\delphi_openssl_server.exe</Debugger_HostApplication>
114+
<Debugger_CWD>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server</Debugger_CWD>
111115
</PropertyGroup>
112116
<PropertyGroup Condition="'$(Cfg_1)'!=''">
113117
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
@@ -142,8 +146,8 @@
142146
<DCC_DebugInformation>0</DCC_DebugInformation>
143147
</PropertyGroup>
144148
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
145-
<Debugger_CWD>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-server</Debugger_CWD>
146-
<Debugger_HostApplication>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-server\delphi_openssl_server.exe</Debugger_HostApplication>
149+
<Debugger_CWD>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server</Debugger_CWD>
150+
<Debugger_HostApplication>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server\delphi_openssl_server.exe</Debugger_HostApplication>
147151
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
148152
<UsePackages>true</UsePackages>
149153
<VerInfo_Locale>1033</VerInfo_Locale>
@@ -158,6 +162,8 @@
158162
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
159163
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
160164
<VerInfo_Locale>1033</VerInfo_Locale>
165+
<Debugger_HostApplication>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server\delphi_openssl_server.exe</Debugger_HostApplication>
166+
<Debugger_CWD>C:\Users\tony\SoftwareDev\IndyTLS-OpenSSL\Test\openssl-server</Debugger_CWD>
161167
</PropertyGroup>
162168
<ItemGroup>
163169
<DelphiCompile Include="$(MainSource)">

0 commit comments

Comments
 (0)