fppkg: cleanup of sources

git-svn-id: trunk@31264 -

components/fppkg/src/fppkg_mainfrm.pas

@@ -38,10 +38,10 @@ interface
 uses
   Classes, SysUtils, Forms, Controls, StdCtrls, ComCtrls, ExtCtrls, Buttons,
   Menus, CheckLst, Dialogs, fppkg_const,
-  fppkg_optionsfrm, fppkg_details, fppkg_lpk,
+  fppkg_optionsfrm, fppkg_details,
   //IDE interface
   {$IFDEF LazarusIDEPackage}
-    IDEIntf, PackageIntf, IDECommands, contnrs,
+    IDEIntf, PackageIntf, IDECommands, contnrs, fppkg_lpk,
   {$ENDIF}
   // Repository handler objects
   fprepos,
@@ -310,14 +310,14 @@ end;
 procedure TFppkgForm.InstallButtonClick(Sender: TObject);
 var
   s: TStrings;
-  i,j,k: integer;
-  LPKFile: string;
   {$IFDEF LazarusIDEPackage}
-  P: TLazFPPackage;
-  RebuildLazarus: boolean;
-  PkgFlags: TPkgInstallInIDEFlags;
-  APackage: TIDEPackage;
-  InstPackages: TObjectList;
+    P: TLazFPPackage;
+    RebuildLazarus: boolean;
+    PkgFlags: TPkgInstallInIDEFlags;
+    APackage: TIDEPackage;
+    InstPackages: TObjectList;
+    i, j, k: integer;
+    LPKFile: string;
   {$ENDIF}
 begin
   s := TStringList.Create;

components/fppkg/src/laz_pkgcommands.pas

@@ -12,7 +12,7 @@ implementation
 uses
   zipper,
   pkgmessages, pkgglobals, pkgoptions, pkgdownload, pkgrepos, fprepos,
-  laz_pkgrepos, pkgfpmake, SvnCommand;
+  laz_pkgrepos, pkgfpmake;
 
 type
   { TCommandLazListPackages }
@@ -22,63 +22,11 @@ type
     Procedure Execute;override;
   end;
 
-  { TCommandLazUnzip }
-
-  TCommandLazUnzip = Class(TPackagehandler)
-  Public
-    Procedure Execute;override;
-  end;
-
 procedure TCommandLazListPackages.Execute;
 begin
   Laz_ListPackages;
 end;
 
-
-procedure TCommandLazUnzip.Execute;
-Var
-  BuildDir : string;
-  ArchiveFile : String;
-  P : TFPPackage;
-  fDownload: boolean = False;
-  M: TFPMirror;
-begin
-  if PackageName='' then
-    Error(SErrNoPackageSpecified);
-  P:=AvailableRepository.PackageByName(PackageName);
-  BuildDir:=PackageBuildPath(P);
-
-  {$ifdef SVNProtocol}
-  M := AvailableMirrors.FindMirror(P.Mirror);
-
-  if not Assigned(M) or (M.Protocol <> 'SVN') then
-  begin
-    ArchiveFile:=PackageLocalArchive(P);
-    if not FileExists(ArchiveFile) then
-      Laz_ExecuteAction(PackageName,'downloadpackage');
-    { Create builddir, remove it first if needed }
-    if DirectoryExists(BuildDir) then
-      DeleteDir(BuildDir);
-    ForceDirectories(BuildDir);
-    SetCurrentDir(BuildDir);
-    { Unzip Archive }
-    With TUnZipper.Create do
-      try
-        Log(vlCommands,SLogUnzippping,[ArchiveFile]);
-        OutputPath:=PackageBuildPath(P);
-        UnZipAllFiles(ArchiveFile);
-      Finally
-        Free;
-      end;
-  end
-  else
-  {$endif}
-    { Create builddir }
-    if not DirectoryExists(BuildDir) then
-      ExecuteSvnCommand('export ' + M.URL + P.FileName + ' "' + BuildDir + '"');
-end;
-
 initialization
   RegisterPkgHandler('laz_list',TCommandLazListPackages);
-  RegisterPkgHandler('laz_unzip',TCommandLazUnzip);
 end.

components/fppkg/src/laz_pkgrepos.pas

@@ -172,7 +172,6 @@ end;
 
 procedure TLazFPPackage.LoadUnitConfigFromStringlist(const AStringList: TStrings);
 var
-  L: TStrings;
   S: String;
 begin
   inherited LoadUnitConfigFromStringlist(AStringList);

components/fppkg/src/lazaruspackagemanager.lpk

@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="LazarusPackageManager"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="Darius Blaszyk"/>
     <CompilerOptions>
       <Version Value="10"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="..\svn;..\src"/>
+        <OtherUnitFiles Value="..\src"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Other>

components/fppkg/standalone/lazarusfppkg.lpi

@@ -34,14 +34,17 @@
         <FormatVersion Value="1"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="2">
+    <RequiredPackages Count="3">
       <Item1>
-        <PackageName Value="LCLBase"/>
-        <MinVersion Major="1" Release="1" Valid="True"/>
+        <PackageName Value="FCL"/>
       </Item1>
       <Item2>
-        <PackageName Value="LCL"/>
+        <PackageName Value="LCLBase"/>
+        <MinVersion Major="1" Release="1" Valid="True"/>
       </Item2>
+      <Item3>
+        <PackageName Value="LCL"/>
+      </Item3>
     </RequiredPackages>
     <Units Count="6">
       <Unit0>
@@ -87,7 +90,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\src;..\svn"/>
+      <OtherUnitFiles Value="..\src"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>