Browse Source

Add listing of unremoved files during clean with -d (vlDebug) option

git-svn-id: trunk@40389 -
pierre 6 years ago
parent
commit
8db29007ff
1 changed files with 12 additions and 0 deletions
  1. 12 0
      packages/fpmkunit/src/fpmkunit.pp

+ 12 - 0
packages/fpmkunit/src/fpmkunit.pp

@@ -7994,6 +7994,8 @@ procedure TBuildEngine.Clean(APackage: TPackage; ACPU: TCPU; AOS: TOS);
 Var
 Var
   List : TStringList;
   List : TStringList;
   DirectoryList : TStringList;
   DirectoryList : TStringList;
+  RemainingList : TStrings;
+  i : longint;
 begin
 begin
   List:=TStringList.Create;
   List:=TStringList.Create;
   try
   try
@@ -8022,6 +8024,11 @@ begin
           begin
           begin
             Installer.Log(vlWarning,Format(SWarnRemovedNonEmptyDirectory,[APackage.Directory+APackage.GetBinOutputDir(ACPU,AOS)]));
             Installer.Log(vlWarning,Format(SWarnRemovedNonEmptyDirectory,[APackage.Directory+APackage.GetBinOutputDir(ACPU,AOS)]));
             DirectoryList.Add(APackage.GetBinOutputDir(ACPU,AOS));
             DirectoryList.Add(APackage.GetBinOutputDir(ACPU,AOS));
+            RemainingList := TStringList.Create;
+            SearchFiles(AllFilesMask, APackage.GetBinOutputDir(ACPU,AOS), true, RemainingList);
+            for i:=0 to RemainingList.Count-1 do
+              Installer.log(vlDebug,format('File %s still present',[RemainingList[i]]));
+            RemainingList.Free;
             CmdRemoveTrees(DirectoryList);
             CmdRemoveTrees(DirectoryList);
             DirectoryList.Clear;
             DirectoryList.Clear;
           end;
           end;
@@ -8030,6 +8037,11 @@ begin
           begin
           begin
             Installer.Log(vlWarning,Format(SWarnRemovedNonEmptyDirectory,[APackage.Directory+APackage.GetUnitsOutputDir(ACPU,AOS)]));
             Installer.Log(vlWarning,Format(SWarnRemovedNonEmptyDirectory,[APackage.Directory+APackage.GetUnitsOutputDir(ACPU,AOS)]));
             DirectoryList.Add(APackage.GetUnitsOutputDir(ACPU,AOS));
             DirectoryList.Add(APackage.GetUnitsOutputDir(ACPU,AOS));
+            RemainingList := TStringList.Create;
+            SearchFiles(AllFilesMask, APackage.GetUnitsOutputDir(ACPU,AOS), true, RemainingList);
+            for i:=0 to RemainingList.Count-1 do
+              Installer.log(vlDebug,format('File %s still present',[RemainingList[i]]));
+            RemainingList.Free;
             CmdRemoveTrees(DirectoryList);
             CmdRemoveTrees(DirectoryList);
             DirectoryList.Clear;
             DirectoryList.Clear;
           end;
           end;