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

* Merging revisions 43060,43061,43063,43064,43065,43066,43080,43096,43100,43104 from trunk:

Browse Source 
------------------------------------------------------------------------
    r43060 | michael | 2019-09-23 17:14:35 +0200 (Mon, 23 Sep 2019) | 1 line
    
    * Fix appending path info and setting headers
    ------------------------------------------------------------------------
    r43061 | michael | 2019-09-23 17:19:25 +0200 (Mon, 23 Sep 2019) | 1 line
    
    * Use AppendPathInfo
    ------------------------------------------------------------------------
    r43063 | michael | 2019-09-25 16:06:28 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Add (cust)microhttpapp, high-concurrency standalone server
    ------------------------------------------------------------------------
    r43064 | michael | 2019-09-25 17:38:20 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Improve header & get variable fetching
    ------------------------------------------------------------------------
    r43065 | michael | 2019-09-25 17:40:19 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * remove forced debug flag
    ------------------------------------------------------------------------
    r43066 | michael | 2019-09-25 17:49:28 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Construct query string, needed in proxy
    ------------------------------------------------------------------------
    r43080 | michael | 2019-09-26 15:29:26 +0200 (Thu, 26 Sep 2019) | 1 line
    
    * Set namevalueseparator for headers
    ------------------------------------------------------------------------
    r43096 | michael | 2019-09-29 23:42:53 +0200 (Sun, 29 Sep 2019) | 1 line
    
    * Specify dependency on libmicrohttpd
    ------------------------------------------------------------------------
    r43100 | karoly | 2019-09-30 15:01:22 +0200 (Mon, 30 Sep 2019) | 1 line
    
    fcl-web: re-enabled platforms which were disabled in r43096
    ------------------------------------------------------------------------
    r43104 | pierre | 2019-10-01 21:21:30 +0200 (Tue, 01 Oct 2019) | 1 line
    
     Use same list of supported OSes for libmicrohttpd package in libmicrohttpd and fcl-web, and adapt packages/fpmake_proc.inc
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43261 -
This commit is contained in:
michael 2019-10-19 14:50:08 +00:00
parent ee93aa0798
commit 3cbce0f7de
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,19 +4,22 @@ program fpmake;
uses fpmkunit;
{$endif ALLPACKAGES}
procedure add_fcl_web(const ADirectory: string);
Const
LibMicroHttpdOSes = AllUnixOSes + [win32,win64];
Var
T : TTarget;
P : TPackage;
begin
With Installer do
begin
{$endif ALLPACKAGES}
P:=AddPackage('fcl-web');
P.ShortName:='fclw';
{$ifdef ALLPACKAGES}
P.Directory:=ADirectory;
{$endif ALLPACKAGES}
P.Version:='3.2.0-beta';
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
@ -37,7 +40,7 @@ begin
P.Dependencies.Add('winunits-base', [Win32,Win64]);
// (Temporary) indirect dependencies, not detected by fpcmake:
P.Dependencies.Add('univint',[MacOSX,iphonesim]);
P.Dependencies.Add('libmicrohttpd',LibMicroHttpdOSes);
P.Author := 'FreePascal development team';
P.License := 'LGPL with modification, ';
P.HomepageURL := 'www.freepascal.org';
@ -190,6 +193,28 @@ begin
OSes:=[Win32,Win64];
Dependencies.AddUnit('custhttpsys');
end;
with P.Targets.AddUnit('custmicrohttpapp.pp') do
begin
Dependencies.AddUnit('custweb');
Dependencies.AddUnit('httpdefs');
Dependencies.AddUnit('httpprotocol');
ResourceStrings:=true;
OSes := LibMicroHttpdOSes;
if Defaults.CPU=jvm then
OSes := OSes - [java,android];
end;
with P.Targets.AddUnit('microhttpapp.pp') do
begin
Dependencies.AddUnit('custweb');
Dependencies.AddUnit('httpdefs');
Dependencies.AddUnit('httpprotocol');
Dependencies.AddUnit('custmicrohttpapp');
OSes := LibMicroHttpdOSes;
if Defaults.CPU=jvm then
OSes := OSes - [java,android];
end;
with P.Targets.AddUnit('fphttpstatus.pas') do
begin
Dependencies.AddUnit('fphttpserver');
@ -402,9 +427,12 @@ begin
AddUnit('sqldbrestbridge');
AddUnit('sqldbrestconst');
end;
end;
end;
{$ifndef ALLPACKAGES}
Run;
end;
begin
add_fcl_web('');
Installer.Run;
end.
{$endif ALLPACKAGES}

4
packages/fpmake_proc.inc
View File

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

2
packages/libmicrohttpd/fpmake.pp
View File

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