paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 15:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

OPM: Use FPC_FULLVERSION for checking compiler version.

Browse Source 
git-svn-id: trunk@64461 -
This commit is contained in:
juha 2021-02-05 11:28:01 +00:00
parent de413141bf
commit d6aedf99e8
7 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -3920,7 +3920,6 @@ components/onlinepackagemanager/opkman_createrepositoryfrm.pas svneol=native#tex
components/onlinepackagemanager/opkman_createrepositorypackagefrm.lfm svneol=native#text/plain
components/onlinepackagemanager/opkman_createrepositorypackagefrm.pas svneol=native#text/pascal
components/onlinepackagemanager/opkman_downloader.pas svneol=native#text/pascal
components/onlinepackagemanager/opkman_fpcdef.inc svneol=native#text/pascal
components/onlinepackagemanager/opkman_installer.pas svneol=native#text/pascal
components/onlinepackagemanager/opkman_intf.pas svneol=native#text/pascal
components/onlinepackagemanager/opkman_intf_packagelistfrm.lfm svneol=native#text/plain

2
components/onlinepackagemanager/fpcmod/opkman_httpclient.pas
View File

@ -21,8 +21,6 @@ unit opkman_httpclient;
{$mode objfpc}{$H+}
{$INCLUDE opkman_fpcdef.inc}
interface
uses

4
components/onlinepackagemanager/opkman_downloader.pas
View File

@ -26,15 +26,13 @@ unit opkman_downloader;
{$mode objfpc}{$H+}
{$INCLUDE opkman_fpcdef.inc}
interface
uses
Classes, SysUtils, fpjson, LazIDEIntf, md5,
// OpkMan
opkman_common, opkman_serializablepackages, opkman_const, opkman_options,
{$IFDEF FPC320}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
{$IF FPC_FULLVERSION>=30200}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
type
TDownloadType = (dtJSON, dtPackage, dtUpdate);

5
components/onlinepackagemanager/opkman_fpcdef.inc
View File

@ -1,5 +0,0 @@
{$IF FPC_VERSION = 3}
{$IF FPC_RELEASE > 1}
{$DEFINE FPC320}
{$ENDIF}
{$ENDIF}

11
components/onlinepackagemanager/opkman_updates.pas
View File

@ -25,8 +25,6 @@ unit opkman_updates;
{$mode objfpc}{$H+}
{$INCLUDE opkman_fpcdef.inc}
interface
uses
@ -37,8 +35,11 @@ uses
// OpkMan
opkman_serializablepackages, opkman_options, opkman_common, opkman_visualtree,
opkman_OpenSSLfrm,
{$IFDEF FPC320}zipper,{$ELSE}opkman_zip,{$ENDIF}
{$IFDEF FPC320}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
{$IF FPC_FULLVERSION>=30200}
zipper, fphttpclient, opensslsockets;
{$ELSE}
opkman_zip, opkman_httpclient;
{$ENDIF}
const
OpkVersion = 1;
@ -251,7 +252,7 @@ begin
FreeOnTerminate := True;
OnTerminate := @DoTerminated;
FHTTPClient := TFPHTTPClient.Create(nil);
{$IFDEF FPC320}
{$IF FPC_FULLVERSION>=30200}
FHTTPClient.IOTimeout := Options.ConTimeOut*1000;
{$ENDIF}
if Options.ProxyEnabled then

4
components/onlinepackagemanager/opkman_uploader.pas
View File

@ -26,15 +26,13 @@ unit opkman_uploader;
{$mode objfpc}{$H+}
{$INCLUDE opkman_fpcdef.inc}
interface
uses
Classes, SysUtils, base64,
// OpkMan
opkman_options, opkman_const,
{$IFDEF FPC320}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
{$IF FPC_FULLVERSION>=30200}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
type
TOnUploadProgress = procedure(Sender: TObject; AFileName: String) of object;

4
components/onlinepackagemanager/opkman_zipper.pas
View File

@ -26,8 +26,6 @@ unit opkman_zipper;
{$mode objfpc}{$H+}
{$INCLUDE opkman_fpcdef.inc}
interface
uses
@ -36,7 +34,7 @@ uses
FileUtil, LazFileUtils,
// OpkMan
opkman_serializablepackages, opkman_common,
{$IFDEF FPC320}zipper{$ELSE}opkman_zip{$ENDIF};
{$IF FPC_FULLVERSION>=30200}zipper{$ELSE}opkman_zip{$ENDIF};
type
TOnProgressEx = procedure(Sender : TObject; const ATotPos, ATotSize: Int64);