diff --git a/ide/findreplacedialog.pp b/ide/findreplacedialog.pp index 2265b5446a..2a126631fb 100644 --- a/ide/findreplacedialog.pp +++ b/ide/findreplacedialog.pp @@ -395,7 +395,7 @@ procedure TLazFindReplaceDialog.SetComboBoxText(AComboBox:TComboBox; var a:integer; begin a:=AComboBox.Items.IndexOf(AText); - //writeln('TLazFindReplaceDialog.SetComboBoxText ',AText,' ',a); + //debugln('TLazFindReplaceDialog.SetComboBoxText ',AText,' ',a); if a>=0 then AComboBox.ItemIndex:=a else begin diff --git a/tools/lazres.lpi b/tools/lazres.lpi index cd2b6abeaa..265d78d82c 100644 --- a/tools/lazres.lpi +++ b/tools/lazres.lpi @@ -1,7 +1,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -46,12 +46,10 @@ - - + - - + @@ -60,7 +58,7 @@ - + diff --git a/tools/svn2revisioninc.lpi b/tools/svn2revisioninc.lpi index 9c90399cf9..16a2211bc2 100644 --- a/tools/svn2revisioninc.lpi +++ b/tools/svn2revisioninc.lpi @@ -2,7 +2,7 @@ - + @@ -38,10 +38,9 @@ - + - diff --git a/tools/svn2revisioninc.pas b/tools/svn2revisioninc.pas index b0a190a37d..25d651a1b3 100644 --- a/tools/svn2revisioninc.pas +++ b/tools/svn2revisioninc.pas @@ -46,7 +46,7 @@ program Svn2RevisionInc; {$mode objfpc}{$H+} uses - Classes, CustApp, SysUtils, Process, FileUtil, Dom, XmlRead, GetOpts; + Classes, CustApp, SysUtils, Process, LCLProc, FileUtil, Dom, XmlRead, GetOpts; type @@ -225,7 +225,7 @@ begin writeln(RevisionIncText, RevisionIncComment); writeln(RevisionIncText, ConstStart, RevisionStr, ''';'); CloseFile(RevisionIncText); - writeln(format('Created %s for revision: %s', + debugln(format('Created %s for revision: %s', [RevisionIncFileName, RevisionStr])); end; @@ -235,28 +235,28 @@ procedure TSvn2RevisionApplication.ShowHelp; Result := ChangeFileExt(ExtractFileName(FileName), ''); end; begin - writeln; - writeln(ParamStrUTF8(0)); - writeln; - writeln(ExtractFileBaseName(ParamStrUTF8(0)), ' [Options]'); - writeln('or'); - writeln(ExtractFileBaseName(ParamStrUTF8(0)), ' [Options] '); - writeln('or'); - writeln(ExtractFileBaseName(ParamStrUTF8(0)), ' [Options] '); - writeln; - writeln('Options:'); - writeln(' --o Output file'); - writeln(' --c= Name of constant (default RevisionStr)'); - writeln(' --s write revision to stdout, do not create inc file'); - writeln(' --v Be more verbose'); - writeln(' --h This help screen'); - writeln; - writeln('Note: default current directory'); - writeln(' default revision.inc'); - writeln(' --o overrides '); - writeln; - writeln(' 1st switchless parameter = '); - writeln(' 2nd switchless parameter = '); + debugln; + debugln(ParamStrUTF8(0)); + debugln; + debugln(ExtractFileBaseName(ParamStrUTF8(0)), ' [Options]'); + debugln('or'); + debugln(ExtractFileBaseName(ParamStrUTF8(0)), ' [Options] '); + debugln('or'); + debugln(ExtractFileBaseName(ParamStrUTF8(0)), ' [Options] '); + debugln; + debugln('Options:'); + debugln(' --o Output file'); + debugln(' --c= Name of constant (default RevisionStr)'); + debugln(' --s write revision to stdout, do not create inc file'); + debugln(' --v Be more verbose'); + debugln(' --h This help screen'); + debugln; + debugln('Note: default current directory'); + debugln(' default revision.inc'); + debugln(' --o overrides '); + debugln; + debugln(' 1st switchless parameter = '); + debugln(' 2nd switchless parameter = '); halt(1); end; @@ -312,19 +312,19 @@ begin //checks if not DirectoryExistsUTF8(SourceDirectory) then begin - writeln('Error: Source directory "', SourceDirectory, '" doesn''t exist.'); + debugln('Error: Source directory "', SourceDirectory, '" doesn''t exist.'); exit; end; RevisionIncDirName:=ExtractFilePath(ExpandFileNameUTF8(RevisionIncFileName)); if (not UseStdOut) and (not DirectoryExistsUTF8(RevisionIncDirName)) then begin - writeln('Error: Target Directory "', RevisionIncDirName, '" doesn''t exist.'); + debugln('Error: Target Directory "', RevisionIncDirName, '" doesn''t exist.'); exit; end; if ConstName[1] in ['0'..'9'] then begin - writeln('Error: Invalid constant name ', ConstName, '.'); + debugln('Error: Invalid constant name ', ConstName, '.'); exit; end; @@ -347,7 +347,7 @@ end; procedure TSvn2RevisionApplication.Show(msg: string); begin if Verbose then - Writeln(msg); + debugln(msg); end; procedure TSvn2RevisionApplication.Run; @@ -359,7 +359,7 @@ begin if UseStdOut then begin if FindRevision then - writeln(RevisionStr); + debugln(RevisionStr); end else if FindRevision or not IsValidRevisionInc then WriteRevisionInc;