paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-28 22:20:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Opkman: Use default fphttpclient.pp and zipper.pp with fpc 3.2.0.

Browse Source 
git-svn-id: trunk@63600 -
This commit is contained in:
balazs 2020-07-19 19:17:48 +00:00
parent 8dde6e879f
commit 44c240ead0
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/onlinepackagemanager/opkman_downloader.pas
View File

@ -34,7 +34,7 @@ uses
Classes, SysUtils, fpjson, LazIDEIntf, md5,
// OpkMan
opkman_common, opkman_serializablepackages, opkman_const, opkman_options,
{$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
{$IFDEF FPC320}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
type
TDownloadType = (dtJSON, dtPackage, dtUpdate);

10
components/onlinepackagemanager/opkman_fpcdef.inc
View File

@ -1,11 +1,5 @@
{$IF FPC_VERSION = 3}
{$IF FPC_RELEASE = 0}
{$IF FPC_PATCH > 1}
{$DEFINE FPC302}
{$ENDIF}
{$ELSE}
{$IF FPC_PATCH > 0}
{$DEFINE FPC311}
{$ENDIF}
{$IF FPC_RELEASE > 1}
{$DEFINE FPC320}
{$ENDIF}
{$ENDIF}

6
components/onlinepackagemanager/opkman_updates.pas
View File

@ -37,8 +37,8 @@ uses
// OpkMan
opkman_serializablepackages, opkman_options, opkman_common, opkman_visualtree,
opkman_OpenSSLfrm,
{$IFDEF FPC311}zipper,{$ELSE}opkman_zip,{$ENDIF}
{$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
{$IFDEF FPC320}zipper,{$ELSE}opkman_zip,{$ENDIF}
{$IFDEF FPC320}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
const
OpkVersion = 1;
@ -251,7 +251,7 @@ begin
FreeOnTerminate := True;
OnTerminate := @DoTerminated;
FHTTPClient := TFPHTTPClient.Create(nil);
{$IFDEF FPC311}
{$IFDEF FPC320}
FHTTPClient.IOTimeout := Options.ConTimeOut*1000;
{$ENDIF}
if Options.ProxyEnabled then

2
components/onlinepackagemanager/opkman_uploader.pas
View File

@ -34,7 +34,7 @@ uses
Classes, SysUtils, base64,
// OpkMan
opkman_options, opkman_const,
{$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
{$IFDEF FPC320}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
type
TOnUploadProgress = procedure(Sender: TObject; AFileName: String) of object;

2
components/onlinepackagemanager/opkman_zipper.pas
View File

@ -36,7 +36,7 @@ uses
FileUtil, LazFileUtils,
// OpkMan
opkman_serializablepackages, opkman_common,
{$IFDEF FPC311}zipper{$ELSE}opkman_zip{$ENDIF};
{$IFDEF FPC320}zipper{$ELSE}opkman_zip{$ENDIF};
type
TOnProgressEx = procedure(Sender : TObject; const ATotPos, ATotSize: Int64);