paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-19 15:39:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazbuild: verbosity options

Browse Source 
git-svn-id: trunk@39452 -
This commit is contained in:
mattias 2012-12-06 15:27:29 +00:00
parent f72c960927
commit 60fdc1bfd9
1 changed files with 91 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
ide/lazbuild.lpr
View File

@ -64,6 +64,7 @@ type
FSkipDependencies: boolean; FSkipDependencies: boolean;
fInitialized: boolean; fInitialized: boolean;
fInitResult: boolean; fInitResult: boolean;
FVerbosity: integer;
fWidgetsetOverride: String; fWidgetsetOverride: String;
// external tools // external tools
procedure OnExtToolFreeOutputFilter({%H-}OutputFilter: TOutputFilter; procedure OnExtToolFreeOutputFilter({%H-}OutputFilter: TOutputFilter;
@ -164,6 +165,8 @@ type
property CompilerOverride: String read fCompilerOverride write fCompilerOverride; property CompilerOverride: String read fCompilerOverride write fCompilerOverride;
property LazarusDirOverride: String read fLazarusDirOverride write fLazarusDirOverride; property LazarusDirOverride: String read fLazarusDirOverride write fLazarusDirOverride;
property BuildModeOverride: String read FBuildModeOverride write FBuildModeOverride; property BuildModeOverride: String read FBuildModeOverride write FBuildModeOverride;
property Verbosity: integer read FVerbosity write FVerbosity; // 0=normal, -1=quiet, 1=verbose, 2=very verbose
end; end;
var var
@ -473,23 +476,26 @@ begin
if i<0 then if i<0 then
begin begin
debugln(['ERROR: IDE build mode "'+BuildModeOverride+'" not found']); debugln(['ERROR: IDE build mode "'+BuildModeOverride+'" not found']);
debugln; if Verbosity>=-2 then begin
debugln('Available IDE build modes:'); debugln;
for i:=0 to BuildLazProfiles.Count-1 do debugln('Available IDE build modes:');
begin for i:=0 to BuildLazProfiles.Count-1 do
if BuildLazProfiles[i]=CurProf then begin
dbgout('* ') if BuildLazProfiles[i]=CurProf then
else dbgout('* ')
dbgout(' '); else
debugln(BuildLazProfiles[i].Name); dbgout(' ');
debugln(BuildLazProfiles[i].Name);
end;
debugln;
end; end;
debugln;
Halt(ErrorBuildFailed); Halt(ErrorBuildFailed);
end; end;
CurProf:=BuildLazProfiles[i]; CurProf:=BuildLazProfiles[i];
BuildLazProfiles.CurrentIndex:=i; BuildLazProfiles.CurrentIndex:=i;
end; end;
debugln(['Building Lazarus IDE with profile "',CurProf.Name,'"']); if Verbosity>=0 then
debugln(['Building Lazarus IDE with profile "',CurProf.Name,'"']);
if (Length(OSOverride) <> 0) then if (Length(OSOverride) <> 0) then
CurProf.TargetOS:=OSOverride; CurProf.TargetOS:=OSOverride;
@ -520,7 +526,8 @@ begin
TargetDir:=CurProf.TargetDirectory; TargetDir:=CurProf.TargetDirectory;
IDEMacros.SubstituteMacros(TargetDir); IDEMacros.SubstituteMacros(TargetDir);
if not ForceDirectory(TargetDir) then begin if not ForceDirectory(TargetDir) then begin
DebugLn('TLazBuildApplication.BuildLazarusIDE: failed creating IDE target directory "',TargetDir,'"'); if Verbosity>=-1 then
DebugLn('WARNING: failed creating IDE target directory "',TargetDir,'" (TLazBuildApplication.BuildLazarusIDE)');
exit; exit;
end; end;
@ -534,7 +541,8 @@ begin
Flags+[blfDontBuild], Flags+[blfDontBuild],
ProfileChanged); ProfileChanged);
if CurResult<>mrOk then begin if CurResult<>mrOk then begin
DebugLn('TLazBuildApplication.BuildLazarusIDE: Clean all failed.'); if Verbosity>=-1 then
DebugLn('TLazBuildApplication.BuildLazarusIDE: Clean all failed.');
exit; exit;
end; end;
end; end;
@ -542,14 +550,16 @@ begin
// save configs for 'make' // save configs for 'make'
CurResult:=PackageGraph.SaveAutoInstallConfig; CurResult:=PackageGraph.SaveAutoInstallConfig;
if CurResult<>mrOk then begin if CurResult<>mrOk then begin
DebugLn('TLazBuildApplication.BuildLazarusIDE: failed saving IDE make config files.'); if Verbosity>=-1 then
DebugLn('TLazBuildApplication.BuildLazarusIDE: failed saving IDE make config files.');
exit; exit;
end; end;
// compile auto install static packages // compile auto install static packages
if not CompileAutoInstallPackages(BuildLazProfiles.Current.IdeBuildMode<>bmBuild) if not CompileAutoInstallPackages(BuildLazProfiles.Current.IdeBuildMode<>bmBuild)
then begin then begin
DebugLn('TLazBuildApplication.BuildLazarusIDE: Compile AutoInstall Packages failed.'); if Verbosity>=-1 then
DebugLn('TLazBuildApplication.BuildLazarusIDE: Compile AutoInstall Packages failed.');
exit; exit;
end; end;
@ -561,7 +571,8 @@ begin
CurResult:=SaveIDEMakeOptions(BuildLazProfiles.Current,GlobalMacroList, CurResult:=SaveIDEMakeOptions(BuildLazProfiles.Current,GlobalMacroList,
PkgOptions,Flags+[blfBackupOldExe]); PkgOptions,Flags+[blfBackupOldExe]);
if CurResult<>mrOk then begin if CurResult<>mrOk then begin
DebugLn('TLazBuildApplication.BuildLazarusIDE: failed saving idemake.cfg'); if Verbosity>=-1 then
DebugLn('TLazBuildApplication.BuildLazarusIDE: failed saving idemake.cfg');
exit; exit;
end; end;
@ -573,7 +584,8 @@ begin
Flags+[blfUseMakeIDECfg,blfOnlyIDE], Flags+[blfUseMakeIDECfg,blfOnlyIDE],
ProfileChanged); ProfileChanged);
if CurResult<>mrOk then begin if CurResult<>mrOk then begin
DebugLn('TLazBuildApplication.BuildLazarusIDE: Building IDE failed.'); if Verbosity>=-1 then
DebugLn('TLazBuildApplication.BuildLazarusIDE: Building IDE failed.');
exit; exit;
end; end;
@ -721,22 +733,24 @@ begin
if NewBuildMode=nil then if NewBuildMode=nil then
begin begin
debugln([Format(lisERRORInvalidBuildMode, [BuildModeOverride])]); debugln([Format(lisERRORInvalidBuildMode, [BuildModeOverride])]);
debugln; if Verbosity>=0 then begin
if Project1.BuildModes.Count>1 then debugln;
begin if Project1.BuildModes.Count>1 then
debugln(lisAvailableProjectBuildModes);
for i:=0 to Project1.BuildModes.Count-1 do
begin begin
if Project1.BuildModes[i]=Project1.ActiveBuildMode then debugln(lisAvailableProjectBuildModes);
dbgout('* ') for i:=0 to Project1.BuildModes.Count-1 do
else begin
dbgout(' '); if Project1.BuildModes[i]=Project1.ActiveBuildMode then
debugln(Project1.BuildModes[i].Name); dbgout('* ')
else
dbgout(' ');
debugln(Project1.BuildModes[i].Name);
end;
end else begin
debugln(lisThisProjectHasOnlyTheDefaultBuildMode);
end; end;
end else begin debugln;
debugln(lisThisProjectHasOnlyTheDefaultBuildMode);
end; end;
debugln;
Halt(ErrorBuildFailed); Halt(ErrorBuildFailed);
end; end;
Project1.ActiveBuildMode:=NewBuildMode; Project1.ActiveBuildMode:=NewBuildMode;
@ -801,7 +815,10 @@ begin
// regenerate resources // regenerate resources
if not Project1.ProjResources.Regenerate(SrcFileName, False, True, '') then if not Project1.ProjResources.Regenerate(SrcFileName, False, True, '') then
DebugLn('TMainIDE.DoSaveProject Project1.Resources.Regenerate failed'); begin
if Verbosity>=-1 then
DebugLn('TMainIDE.DoSaveProject Project1.Resources.Regenerate failed');
end;
// get compiler parameters // get compiler parameters
if CompilerOverride <> '' then if CompilerOverride <> '' then
@ -951,7 +968,8 @@ begin
end; end;
PackageName:=Package.Name; PackageName:=Package.Name;
// set it as (static) autoinstall: select for installation // set it as (static) autoinstall: select for installation
debugln(['adding package "'+PkgFilename+'" to install list of IDE']); if Verbosity>=0 then
debugln(['adding package "'+PkgFilename+'" to install list of IDE']);
if MiscellaneousOptions.BuildLazProfiles.StaticAutoInstallPackages.IndexOf(PackageName)<0 then if MiscellaneousOptions.BuildLazProfiles.StaticAutoInstallPackages.IndexOf(PackageName)<0 then
MiscellaneousOptions.BuildLazProfiles.StaticAutoInstallPackages.Add(PackageName); MiscellaneousOptions.BuildLazProfiles.StaticAutoInstallPackages.Add(PackageName);
end; end;
@ -972,7 +990,8 @@ begin
fInitResult:=false; fInitResult:=false;
fInitialized:=true; fInitialized:=true;
debugln(['primary config path: ',GetPrimaryConfigPath]); if Verbosity>=0 then
debugln(['primary config path: ',GetPrimaryConfigPath]);
CreatePrimaryConfigPath; CreatePrimaryConfigPath;
MainBuildBoss:=TBuildManager.Create(nil); MainBuildBoss:=TBuildManager.Create(nil);
@ -1010,8 +1029,9 @@ begin
fLazarusDirInCfg:=LazarusDirectory; fLazarusDirInCfg:=LazarusDirectory;
if Application.HasOption('language') then begin if Application.HasOption('language') then begin
debugln('Note: overriding language with command line: ', if Verbosity>=0 then
Application.GetOptionValue('language')); debugln('Note: overriding language with command line: ',
Application.GetOptionValue('language'));
EnvironmentOptions.LanguageID:=Application.GetOptionValue('language'); EnvironmentOptions.LanguageID:=Application.GetOptionValue('language');
end; end;
TranslateResourceStrings(EnvironmentOptions.GetParsedLazarusDirectory, TranslateResourceStrings(EnvironmentOptions.GetParsedLazarusDirectory,
@ -1028,7 +1048,8 @@ begin
+SetDirSeparators('packager/registration/fcl.lpk')) +SetDirSeparators('packager/registration/fcl.lpk'))
then begin then begin
CheckLazarusDirectoryQuality(EnvironmentOptions.GetParsedLazarusDirectory,Note); CheckLazarusDirectoryQuality(EnvironmentOptions.GetParsedLazarusDirectory,Note);
debugln(['Error: invalid Lazarus directory "'+EnvironmentOptions.LazarusDirectory+'": '+Note]); if Verbosity>=-1 then
debugln(['Error: invalid Lazarus directory "'+EnvironmentOptions.LazarusDirectory+'": '+Note]);
Terminate; Terminate;
end; end;
end; end;
@ -1095,12 +1116,15 @@ begin
if (not StoreLazDir) and (not StoreCompPath) then exit; if (not StoreLazDir) and (not StoreCompPath) then exit;
try try
dbgout('storing'); if Verbosity>=-1 then
if StoreLazDir then begin
dbgout(' Lazarus directory "',EnvironmentOptions.LazarusDirectory,'"'); dbgout('storing');
if StoreCompPath then if StoreLazDir then
dbgout(' Compiler path "',EnvironmentOptions.CompilerFilename,'"'); dbgout(' Lazarus directory "',EnvironmentOptions.LazarusDirectory,'"');
debugln(' in "',EnvironmentOptions.Filename,'"'); if StoreCompPath then
dbgout(' Compiler path "',EnvironmentOptions.CompilerFilename,'"');
debugln(' in "',EnvironmentOptions.Filename,'"');
end;
Cfg:=TXMLConfig.Create(EnvironmentOptions.Filename); Cfg:=TXMLConfig.Create(EnvironmentOptions.Filename);
try try
if StoreLazDir then if StoreLazDir then
@ -1221,7 +1245,8 @@ begin
begin begin
// Required argument // Required argument
NeedArg:=true; NeedArg:=true;
debugln(['P ',P,' J ',J,' ',O[J],' ',l,' Havearg ',HaveArg]); if Verbosity>=-1 then
debugln(['P ',P,' J ',J,' ',O[J],' ',l,' Havearg ',HaveArg]);
If ((P+1)=Length(ShortOptions)) or (Shortoptions[P+2]<>':') Then If ((P+1)=Length(ShortOptions)) or (Shortoptions[P+2]<>':') Then
If (J<L) or not haveArg then // Must be last in multi-opt !! If (J<L) or not haveArg then // Must be last in multi-opt !!
Result:=Format(lisErrOptionNeeded,[I,O[J]]); Result:=Format(lisErrOptionNeeded,[I,O[J]]);
@ -1288,7 +1313,8 @@ begin
// except packages to be added the IDE install list. // except packages to be added the IDE install list.
for i:=0 to Files.Count-1 do begin for i:=0 to Files.Count-1 do begin
if not BuildFile(Files[i]) then begin if not BuildFile(Files[i]) then begin
debugln('Failed building ',Files[i]); if Verbosity>=-1 then
debugln('Failed building ',Files[i]);
ExitCode := ErrorBuildFailed; ExitCode := ErrorBuildFailed;
exit; exit;
end; end;
@ -1297,7 +1323,8 @@ begin
// Add user-requested packages to IDE install list: // Add user-requested packages to IDE install list:
if AddPackage then begin if AddPackage then begin
if not AddPackagesToInstallList(Files) then begin if not AddPackagesToInstallList(Files) then begin
debugln('Failed adding package(s) ',Files.Text); if Verbosity>=-1 then
debugln('Failed adding package(s) ',Files.Text);
ExitCode := ErrorBuildFailed; ExitCode := ErrorBuildFailed;
exit; exit;
end; end;
@ -1305,7 +1332,8 @@ begin
if BuildIDE then begin if BuildIDE then begin
if not BuildLazarusIDE then begin if not BuildLazarusIDE then begin
debugln('Failed building Lazarus IDE'); if Verbosity>=-1 then
debugln('Failed building Lazarus IDE');
ExitCode := ErrorBuildFailed; ExitCode := ErrorBuildFailed;
exit; exit;
end; end;
@ -1318,6 +1346,8 @@ var
NonOptions: TStringList; NonOptions: TStringList;
ErrorMsg: String; ErrorMsg: String;
LongOptions: TStringList; LongOptions: TStringList;
i: Integer;
p: String;
begin begin
Result:=false; Result:=false;
if (ParamCount<=0) if (ParamCount<=0)
@ -1337,10 +1367,22 @@ begin
writeln(VersionStr); writeln(VersionStr);
exit; exit;
end; end;
// verbosity
for i:=1 to ParamCount do begin
p:=ParamStr(i);
if p='--verbose' then
inc(fVerbosity)
else if (p='-q') or (p='quiet=') then
dec(fVerbosity);
end;
Options:=TStringList.Create; Options:=TStringList.Create;
NonOptions:=TStringList.Create; NonOptions:=TStringList.Create;
LongOptions:=TStringList.Create; LongOptions:=TStringList.Create;
try try
LongOptions.Add('quiet');
LongOptions.Add('verbose');
LongOptions.Add('primary-config-path:'); LongOptions.Add('primary-config-path:');
LongOptions.Add('pcp:'); LongOptions.Add('pcp:');
LongOptions.Add('secondary-config-path:'); LongOptions.Add('secondary-config-path:');
@ -1361,7 +1403,7 @@ begin
LongOptions.Add('compiler:'); LongOptions.Add('compiler:');
LongOptions.Add('lazarusdir:'); LongOptions.Add('lazarusdir:');
LongOptions.Add('create-makefile'); LongOptions.Add('create-makefile');
ErrorMsg:=RepairedCheckOptions('lBrd',LongOptions,Options,NonOptions); ErrorMsg:=RepairedCheckOptions('lBrdq',LongOptions,Options,NonOptions);
if ErrorMsg<>'' then begin if ErrorMsg<>'' then begin
writeln(ErrorMsg); writeln(ErrorMsg);
writeln(''); writeln('');
@ -1471,6 +1513,8 @@ begin
writeln('-d or --skip-dependencies ', UTF8ToConsole(lisDoNotCompileDependencies)); writeln('-d or --skip-dependencies ', UTF8ToConsole(lisDoNotCompileDependencies));
writeln('--build-ide=<options> ', UTF8ToConsole(lisBuildIDEWithPackages)); writeln('--build-ide=<options> ', UTF8ToConsole(lisBuildIDEWithPackages));
writeln('-v or --version ', UTF8ToConsole(lisShowVersionAndExit)); writeln('-v or --version ', UTF8ToConsole(lisShowVersionAndExit));
writeln('-q or --quiet ', UTF8ToConsole('be less verbose, can be given multiple times'));
writeln('--verbose ', UTF8ToConsole('be more verbose, can be given multiple times'));
writeln(''); writeln('');
writeln('--add-package'); writeln('--add-package');