Browse Source

* Fixed compilation

git-svn-id: trunk@6328 -
michael 18 years ago
parent
commit
85cc72af54

+ 1 - 1
utils/fppkg/fppkg.pp

@@ -228,7 +228,7 @@ begin
       Log(vDebug,SLogRunAction,[AAction,logargs]);
       Log(vDebug,SLogRunAction,[AAction,logargs]);
     end;
     end;
   pkghandlerclass:=GetPkgHandler(AAction);
   pkghandlerclass:=GetPkgHandler(AAction);
-  With pkghandlerclass.Create(FDefaults) do
+  With pkghandlerclass.Create(Self,FDefaults) do
     try
     try
       Execute(Args);
       Execute(Args);
     finally
     finally

+ 1 - 1
utils/fppkg/lnet/lftp.pp

@@ -234,7 +234,7 @@ const
                                                 'RenameTo', 'System', 'Features',
                                                 'RenameTo', 'System', 'Features',
                                                 'PWD', 'HELP', 'LAST');
                                                 'PWD', 'HELP', 'LAST');
 
 
-procedure Writedbg(const ar: array of string);
+procedure Writedbg(const ar: array of const);
 {$ifdef debug}
 {$ifdef debug}
 var
 var
   i: Integer;
   i: Integer;

+ 3 - 3
utils/fppkg/pkghandler.pp

@@ -48,7 +48,7 @@ Type
   Protected
   Protected
     Procedure BackupFile(Const FileName : String);
     Procedure BackupFile(Const FileName : String);
   Public
   Public
-    Constructor Create(ADefaults:TPackagerOptions);
+    Constructor Create(AOwner: TComponent;ADefaults:TPackagerOptions); virtual;
     Function Execute(const Args:array of string):boolean; virtual; abstract;
     Function Execute(const Args:array of string):boolean; virtual; abstract;
     Property BackupFiles : Boolean Read FBackupFile Write FBackupFile;
     Property BackupFiles : Boolean Read FBackupFile Write FBackupFile;
     Property Defaults:TPackagerOptions Read FDefaults;
     Property Defaults:TPackagerOptions Read FDefaults;
@@ -208,9 +208,9 @@ begin
     Error(SErrBackupFailed,[FileName,BFN]);
     Error(SErrBackupFailed,[FileName,BFN]);
 end;
 end;
 
 
-constructor TPackageHandler.Create(ADefaults:TPackagerOptions);
+constructor TPackageHandler.Create(AOwner : TComponent; ADefaults:TPackagerOptions);
 begin
 begin
-  inherited Create(nil);
+  inherited Create(AOwner);
   FDefaults:=ADefaults;
   FDefaults:=ADefaults;
 end;
 end;
 
 

+ 1 - 1
utils/fppkg/pkglibcurl.pp

@@ -4,7 +4,7 @@ unit pkglibcurl;
 
 
 interface
 interface
 
 
-uses Classes,pkgdownload;
+uses Classes,pkgdownload,pkghandler;
 
 
 Type 
 Type 
   TLibCurlDownloader = Class(TBasePackageDownloader)
   TLibCurlDownloader = Class(TBasePackageDownloader)

+ 4 - 4
utils/fppkg/pkglnet.pas

@@ -6,7 +6,7 @@ interface
 
 
 uses
 uses
   SysUtils, Classes,
   SysUtils, Classes,
-  lnet, lftp, lhttp, pkgdownload;
+  lnet, lftp, lhttp, pkgdownload,pkgropts;
 
 
 Type
 Type
 
 
@@ -33,7 +33,7 @@ Type
     procedure FTPDownload(Const URL : String; Dest : TStream); override;
     procedure FTPDownload(Const URL : String; Dest : TStream); override;
     procedure HTTPDownload(Const URL : String; Dest : TStream); override;
     procedure HTTPDownload(Const URL : String; Dest : TStream); override;
    public
    public
-    constructor Create(AOwner : TComponent); override;
+    constructor Create(AOwner : TComponent;ADefaults:TPackagerOptions); override;
   end;
   end;
 
 
 implementation
 implementation
@@ -151,9 +151,9 @@ begin
   end;
   end;
 end;
 end;
 
 
-constructor TLNetDownloader.Create(AOwner: TComponent);
+constructor TLNetDownloader.Create(AOwner: TComponent;ADefaults:TPackagerOptions);
 begin
 begin
-  inherited Create(AOwner);
+  inherited Create(AOwner,ADefaults);
 
 
   FFTP:=TLFTPClient.Create(Self);
   FFTP:=TLFTPClient.Create(Self);
   FFTP.Timeout:=1000;
   FFTP.Timeout:=1000;

+ 3 - 3
utils/fppkg/pkgwget.pp

@@ -4,18 +4,18 @@ unit pkgwget;
 
 
 interface
 interface
 
 
-uses Classes,pkgdownload;
+uses Classes,pkgdownload,pkgropts;
 
 
 Type 
 Type 
   TWGetDownloader = Class(TBasePackageDownloader)
   TWGetDownloader = Class(TBasePackageDownloader)
   Private 
   Private 
     FWGet : String;
     FWGet : String;
   Protected
   Protected
+    Constructor Create(AOwner: TComponent; ADefaults:TPackagerOptions); override;
     Procedure WGetDownload(Const URL : String; Dest : TStream); virtual;
     Procedure WGetDownload(Const URL : String; Dest : TStream); virtual;
     Procedure FTPDownload(Const URL : String; Dest : TStream); override;
     Procedure FTPDownload(Const URL : String; Dest : TStream); override;
     Procedure HTTPDownload(Const URL : String; Dest : TStream); override;
     Procedure HTTPDownload(Const URL : String; Dest : TStream); override;
  Public
  Public
-    Constructor Create(AOWner : TComponent); override;
     Property WGet : String Read FWGet Write FWGet; 
     Property WGet : String Read FWGet Write FWGet; 
  end;   
  end;   
 
 
@@ -23,7 +23,7 @@ implementation
 
 
 uses process,pkghandler,pkgmessages;
 uses process,pkghandler,pkgmessages;
 
 
-Constructor TWGetDownloader.Create(AOWner : TComponent); 
+Constructor TWGetDownloader.Create(AOwner: TComponent; ADefaults:TPackagerOptions); 
 
 
 begin
 begin
   Inherited;
   Inherited;