* basic dependency handling is working

git-svn-id: trunk@9215 -

utils/fppkg/fppkg.pp

@@ -138,6 +138,7 @@ begin
   Writeln('  -v --verbose       Set verbosity');
   Writeln('  -b --bootstrap     Special bootstrapping mode');
   Writeln('  -g --global        Force installation to global (system-wide) directory');
+  Writeln('  -f --force         Force installation also if the package is already installed');
   Writeln('Actions:');
   Writeln('  update             Update packages list');
   Writeln('  avail              List available packages');
@@ -260,7 +261,12 @@ begin
     ProcessCommandLine;
     MaybeCreateLocalDirs;
     LoadCompilerDefaults;
+
+    // Load local repository, update first if this is a new installation
+    if not FileExists(Options.LocalPackagesFile) then
+      pkghandler.ExecuteAction(nil,'update');
     LoadLocalRepository;
+    LoadLocalStatus;
 
     if ParaPackages.Count=0 then
       begin
@@ -269,6 +275,7 @@ begin
       end
     else
       begin
+        // Process packages
         for i:=0 to ParaPackages.Count-1 do
           begin
             ActionPackage:=CurrentRepository.PackageByName(ParaPackages[i]);

utils/fppkg/fprepos.pp

@@ -165,7 +165,6 @@ Type
     FMaxDependencyLevel : Integer;
     FBackUpFiles: Boolean;
     FFileName: String;
-    FPackageCount: Integer;
     FPackages : TFPPackages;
     function GetPackage(Index : Integer): TFPPackage;
     function GetPackageCount: Integer;
@@ -184,9 +183,9 @@ Type
     Procedure Save;
     // Loading and Saving version numbers: List of Name=Value pairs.
     Procedure LoadStatusFromStream(Stream : TStream); virtual;
-    Procedure SaveStatusToStream(Stream : TStream; InstalledStatus : Boolean); virtual;
+    Procedure SaveStatusToStream(Stream : TStream); virtual;
     Procedure LoadStatusFromFile(AFileName : String);
-    Procedure SaveStatusToFile(AFileName : String; InstalledStatus : Boolean);
+    Procedure SaveStatusToFile(AFileName : String);
     // Package management
     Function IndexOfPackage(PackageName : String) : Integer;
     Function FindPackage(PackageName : String) : TFPPackage;
@@ -327,9 +326,14 @@ end;
 
 function TFPVersion.GetAsString: String;
 begin
-  Result:=Format('%d.%d.%d',[Release,Major,Minor]);
-  If (Suffix<>'') then
-    Result:=Result+'-'+Suffix;
+  if Empty then
+    Result:='<none>'
+  else
+    begin
+      Result:=Format('%d.%d.%d',[Release,Major,Minor]);
+      If (Suffix<>'') then
+        Result:=Result+'-'+Suffix;
+    end;
 end;
 
 function TFPVersion.GetEmpty: Boolean;
@@ -789,7 +793,7 @@ begin
   end;
 end;
 
-procedure TFPRepository.SaveStatusToStream(Stream: TStream;InstalledStatus : Boolean);
+procedure TFPRepository.SaveStatusToStream(Stream: TStream);
 
 Var
   L : TStrings;
@@ -798,14 +802,9 @@ Var
 begin
   L:=TStringList.Create;
   Try
-    If InstalledStatus then
-      For I:=0 to PackageCount-1 do
-        With Packages[i] do
-          L.Add(Name+'='+InstalledVersion.AsString)
-    else
-      For I:=0 to PackageCount-1 do
-        With Packages[i] do
-         L.Add(Name+'='+Version.AsString);
+    For I:=0 to PackageCount-1 do
+      With Packages[i] do
+        L.Add(Name+'='+InstalledVersion.AsString);
     L.SaveToStream(Stream);
   Finally
     L.Free;
@@ -826,7 +825,7 @@ begin
   end;
 end;
 
-procedure TFPRepository.SaveStatusToFile(AFileName: String; InstalledStatus : Boolean);
+procedure TFPRepository.SaveStatusToFile(AFileName: String);
 
 Var
   F : TFileStream;
@@ -836,7 +835,7 @@ begin
     BackupFile(AFileName);
   F:=TFileStream.Create(AFileName,fmCreate);
   Try
-    SaveStatusToStream(F,InstalledStatus);
+    SaveStatusToStream(F);
   Finally
     F.Free;
   end;

utils/fppkg/pkgcommands.pp

@@ -33,6 +33,13 @@ type
     Function Execute(const Args:TActionArgs):boolean;override;
   end;
 
+  { TCommandAllAvail }
+
+  TCommandAllAvail = Class(TPackagehandler)
+  Public
+    Function Execute(const Args:TActionArgs):boolean;override;
+  end;
+
   { TCommandAvail }
 
   TCommandAvail = Class(TPackagehandler)
@@ -110,24 +117,34 @@ end;
 
 function TCommandUpdate.Execute(const Args:TActionArgs):boolean;
 begin
+  Log(vCommands,SLogDownloading,[Options.RemotePackagesFile,Options.LocalPackagesFile]);
   DownloadFile(Options.RemotePackagesFile,Options.LocalPackagesFile);
+  // Read the repository again
   LoadLocalRepository;
+  LoadLocalStatus;
+  Result:=true;
+end;
+
+
+function TCommandAllAvail.Execute(const Args:TActionArgs):boolean;
+begin
+  ListLocalRepository(true);
   Result:=true;
 end;
 
 
 function TCommandAvail.Execute(const Args:TActionArgs):boolean;
 begin
-  ListRepository;
+  ListLocalRepository(false);
   Result:=true;
 end;
 
 
 function TCommandScanPackages.Execute(const Args:TActionArgs):boolean;
 begin
-  RebuildRepository;
-  ListRepository;
-  SaveRepository;
+  RebuildRemoteRepository;
+  ListRemoteRepository;
+  SaveRemoteRepository;
   Result:=true;
 end;
 
@@ -200,6 +217,12 @@ begin
   if assigned(CurrentPackage) then
     ExecuteAction(CurrentPackage,'build',Args);
   ExecuteAction(CurrentPackage,'fpmakeinstall',Args);
+  // Update local status file
+  if assigned(CurrentPackage) then
+    begin
+      CurrentPackage.InstalledVersion.Assign(CurrentPackage.Version);
+      SaveLocalStatus;
+    end;
   Result:=true;
 end;
 
@@ -228,26 +251,28 @@ begin
       D:=CurrentPackage.Dependencies[i];
       DepPackage:=CurrentRepository.PackageByName(D.PackageName);
       // Need installation?
-      if (not DepPackage.InstalledVersion.Empty) and
+      if (DepPackage.InstalledVersion.Empty) or
          (DepPackage.InstalledVersion.CompareVersion(D.MinVersion)<0) then
         begin
           if DepPackage.Version.CompareVersion(D.MinVersion)<0 then
-            status:='Required Version Not Available!'
+            status:='Not Available!'
           else
-            status:='Needs update';
+            status:='Updating';
           L.Add(DepPackage.Name);
         end
       else
         status:='OK';
-      Log(vDebug,'Dependency '+D.PackageName+'-'+D.MinVersion.AsString+' ('+status+')');
+      Log(vDebug,'Dependency on package %s %s, installed %s, available %s  (%s)',
+          [D.PackageName,D.MinVersion.AsString,DepPackage.InstalledVersion.AsString,DepPackage.Version.AsString,status]);
     end;
   // Install needed updates
   for i:=0 to L.Count-1 do
     begin
       DepPackage:=CurrentRepository.PackageByName(L[i]);
+      if DepPackage.Version.CompareVersion(D.MinVersion)<0 then
+        Error(SErrNoPackageAvailable,[D.PackageName,D.MinVersion.AsString]);
       ExecuteAction(DepPackage,'install');
     end;
-
   FreeAndNil(L);
   Result:=true;
 end;
@@ -255,6 +280,7 @@ end;
 
 initialization
   RegisterPkgHandler('update',TCommandUpdate);
+  RegisterPkgHandler('allavail',TCommandAllAvail);
   RegisterPkgHandler('avail',TCommandAvail);
   RegisterPkgHandler('scan',TCommandScanPackages);
   RegisterPkgHandler('download',TCommandDownload);

utils/fppkg/pkgglobals.pp

@@ -99,8 +99,12 @@ begin
   case Level of
     vWarning :
       Prefix:=SWarning;
+{    vInfo :
+      Prefix:='I: ';
+    vCommands :
+      Prefix:='C: ';
     vDebug :
-      Prefix:=SDebug;
+      Prefix:='D: '; }
   end;
   Writeln(stdErr,Prefix,Msg);
 end;

utils/fppkg/pkghandler.pp

@@ -199,7 +199,8 @@ begin
   if assigned(CurrentPackage) then
     Result:='['+CurrentPackage.Name+'] '
   else
-    Result:='[<currentdir>] ';
+//    Result:='[<currentdir>] ';
+    Result:='';
 end;
 
 

utils/fppkg/pkgmessages.pp

@@ -19,6 +19,7 @@ Resourcestring
   SErrMissingCompilerConfig  = 'Could not find compiler configuration "%s"';
   SErrMissingInstallPackage  = 'Could not find package "%s"';
   SErrNoPackageSpecified     = 'No package specified';
+  SErrNoPackageAvailable     = 'Package %s %s is not available';
   SErrOnlyLocalDir           = 'The speficied command "%s" works only on current dir, not on a (remote) package';
   SErrRunning                = 'The FPC make tool encountered the following error:';
   SErrActionAlreadyRegistered= 'Action "%s" is already registered';
@@ -58,8 +59,9 @@ Resourcestring
   SLogDetectedCompiler       = 'Detected compiler "%s" (version %s for %s)';
   SLogDetectedFPCDIR         = 'Detected %s FPCDIR "%s"';
   SLogGeneratingCompilerConfig  = 'Generating default compiler configuration in "%s"';
-  SLogLoadingPackagesFile    = 'Loading packages information from "%s"';
-  SLogLoadingVersionsFile    = 'Loading local versions information from "%s"';
+  SLogLoadingPackagesFile    = 'Loading available packages from "%s"';
+  SLogLoadingStatusFile      = 'Loading local status from "%s"';
+  SLogSavingStatusFile       = 'Saving local status to "%s"';
 
   SDbgFound                  = 'Found';
   SDbgNotFound               = 'Not Found';

utils/fppkg/pkgrepos.pp

@@ -9,9 +9,13 @@ uses
   fprepos;
 
 procedure LoadLocalRepository;
-procedure SaveRepository;
-procedure ListRepository;
-procedure RebuildRepository;
+procedure LoadLocalStatus;
+procedure SaveLocalStatus;
+procedure ListLocalRepository(all:boolean=false);
+
+procedure ListRemoteRepository;
+procedure RebuildRemoteRepository;
+procedure SaveRemoteRepository;
 
 var
   CurrentRepository : TFPRepository;
@@ -26,6 +30,9 @@ uses
   pkgoptions,
   pkgmessages;
 
+{*****************************************************************************
+                           Local Repository
+*****************************************************************************}
 
 procedure LoadLocalRepository;
 var
@@ -47,44 +54,66 @@ begin
           Free;
         end;
     end;
-  // Versions
+end;
+
+
+procedure LoadLocalStatus;
+var
+  S : String;
+begin
   S:=Options.LocalVersionsFile(Options.CurrentCompilerConfig);
-  Log(vDebug,SLogLoadingVersionsFile,[S]);
+  Log(vDebug,SLogLoadingStatusFile,[S]);
   if FileExists(S) then
     CurrentRepository.LoadStatusFromFile(S);
 end;
 
 
-procedure SaveRepository;
+procedure SaveLocalStatus;
 var
-  X : TFPXMLRepositoryHandler;
+  S : String;
 begin
-  // Repository
-  Writeln('Saving repository in packages.xml');
-  X:=TFPXMLRepositoryHandler.Create;
-  With X do
-    try
-      SaveToXml(CurrentRepository,'packages.xml');
-    finally
-      Free;
+  S:=Options.LocalVersionsFile(Options.CurrentCompilerConfig);
+  Log(vDebug,SLogSavingStatusFile,[S]);
+  CurrentRepository.SaveStatusToFile(S);
+end;
+
+
+procedure ListLocalRepository(all:boolean=false);
+var
+  P : TFPPackage;
+  i : integer;
+begin
+  Writeln(Format('%-20s %-12s %-12s',['Name','Installed','Available']));
+  for i:=0 to CurrentRepository.PackageCount-1 do
+    begin
+      P:=CurrentRepository.Packages[i];
+      if all or (P.Version.CompareVersion(P.InstalledVersion)>0) then
+        begin
+          Writeln(Format('%-20s %-12s %-12s',[P.Name,P.InstalledVersion.AsString,P.Version.AsString]));
+        end;
     end;
 end;
 
 
-procedure ListRepository;
+{*****************************************************************************
+                           Remote Repository
+*****************************************************************************}
+
+procedure ListRemoteRepository;
 var
   P : TFPPackage;
   i : integer;
 begin
+  Writeln(Format('%-20s %-12s %-20s',['Name','Available','FileName']));
   for i:=0 to CurrentRepository.PackageCount-1 do
     begin
       P:=CurrentRepository.Packages[i];
-      Writeln(Format('%-20s %-20s',[P.Name,P.FileName]));
+      Writeln(Format('%-20s %-12s %-20s',[P.Name,P.Version.AsString,P.FileName]));
     end;
 end;
 
 
-procedure RebuildRepository;
+procedure RebuildRemoteRepository;
 var
   X : TFPXMLRepositoryHandler;
   i : integer;
@@ -136,5 +165,23 @@ begin
   end;
 end;
 
+
+procedure SaveRemoteRepository;
+var
+  X : TFPXMLRepositoryHandler;
+begin
+  // Repository
+  Writeln('Saving repository in packages.xml');
+  X:=TFPXMLRepositoryHandler.Create;
+  With X do
+    try
+      SaveToXml(CurrentRepository,'packages.xml');
+    finally
+      Free;
+    end;
+end;
+
+
+
 initialization
 end.