1. reiniero
  2. fpcup

Commits

reiniero  committed 5a53cd6

cosmetic: some more installer loggging

  • Participants
  • Parent commits 9d51bb9
  • Branches default

Comments (0)

Files changed (2)

File installeruniversal.pas

View file
   TUniversalInstaller = class(TInstaller)
   private
     FBinPath:string;
-    InitDone:boolean;
-  protected
     //FPC base directory - directory where FPC is (to be) installed:
     FFPCDir:string;
     //Lazarus base directory - directory where Lazarus is (to be) installed:
     FLazarusDir:string;
     //Directory where configuration for Lazarus is stored:
     FLazarusPrimaryConfigPath:string;
+    InitDone:boolean;
+  protected
     // Scans for and adds all packages specified in a (module's) stringlist with commands:
     function AddPackages(sl:TStringList): boolean;
     // Filters (a module's) sl stringlist and creates all <Directive> installers.
     try
       //todo: make installer module-level; split out config from build part; would also require fixed svn dirs etc
       Installer.FPCDir:=FPCDir;
+      Installer.Verbose:=FVerbose;
       Installer.LazarusDir:=FLazarusDir;
       Installer.LazarusPrimaryConfigPath:=FLazarusPrimaryConfigPath;
       Installer.BuildModuleCustom(ModuleName);

File wininstaller.pas

View file
 
 implementation
 
+const
+  ClassName = 'TWinInstaller';
 { TWinInstaller }
 
 procedure TWinInstaller.FindInno;
   FSVNClient.Verbose:=FVerbose;
 
   //checkout fpc build sources svn checkout
+  if FVerbose then WritelnLog(ClassName+': Getting FPC build repository',true);
   FFPCBuildDir:=GetTempDir(false)+'fpcbuild';
   ForceDirectory(FFPCBuildDir);
   FSVNClient.LocalRepository:=FFPCBuildDir;
   FSVNClient.CheckOutOrUpdate;
 
   //checkout laz binaries
+  if FVerbose then WritelnLog(ClassName+': Getting Lazarus binaries repository',true);
   FLazarusBinaryDir:=GetTempDir(false)+'lazbin';
   ForceDirectory(FLazarusBinaryDir);
   FSVNClient.LocalRepository:=FLazarusBinaryDir;
   ProcessEx.Parameters.Add(''); //IDE_WIDGETSET
   ProcessEx.Parameters.Add(''); //PATCHFILE
   ProcessEx.Parameters.Add(HelpFileDir); //CHMHELPFILES
+  if FVerbose then WritelnLog(ClassName+': Running '+ProcessEx.Executable,true);
   ProcessEx.Execute;
 
   //change directory to build dir