Skip to content

Commit d4fec3a

Browse files
mobius1qwemobius1qwe
committed
- Atualização do teste Delphi GUI para a versão mais recente do RAL
1 parent 9c566fe commit d4fec3a

3 files changed

Lines changed: 11 additions & 42 deletions

File tree

‎Delphi/Server/RALTestServerDelphi.dproj‎

Lines changed: 7 additions & 38 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>{8E865D14-6BB5-4F22-8A48-35CE159BB413}</ProjectGuid>
4-
<ProjectVersion>20.1</ProjectVersion>
4+
<ProjectVersion>20.2</ProjectVersion>
55
<FrameworkType>FMX</FrameworkType>
66
<Base>True</Base>
77
<Config Condition="'$(Config)'==''">Release</Config>
@@ -111,7 +111,7 @@
111111
</PropertyGroup>
112112
<PropertyGroup Condition="'$(Base_Android)'!=''">
113113
<DCC_UsePackage>PascalRAL;IndyRAL;fmx;DbxCommonDriver;bindengine;IndyIPCommon;emsclient;FireDACCommonDriver;RESTDWSocketIndy;IndyProtocols;IndyIPClient;dbxcds;FmxTeeUI;bindcompfmx;FireDACSqliteDriver;DbxClientDriver;soapmidas;fmxFireDAC;dbexpress;inet;DataSnapCommon;fmxase;dbrtl;FireDACDBXDriver;CustomIPTransport;ZCore;ZParseSql;DBXInterBaseDriver;IndySystem;bindcomp;FireDACCommon;IndyCore;RESTBackendComponents;ZPlain;ZComponent;bindcompdbx;rtl;RESTComponents;DBXSqliteDriver;IndyIPServer;dsnapxml;DataSnapClient;DataSnapProviderClient;DataSnapFireDAC;emsclientfiredac;FireDAC;FireDACDSDriver;xmlrtl;tethering;RESTDWCore;PascalRALDsgn;ZDbc;dsnap;CloudService;DataSnapNativeClient;FMXTee;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
114-
<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>
114+
<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=;minSdkVersion=23;targetSdkVersion=34</VerInfo_Keys>
115115
<BT_BuildType>Debug</BT_BuildType>
116116
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
117117
<Android_LauncherIcon36>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png</Android_LauncherIcon36>
@@ -133,7 +133,7 @@
133133
</PropertyGroup>
134134
<PropertyGroup Condition="'$(Base_Android64)'!=''">
135135
<DCC_UsePackage>PascalRAL;IndyRAL;fmx;DbxCommonDriver;bindengine;IndyIPCommon;emsclient;FireDACCommonDriver;RESTDWSocketIndy;IndyProtocols;IndyIPClient;dbxcds;FmxTeeUI;bindcompfmx;FireDACSqliteDriver;DbxClientDriver;soapmidas;fmxFireDAC;dbexpress;inet;DataSnapCommon;dbrtl;FireDACDBXDriver;CustomIPTransport;ZCore;ZParseSql;DBXInterBaseDriver;IndySystem;bindcomp;FireDACCommon;IndyCore;RESTBackendComponents;ZPlain;ZComponent;bindcompdbx;rtl;frce;RESTComponents;DBXSqliteDriver;IndyIPServer;dsnapxml;DataSnapClient;DataSnapProviderClient;DataSnapFireDAC;emsclientfiredac;FireDAC;FireDACDSDriver;xmlrtl;tethering;RESTDWCore;PascalRALDsgn;ZDbc;dsnap;CloudService;DataSnapNativeClient;FMXTee;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
136-
<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>
136+
<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=;minSdkVersion=23;targetSdkVersion=34</VerInfo_Keys>
137137
<BT_BuildType>Debug</BT_BuildType>
138138
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
139139
<Android_LauncherIcon36>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png</Android_LauncherIcon36>
@@ -297,7 +297,7 @@
297297
<Source Name="MainSource">RALTestServerDelphi.dpr</Source>
298298
</Source>
299299
</Delphi.Personality>
300-
<Deployment Version="4">
300+
<Deployment Version="5">
301301
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
302302
<Platform Name="iOSSimulator">
303303
<Overwrite>true</Overwrite>
@@ -313,24 +313,9 @@
313313
<Overwrite>true</Overwrite>
314314
</Platform>
315315
</DeployFile>
316-
<DeployFile LocalName="Win32\Debug\RALTestServerDelphi.exe" Configuration="Debug" Class="ProjectOutput">
317-
<Platform Name="Win32">
318-
<RemoteName>RALTestServerDelphi.exe</RemoteName>
319-
<Overwrite>true</Overwrite>
320-
</Platform>
321-
</DeployFile>
322-
<DeployFile LocalName="Win64\Debug\RALTestServerDelphi.exe" Configuration="Debug" Class="ProjectOutput">
323-
<Platform Name="Win64">
324-
<RemoteName>RALTestServerDelphi.exe</RemoteName>
325-
<Overwrite>true</Overwrite>
326-
</Platform>
327-
</DeployFile>
328-
<DeployFile LocalName="Win64\Release\RALTestServerDelphi.exe" Configuration="Release" Class="ProjectOutput">
329-
<Platform Name="Win64">
330-
<RemoteName>RALTestServerDelphi.exe</RemoteName>
331-
<Overwrite>true</Overwrite>
332-
</Platform>
333-
</DeployFile>
316+
<DeployFile LocalName="Win32\Debug\RALTestServerDelphi.exe" Configuration="Debug" Class="ProjectOutput"/>
317+
<DeployFile LocalName="Win64\Debug\RALTestServerDelphi.exe" Configuration="Debug" Class="ProjectOutput"/>
318+
<DeployFile LocalName="Win64\Release\RALTestServerDelphi.exe" Configuration="Release" Class="ProjectOutput"/>
334319
<DeployClass Name="AdditionalDebugSymbols">
335320
<Platform Name="iOSSimulator">
336321
<Operation>1</Operation>
@@ -343,16 +328,6 @@
343328
<Operation>0</Operation>
344329
</Platform>
345330
</DeployClass>
346-
<DeployClass Name="AndroidClasses">
347-
<Platform Name="Android">
348-
<RemoteDir>classes</RemoteDir>
349-
<Operation>64</Operation>
350-
</Platform>
351-
<Platform Name="Android64">
352-
<RemoteDir>classes</RemoteDir>
353-
<Operation>64</Operation>
354-
</Platform>
355-
</DeployClass>
356331
<DeployClass Name="AndroidFileProvider">
357332
<Platform Name="Android">
358333
<RemoteDir>res\xml</RemoteDir>
@@ -363,12 +338,6 @@
363338
<Operation>1</Operation>
364339
</Platform>
365340
</DeployClass>
366-
<DeployClass Name="AndroidGDBServer">
367-
<Platform Name="Android">
368-
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
369-
<Operation>1</Operation>
370-
</Platform>
371-
</DeployClass>
372341
<DeployClass Name="AndroidLibnativeArmeabiFile">
373342
<Platform Name="Android">
374343
<RemoteDir>library\lib\armeabi</RemoteDir>

‎Delphi/Server/src/ServerTest.fmx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,9 @@ object Form1: TForm1
661661
object Layout1: TLayout
662662
Align = Right
663663
Margins.Right = 20.000000000000000000
664-
Position.X = 500.000000000000000000
664+
Position.X = -66.000000000000000000
665665
Size.Width = 47.000000000000000000
666-
Size.Height = 425.000000000000000000
666+
Size.Height = 16.000000000000000000
667667
Size.PlatformDefault = False
668668
TabOrder = 0
669669
object SpeedButton1: TSpeedButton

‎Delphi/Server/src/ServerTest.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ procedure TForm1.ConfigureServer;
208208
begin
209209
SkipMethods.DelimitedText := sgRoutes.Cells[2, I];
210210
for J := 0 to pred(SkipMethods.Count) do
211-
FServer.Routes.RouteAddress[sgRoutes.Cells[0, I]].SkipAuthMethods :=
212-
FServer.Routes.RouteAddress[sgRoutes.Cells[0, I]].SkipAuthMethods +
211+
FServer.Routes.Find[sgRoutes.Cells[0, I]].SkipAuthMethods :=
212+
FServer.Routes.Find[sgRoutes.Cells[0, I]].SkipAuthMethods +
213213
[HTTPMethodToRALMethod(SkipMethods.Strings[J])];
214214
SkipMethods.Clear;
215215
end;

0 commit comments

Comments
 (0)