fcl-web: only disable some CGI related things on Amiga-like systems, where the current code assumes Unix or Windows

This commit is contained in:
Karoly Balogh 2024-11-15 23:02:34 +01:00
parent b6af220f1a
commit ff89a4815a

View File

@ -13,11 +13,13 @@ Const
SqldbConnectionOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,ios,netbsd,openbsd,solaris,win32,win64,wince,android,dragonfly]; SqldbConnectionOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,ios,netbsd,openbsd,solaris,win32,win64,wince,android,dragonfly];
SqliteOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,ios,netbsd,openbsd,solaris,win32,win64,wince,android,dragonfly]; SqliteOSes = [aix,beos,haiku,linux,freebsd,darwin,iphonesim,ios,netbsd,openbsd,solaris,win32,win64,wince,android,dragonfly];
NoSocketsOSes = [amiga,aros,morphos,wasi]; NoSocketsOSes = [wasi];
NoApacheOSes = [amiga,aros,morphos,wasi]; NoApacheOSes = [amiga,aros,morphos,wasi];
NoCGIOSes = [amiga,aros,morphos,wasi];
ApacheOSes = AllOSes - NoApacheOSes; ApacheOSes = AllOSes - NoApacheOSes;
SocketsOSes = AllOSes - NoSocketsOSes; SocketsOSes = AllOSes - NoSocketsOSes;
CGIOSes = ALLOSes - NoCGIOSes;
Var Var
T : TTarget; T : TTarget;
@ -46,7 +48,7 @@ begin
P.Dependencies.Add('hash'); P.Dependencies.Add('hash');
P.Dependencies.Add('fcl-registry', AllWindowsOSes); P.Dependencies.Add('fcl-registry', AllWindowsOSes);
P.Dependencies.Add('openssl', AllUnixOSes+AllWindowsOSes); P.Dependencies.Add('openssl', AllUnixOSes+AllWindowsOSes);
P.Dependencies.Add('fastcgi',SocketsOSes); P.Dependencies.Add('fastcgi',NoCGIOSes);
{$ifndef ALLPACKAGES} {$ifndef ALLPACKAGES}
P.Dependencies.Add('httpd20', ApacheOSes); P.Dependencies.Add('httpd20', ApacheOSes);
{$endif ALLPACKAGES} {$endif ALLPACKAGES}
@ -165,12 +167,12 @@ begin
end; end;
with P.Targets.AddUnit('fpfcgi.pp') do with P.Targets.AddUnit('fpfcgi.pp') do
begin begin
OSes:=SocketsOSes; OSes:=CGIOSes;
Dependencies.AddUnit('custfcgi'); Dependencies.AddUnit('custfcgi');
end; end;
with P.Targets.AddUnit('custfcgi.pp') do with P.Targets.AddUnit('custfcgi.pp') do
begin begin
OSes:=SocketsOSes; OSes:=CGIOSes;
Dependencies.AddUnit('httpprotocol'); Dependencies.AddUnit('httpprotocol');
Dependencies.AddUnit('cgiprotocol'); Dependencies.AddUnit('cgiprotocol');
Dependencies.AddUnit('custcgi'); Dependencies.AddUnit('custcgi');
@ -244,14 +246,12 @@ begin
Dependencies.AddUnit('fphttpserver'); Dependencies.AddUnit('fphttpserver');
Dependencies.AddUnit('HTTPDefs'); Dependencies.AddUnit('HTTPDefs');
end; end;
T:=P.Targets.AddUnit('fcgigate.pp'); with P.Targets.AddUnit('fcgigate.pp') do
T.ResourceStrings:=true;
T.OSes:=SocketsOSes;
With T.Dependencies do
begin begin
AddUnit('httpdefs'); OSes:=CGIOSes;
AddUnit('custcgi'); ResourceStrings:=true;
Dependencies.AddUnit('httpdefs');
Dependencies.AddUnit('custcgi');
end; end;
T:=P.Targets.AddUnit('fphttpserver.pp'); T:=P.Targets.AddUnit('fphttpserver.pp');