Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Lazarus Package file support to Indy 10.7 #576

Open
wants to merge 7 commits into
base: Indy-10.7
Choose a base branch
from
Open

Adding Lazarus Package file support to Indy 10.7 #576

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a5af90b
Added Lazarus Build Files
MWASoftware Jan 6, 2025
3fb4e95
README for lazarus added
MWASoftware Jan 6, 2025
85c0680
Source Code updates to enable compile with FPC
MWASoftware Jan 6, 2025
fe33518
Readme update
MWASoftware Jan 6, 2025
697d77b
Removed VCL and DotNet specific units from lazarus system package
MWASoftware Jan 8, 2025
85974c1
Removed StreamVCL from fpc build unit
MWASoftware Jan 8, 2025
8ff6cb8
Updated gitattributes
MWASoftware Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Lib/Core/IdCompilerDefines.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@

// $DEFINE the following if the global objects in the IdStack and IdThread
// units should be freed on finalization
{.$DEFINE FREE_ON_FINAL}
{$IFDEF FPC}
{$DEFINE FREE_ON_FINAL}
{$ELSE}
{$UNDEF FREE_ON_FINAL}
{$ENDIF}

// Make sure the following is $DEFINE'd only for suitable environments
// as specified further below. This works in conjunction with the
Expand Down
169 changes: 80 additions & 89 deletions Lib/Core/Makefile.fpc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,80 @@
# Makefile.fpc for indycorefpc 10.6.3.0

[package]
name=indycorefpc
version=10.6.3.0
main=indy


[compiler]
includedir=../Inc
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
unitdir=../System/lib/$(CPU_TARGET)-$(OS_TARGET)
options=-gl

[target]
units=indycorefpc
rsts=IdResourceStringsCore.rst

implicitunits=IdAssignedNumbers \
IdBuffer \
IdCmdTCPClient \
IdCmdTCPServer \
IdCommandHandlers \
IdContext \
IdCustomTCPServer \
IdCustomTransparentProxy \
IdExceptionCore \
IdGlobalCore \
IdIOHandler \
IdIOHandlerSocket \
IdIOHandlerStack \
IdIOHandlerStream \
IdIPAddress \
IdIPMCastBase \
IdIPMCastClient \
IdIPMCastServer \
IdIcmpClient \
IdIntercept \
IdInterceptSimLog \
IdInterceptThrottler \
IdLogBase \
IdLogDebug \
IdLogEvent \
IdLogFile \
IdLogStream \
IdRawBase \
IdRawClient \
IdRawFunctions \
IdRawHeaders \
IdReply \
IdReplyRFC \
IdResourceStringsCore \
IdScheduler \
IdSchedulerOfThread \
IdSchedulerOfThreadDefault \
IdSchedulerOfThreadPool \
IdServerIOHandler \
IdServerIOHandlerSocket \
IdServerIOHandlerStack \
IdSimpleServer \
IdSocketHandle \
IdSocks \
IdSync \
IdTCPClient \
IdTCPConnection \
IdTCPServer \
IdTCPStream \
IdTask \
IdThread \
IdThreadComponent \
IdThreadSafe \
IdTraceRoute \
IdUDPBase \
IdUDPClient \
IdUDPServer \
IdYarn


[requires]
packages=indysystemfpc
packagedir=../System/lib/$(CPU_TARGET)-$(OS_TARGET)

[install]
fpcpackage=y
fpcsubdir=packages/extra
buildunit=indycorefpc

[shared]
build=n
[package]
name=indycore
version=$(INDY_VERSION)
main=indy

[requires]
packages=indysystem

[compiler]
options= -MDelphi $(OPT) -Scghi -CX -Ur -Xs -vew
unittargetdir= ../../units/$(CPU_TARGET)-$(OS_TARGET)
includedir=.
unitdir=.

[target]
units=indycorefpc
implicitunits=IdAssignedNumbers \
IdBuffer \
IdCmdTCPClient \
IdCmdTCPServer \
IdCommandHandlers \
IdContext \
IdCustomTCPServer \
IdCustomTransparentProxy \
IdExceptionCore \
IdGlobalCore \
IdIcmpClient \
IdIntercept \
IdInterceptSimLog \
IdInterceptThrottler \
IdIOHandler \
IdIOHandlerSocket \
IdIOHandlerStack \
IdIOHandlerStream \
IdIPAddress \
IdIPMCastBase \
IdIPMCastClient \
IdIPMCastServer \
IdLogBase \
IdLogDebug \
IdLogEvent \
IdLogFile \
IdLogStream \
IdRawBase \
IdRawClient \
IdRawFunctions \
IdRawHeaders \
IdReply \
IdReplyRFC \
IdResourceStringsCore \
IdSchedulerOfThreadDefault \
IdSchedulerOfThread \
IdSchedulerOfThreadPool \
IdScheduler \
IdServerIOHandler \
IdServerIOHandlerSocket \
IdServerIOHandlerStack \
IdSimpleServer \
IdSocketHandle \
IdSocks \
IdSync \
IdTask \
IdTCPClient \
IdTCPConnection \
IdTCPServer \
IdTCPStream \
IdThreadComponent \
IdThread \
IdThreadSafe \
IdTraceRoute \
IdUDPBase \
IdUDPClient \
IdUDPServer \
IdYarn


[install]
fpcpackage=y
fpcsubdir=packages/extra
buildunit=indycorefpc
7 changes: 4 additions & 3 deletions Lib/Protocols/IdAuthenticationSSPI.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
interface

{$i IdCompilerDefines.inc}

{$IFDEF USE_SSPI}
uses
IdGlobal,
IdAuthentication,
Expand Down Expand Up @@ -430,8 +430,9 @@ TIdSSPINTLMAuthentication = class(TIdAuthentication)
{$HPPEMIT '#pragma link "IdAuthenticationSSPI"'}
{$ENDIF}

{$ENDIF}
implementation

{$IFDEF USE_SSPI}
uses
IdGlobalProtocols,
IdCoderMIME,
Expand Down Expand Up @@ -1317,6 +1318,6 @@ finalization
UnregisterAuthenticationMethod('Negotiate'); {do not localize}
end;
FreeAndNil(gSSPIInterface);

{$ENDIF}
end.

5 changes: 4 additions & 1 deletion Lib/Protocols/IdCompilerDefines.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@

// $DEFINE the following if the global objects in the IdStack and IdThread
// units should be freed on finalization
{.$DEFINE FREE_ON_FINAL}
{$IFDEF FPC}
{$DEFINE FREE_ON_FINAL}
{$ELSE}
{$UNDEF FREE_ON_FINAL}
{$ENDIF}

// Make sure the following is $DEFINE'd only for suitable environments
// as specified further below. This works in conjunction with the
Expand Down
5 changes: 3 additions & 2 deletions Lib/Protocols/IdSSH.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ interface
uses
Classes,
IdContainers,
IdYarn,
IdGlobalCore,
IdIOHandler,
IdIOHandlerSocket,
Expand Down Expand Up @@ -61,7 +62,7 @@ TIdServerIOHandlerSSHBase = class(TIdServerIOHandler)
protected
public
//this is for the FTP Server to make a client IOHandler for it's data connection's IOHandler
function MakeClientIOHandler(ATheThread:TIdThreadHandle ): TIdIOHandler; overload; override;
function MakeClientIOHandler(ATheThread:TIdYarn ): TIdIOHandler; overload; override;
function MakeClientIOHandler : TIdSSHIOHandlerSocketBase; reintroduce; overload; virtual; abstract;
function MakeFTPSvrPort : TIdSSHIOHandlerSocketBase; virtual; abstract;
function MakeFTPSvrPasv : TIdSSHIOHandlerSocketBase; virtual; abstract;
Expand Down Expand Up @@ -143,7 +144,7 @@ procedure TIdSSHIOHandlerSocketBase.SetPassThrough(const AValue: Boolean);

{ TIdServerIOHandlerSSHBase }

function TIdServerIOHandlerSSHBase.MakeClientIOHandler(ATheThread:TIdThreadHandle ): TIdIOHandler;
function TIdServerIOHandlerSSHBase.MakeClientIOHandler(ATheThread:TIdYarn ): TIdIOHandler;
begin
Result := MakeClientIOHandler;
end;
Expand Down
6 changes: 6 additions & 0 deletions Lib/Protocols/IdSSPI.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
interface

{$i IdCompilerDefines.inc}
{$IFDEF USE_SSPI}


uses
IdGlobal,
Expand Down Expand Up @@ -2867,7 +2869,9 @@ SEC_WINNT_AUTH_IDENTITY_EXA = record

*)

{$ENDIF}
implementation
{$IFDEF USE_SSPI}

procedure SecInvalidateHandle(var x: SecHandle);
begin
Expand All @@ -2893,4 +2897,6 @@ function SEC_SUCCESS(Status: SECURITY_STATUS): Boolean;
Result := Status >= 0;
end;

{$ENDIF}

end.
Loading