Browse Source

* Merging revisions r43562,r43563,r43564 from trunk:
------------------------------------------------------------------------
r43562 | michael | 2019-11-23 09:03:12 +0100 (Sat, 23 Nov 2019) | 1 line

* Fix bug ID #0036335: console pops up when getting compiler info
------------------------------------------------------------------------
r43563 | michael | 2019-11-23 14:34:45 +0100 (Sat, 23 Nov 2019) | 1 line

* Report error with correct exit code
------------------------------------------------------------------------
r43564 | michael | 2019-11-23 14:40:49 +0100 (Sat, 23 Nov 2019) | 1 line

* Show --stop-on-parser-error in help
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43723 -

michael 5 years ago
parent
commit
aa412f290b
3 changed files with 6 additions and 0 deletions
  1. 1 0
      packages/fppkg/src/pkgglobals.pp
  2. 2 0
      utils/fpdoc/dglobals.pp
  3. 3 0
      utils/fpdoc/fpdoc.pp

+ 1 - 0
packages/fppkg/src/pkgglobals.pp

@@ -366,6 +366,7 @@ begin
 {$ELSE USE_SHELL}
   S:=TProcess.Create(Nil);
   S.Commandline:=ACompiler+' '+AOptions;
+  S.ShowWindow:=swoHIDE;
   S.Options:=[poUsePipes];
   S.execute;
   Count:=s.output.read(buf,BufSize);

+ 2 - 0
utils/fpdoc/dglobals.pp

@@ -169,6 +169,8 @@ resourcestring
   SUsageOption190  = '                  e.g. --package=fcl';
   SUsageOption200  = '--project=file    Use file as project file';
   SUsageOption210  = '--show-private    Show private methods.';
+  SUsageOption215  = '--stop-on-parser-error';
+  SUsageOption215A = '                  Stop when a parser error occurs. Default is to ignore parser errors.';
   SUsageOption220  = '--warn-no-node    Warn if no documentation node was found.';
   SUsageOption230  = '--mo-dir=dir      Set directory where language files reside to dir';
   SUsageOption240  = '--parse-impl      (Experimental) try to parse implementation too';

+ 3 - 0
utils/fpdoc/fpdoc.pp

@@ -98,6 +98,8 @@ begin
   Writeln(SUsageOption190);
   Writeln(SUsageOption200);
   Writeln(SUsageOption210);
+  Writeln(SUsageOption215);
+  Writeln(SUsageOption215A);
   Writeln(SUsageOption220);
   Writeln(SUsageOption230);
   Writeln(SUsageOption240);
@@ -392,6 +394,7 @@ end;
 Procedure TFPDocApplication.DoRun;
 
 begin
+   ExceptionExitCode:=1;
   try
   {$IFDEF Unix}
     gettext.TranslateResourceStrings('/usr/local/share/locale/%s/LC_MESSAGES/fpdoc.mo');