diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-09-16 16:24:12 +0200 |
|---|---|---|
| committer | Daniel Elstner <danielk@openismus.com> | 2009-09-16 16:24:12 +0200 |
| commit | 3e5ef11f6e026cf40102c67bb983ee1813032fc8 (patch) | |
| tree | 7d7cc776dd5442dccc756c5800b93a340c6f11e9 | |
| parent | dceb8a38369fc14336165cebb84fb5ecb585010e (diff) | |
| parent | c5383f584cc2e52cdda95a65e40f3ab62ccdc8d0 (diff) | |
| download | glibmm-2.20.2.tar.gz | |
Merge branch 'master' into glibmm-2-20glibmm-2.20.2
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tools/pm/DocsParser.pm | 17 |
2 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,11 @@ +2009-09-17 Daniel Elstner <danielk@openismus.com> + + Do not complain about missing docs_override.xml + + * tools/pm/DocsParser.pm (read_defs): Print error messages to + standard error. Do not complain if the docs_override.xml file + is missing, since it is no longer necessary. + 2009-09-16 Daniel Elstner <danielk@openismus.com> Increment version to 2.20.2 and update news diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm index b4bb5c9e..92e6a2a1 100644 --- a/tools/pm/DocsParser.pm +++ b/tools/pm/DocsParser.pm @@ -78,7 +78,7 @@ sub read_defs($$$) $DocsParser::CurrentFile = "$path/$filename"; if ( ! -r $DocsParser::CurrentFile) { - print "DocsParser.pm: Warning: Can't read file \"" . $DocsParser::CurrentFile . "\".\n"; + print STDERR "DocsParser.pm: Warning: Can't read file \"" . $DocsParser::CurrentFile . "\".\n"; return; } # Parse @@ -86,23 +86,22 @@ sub read_defs($$$) if( $@ ) { $@ =~ s/at \/.*?$//s; - print "\nError in \"" . $DocsParser::CurrentFile . "\":$@\n"; + print STDERR "\nError in \"" . $DocsParser::CurrentFile . "\":$@\n"; return; } # C++ overide documentation: - $DocsParser::CurrentFile = "$path/$filename_override"; - if ( ! -r $DocsParser::CurrentFile) - { - print "DocsParser.pm: Warning: Can't read file \"" . $DocsParser::CurrentFile . "\".\n"; - return; - } + $DocsParser::CurrentFile = $path . '/' . $filename_override; + + # It is not an error if the documentation override file does not exist. + return unless (-r $DocsParser::CurrentFile); + # Parse eval { $objParser->parsefile($DocsParser::CurrentFile) }; if( $@ ) { $@ =~ s/at \/.*?$//s; - print "\nError in \"" . $DocsParser::CurrentFile . "\":$@"; + print STDERR "\nError in \"" . $DocsParser::CurrentFile . "\":$@"; return; } } |