Skip to content

Commit 8727758

Browse files
lminutilminuti
committed
Fix search path
1 parent ca4f12c commit 8727758

File tree

5 files changed

+26
-7
lines changed

5 files changed

+26
-7
lines changed

‎Demos/08.Platforms/ConsoleDemo.dproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
5757
<SanitizedProjectName>ConsoleDemo</SanitizedProjectName>
5858
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
59+
<DCC_UnitSearchPath>../../Source/Core;../../Source/Data;../../Source/Data/FireDAC;../../Libs/Neon/Source;../../Libs/JWT/Source/Common;../../Libs/JWT/Source/JOSE;../../Source/Extensions;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
60+
<VerInfo_Locale>1040</VerInfo_Locale>
61+
<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>
5962
</PropertyGroup>
6063
<PropertyGroup Condition="'$(Base_Linux64)'!=''">
6164
<DCC_UsePackage>RESTComponents;emsclientfiredac;DataSnapFireDAC;FireDACADSDriver;DatasnapConnectorsFreePascal;FireDACMSSQLDriver;inetdb;emsedge;FireDACIBDriver;dbexpress;IndyCore;dsnap;emsclient;DataSnapCommon;FireDACCommon;RESTBackendComponents;DataSnapConnectors;soapserver;bindengine;CloudService;FireDACOracleDriver;FireDACMySQLDriver;FireDACCommonODBC;FireDACCommonDriver;DataSnapClient;inet;IndySystem;FireDACDb2Driver;FireDACInfxDriver;FireDAC;emshosting;FireDACSqliteDriver;FireDACPgDriver;FireDACASADriver;FireDACTDataDriver;soaprtl;DbxCommonDriver;DataSnapServer;xmlrtl;soapmidas;DataSnapNativeClient;rtl;emsserverresource;DbxClientDriver;CustomIPTransport;bindcomp;dbxcds;FireDACODBCDriver;DataSnapIndy10ServerTransport;dsnapxml;dbrtl;IndyProtocols;FireDACMongoDBDriver;DataSnapServerMidas;$(DCC_UsePackage)</DCC_UsePackage>
@@ -88,6 +91,9 @@
8891
</PropertyGroup>
8992
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
9093
<DCC_RemoteDebug>false</DCC_RemoteDebug>
94+
<VerInfo_Locale>1033</VerInfo_Locale>
95+
<Manifest_File>(None)</Manifest_File>
96+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
9197
</PropertyGroup>
9298
<PropertyGroup Condition="'$(Cfg_2)'!=''">
9399
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -123,6 +129,10 @@
123129
<Source>
124130
<Source Name="MainSource">ConsoleDemo.dpr</Source>
125131
</Source>
132+
<Excluded_Packages>
133+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
134+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
135+
</Excluded_Packages>
126136
</Delphi.Personality>
127137
<Deployment Version="5">
128138
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">

‎Demos/08.Platforms/DeamonDemo.dproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
6262
<SanitizedProjectName>DeamonDemo</SanitizedProjectName>
6363
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
64+
<DCC_UnitSearchPath>../../Source/Core;../../Source/Data;../../Source/Data/FireDAC;../../Libs/Neon/Source;../../Libs/JWT/Source/Common;../../Libs/JWT/Source/JOSE;../../Source/Extensions;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
6465
</PropertyGroup>
6566
<PropertyGroup Condition="'$(Base_Linux64)'!=''">
6667
<DCC_UsePackage>RESTComponents;emsclientfiredac;DataSnapFireDAC;FireDACADSDriver;DatasnapConnectorsFreePascal;FireDACMSSQLDriver;inetdb;emsedge;FireDACIBDriver;dbexpress;IndyCore;dsnap;emsclient;DataSnapCommon;FireDACCommon;RESTBackendComponents;DataSnapConnectors;soapserver;bindengine;CloudService;FireDACOracleDriver;FireDACMySQLDriver;FireDACCommonODBC;FireDACCommonDriver;DataSnapClient;inet;IndySystem;FireDACDb2Driver;FireDACInfxDriver;FireDAC;emshosting;FireDACSqliteDriver;FireDACPgDriver;FireDACASADriver;FireDACTDataDriver;soaprtl;DbxCommonDriver;DataSnapServer;xmlrtl;soapmidas;DataSnapNativeClient;rtl;emsserverresource;DbxClientDriver;CustomIPTransport;bindcomp;dbxcds;FireDACODBCDriver;DataSnapIndy10ServerTransport;dsnapxml;dbrtl;IndyProtocols;FireDACMongoDBDriver;DataSnapServerMidas;$(DCC_UsePackage)</DCC_UsePackage>
@@ -95,6 +96,7 @@
9596
<DCC_UnitSearchPath>../../Source/Core;../../Source/Data;../../Source/Data/FireDAC;../../Libs/Neon/Source;../../Libs/JWT/Source/Common;../../Libs/JWT/Source/JOSE;../../Source/Extensions;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
9697
<Debugger_Launcher>/usr/bin/xterm -e &quot;%debuggee%&quot;</Debugger_Launcher>
9798
<Manifest_File>(None)</Manifest_File>
99+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
98100
</PropertyGroup>
99101
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
100102
<DCC_RemoteDebug>false</DCC_RemoteDebug>
@@ -134,10 +136,8 @@
134136
<Source Name="MainSource">DeamonDemo.dpr</Source>
135137
</Source>
136138
<Excluded_Packages>
137-
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k260.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
138-
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp260.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
139-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
140-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
139+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
140+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
141141
</Excluded_Packages>
142142
</Delphi.Personality>
143143
<Deployment Version="5">

‎Demos/08.Platforms/Server.Listener.pas

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ interface
88
WiRL.Configuration.Core,
99
WiRL.Configuration.Compression,
1010
WiRL.Core.Classes,
11-
WiRL.Core.Engine,
11+
WiRL.Engine.Core,
12+
WiRL.Engine.REST,
1213
WiRL.Core.Application,
1314
WiRL.Core.MessageBody.Default,
1415
WiRL.Data.MessageBody.Default,
@@ -82,7 +83,7 @@ procedure TListener.Start;
8283
FServer
8384
.SetPort(FPort)
8485
// Engine configuration
85-
.AddEngine<TWiRLEngine>('/rest')
86+
.AddEngine<TWiRLRESTEngine>('/rest')
8687
.SetEngineName('WiRL Demo')
8788

8889
// Application configuration

‎Demos/08.Platforms/WinServiceDemo.dproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
7676
<Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
7777
<SanitizedProjectName>WinServiceDemo</SanitizedProjectName>
78+
<DCC_UnitSearchPath>../../Source/Core;../../Source/Data;../../Source/Data/FireDAC;../../Libs/Neon/Source;../../Libs/JWT/Source/Common;../../Libs/JWT/Source/JOSE;../../Source/Extensions;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
79+
<VerInfo_Locale>1040</VerInfo_Locale>
80+
<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>
7881
</PropertyGroup>
7982
<PropertyGroup Condition="'$(Base_Linux64)'!=''">
8083
<DCC_UsePackage>RESTComponents;emsclientfiredac;DataSnapFireDAC;FireDACADSDriver;DatasnapConnectorsFreePascal;FireDACMSSQLDriver;inetdb;emsedge;FireDACIBDriver;dbexpress;IndyCore;dsnap;emsclient;DataSnapCommon;FireDACCommon;RESTBackendComponents;DataSnapConnectors;soapserver;bindengine;CloudService;FireDACOracleDriver;FireDACMySQLDriver;FireDACCommonODBC;FireDACCommonDriver;DataSnapClient;inet;IndySystem;FireDACDb2Driver;FireDACInfxDriver;FireDAC;emshosting;FireDACSqliteDriver;FireDACPgDriver;FireDACASADriver;FireDACTDataDriver;soaprtl;DbxCommonDriver;DataSnapServer;xmlrtl;soapmidas;DataSnapNativeClient;rtl;emsserverresource;DbxClientDriver;CustomIPTransport;bindcomp;dbxcds;FireDACODBCDriver;DataSnapIndy10ServerTransport;dsnapxml;dbrtl;IndyProtocols;FireDACMongoDBDriver;DataSnapServerMidas;$(DCC_UsePackage)</DCC_UsePackage>
@@ -106,8 +109,9 @@
106109
</PropertyGroup>
107110
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
108111
<DCC_RemoteDebug>false</DCC_RemoteDebug>
109-
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
110112
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
113+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
114+
<VerInfo_Locale>1033</VerInfo_Locale>
111115
</PropertyGroup>
112116
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
113117
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
@@ -157,6 +161,10 @@
157161
<Source>
158162
<Source Name="MainSource">WinServiceDemo.dpr</Source>
159163
</Source>
164+
<Excluded_Packages>
165+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
166+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
167+
</Excluded_Packages>
160168
</Delphi.Personality>
161169
<Deployment Version="5">
162170
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">

‎Demos/08.Platforms/WinServiceDemo.res

93 KB
Binary file not shown.

0 commit comments

Comments
 (0)