paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 04:06:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use same list of supported OSes for libmicrohttpd package in libmicrohttpd and fcl-web, and adapt packages/fpmake_proc.inc

Browse Source 
git-svn-id: trunk@43104 -
This commit is contained in:
pierre 2019-10-01 19:21:30 +00:00
parent 396160931f
commit b978d7b6d5
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/fcl-web/fpmake.pp
View File

@ -4,19 +4,22 @@ program fpmake;
uses fpmkunit; uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_fcl_web(const ADirectory: string);
Const
LibMicroHttpdOSes = AllUnixOSes + [win32,win64];
Var Var
T : TTarget; T : TTarget;
P : TPackage; P : TPackage;
begin begin
With Installer do With Installer do
begin begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-web'); P:=AddPackage('fcl-web');
P.ShortName:='fclw'; P.ShortName:='fclw';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory; P.Directory:=ADirectory;
{$endif ALLPACKAGES}
P.Version:='3.3.1'; P.Version:='3.3.1';
P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,win32,win64,wince,aix,amiga,aros,morphos,dragonfly,android]; P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,win32,win64,wince,aix,amiga,aros,morphos,dragonfly,android];
if Defaults.CPU=jvm then if Defaults.CPU=jvm then
@ -37,7 +40,7 @@ begin
P.Dependencies.Add('winunits-base', [Win32,Win64]); P.Dependencies.Add('winunits-base', [Win32,Win64]);
// (Temporary) indirect dependencies, not detected by fpcmake: // (Temporary) indirect dependencies, not detected by fpcmake:
P.Dependencies.Add('univint',[MacOSX,iphonesim]); P.Dependencies.Add('univint',[MacOSX,iphonesim]);
P.Dependencies.Add('libmicrohttpd',AllUnixOSes+AllWindowsOSes); P.Dependencies.Add('libmicrohttpd',LibMicroHttpdOSes);
P.Author := 'FreePascal development team'; P.Author := 'FreePascal development team';
P.License := 'LGPL with modification, '; P.License := 'LGPL with modification, ';
P.HomepageURL := 'www.freepascal.org'; P.HomepageURL := 'www.freepascal.org';
@ -196,7 +199,7 @@ begin
Dependencies.AddUnit('httpdefs'); Dependencies.AddUnit('httpdefs');
Dependencies.AddUnit('httpprotocol'); Dependencies.AddUnit('httpprotocol');
ResourceStrings:=true; ResourceStrings:=true;
OSes := [android,freebsd,linux,netbsd,openbsd,win32,win64]; OSes := LibMicroHttpdOSes;
if Defaults.CPU=jvm then if Defaults.CPU=jvm then
OSes := OSes - [java,android]; OSes := OSes - [java,android];
end; end;
@ -206,7 +209,7 @@ begin
Dependencies.AddUnit('httpdefs'); Dependencies.AddUnit('httpdefs');
Dependencies.AddUnit('httpprotocol'); Dependencies.AddUnit('httpprotocol');
Dependencies.AddUnit('custmicrohttpapp'); Dependencies.AddUnit('custmicrohttpapp');
OSes := [android,freebsd,linux,netbsd,openbsd,win32,win64]; OSes := LibMicroHttpdOSes;
if Defaults.CPU=jvm then if Defaults.CPU=jvm then
OSes := OSes - [java,android]; OSes := OSes - [java,android];
end; end;
@ -424,9 +427,12 @@ begin
AddUnit('sqldbrestbridge'); AddUnit('sqldbrestbridge');
AddUnit('sqldbrestconst'); AddUnit('sqldbrestconst');
end; end;
end;
end;
{$ifndef ALLPACKAGES} {$ifndef ALLPACKAGES}
Run; begin
end; add_fcl_web('');
Installer.Run;
end. end.
{$endif ALLPACKAGES} {$endif ALLPACKAGES}

4
packages/fpmake_proc.inc
View File

@ -182,11 +182,7 @@ begin
{$include fcl-stl/fpmake.pp} {$include fcl-stl/fpmake.pp}
end; end;
procedure add_fcl_web(const ADirectory: string);
begin
with Installer do
{$include fcl-web/fpmake.pp} {$include fcl-web/fpmake.pp}
end;
procedure add_fcl_xml(const ADirectory: string); procedure add_fcl_xml(const ADirectory: string);
begin begin

2
packages/libmicrohttpd/fpmake.pp
View File

@ -25,7 +25,7 @@ begin
P.Description := 'Event and threaded based micro-http server library interface'; P.Description := 'Event and threaded based micro-http server library interface';
P.NeedLibC:= true; P.NeedLibC:= true;
P.Dependencies.Add('rtl-extra'); P.Dependencies.Add('rtl-extra');
P.OSes := [android,freebsd,linux,netbsd,openbsd,win32,win64]; P.OSes := AllUnixOSes + [win32,win64];
if Defaults.CPU=jvm then if Defaults.CPU=jvm then
P.OSes := P.OSes - [java,android]; P.OSes := P.OSes - [java,android];