diff options
| author | Florian Brosch <flo.brosch@gmail.com> | 2014-08-29 14:58:08 +0200 |
|---|---|---|
| committer | Florian Brosch <flo.brosch@gmail.com> | 2014-09-02 19:11:50 +0200 |
| commit | afb7c165c79a7ed483b1871c1fb4601ce07b4918 (patch) | |
| tree | f5ae9f72e7130fe627802cb520f5bc88f9fc732f /src | |
| parent | c0adeabd80460d704d832b12ddc8b694ce4e52ea (diff) | |
| download | vala-afb7c165c79a7ed483b1871c1fb4601ce07b4918.tar.gz | |
embedded: Fix check() for relative paths
Diffstat (limited to 'src')
| -rw-r--r-- | src/libvaladoc/documentation/documentationparser.vala | 4 | ||||
| -rw-r--r-- | src/libvaladoc/documentation/girmetadata.vala | 3 | ||||
| -rw-r--r-- | src/libvaladoc/importer/valadocdocumentationimporter.vala | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala index c50105ba6..fe6d68505 100644 --- a/src/libvaladoc/documentation/documentationparser.vala +++ b/src/libvaladoc/documentation/documentationparser.vala @@ -141,11 +141,11 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator { } public void check (Api.Node element, Comment comment) { - comment.check (_tree, element, element.get_source_file ().get_name (), _reporter, _settings); + comment.check (_tree, element, element.get_source_file ().relative_path, _reporter, _settings); } public void check_wikipage (Api.Package package, WikiPage page) { - page.documentation.check (_tree, package, page.get_filename (), _reporter, _settings); + page.documentation.check (_tree, package, page.path, _reporter, _settings); } public void transform_inheritdoc (Api.Node taglet_owner, Taglets.InheritDoc taglet) { diff --git a/src/libvaladoc/documentation/girmetadata.vala b/src/libvaladoc/documentation/girmetadata.vala index 61c6c4b9d..c6ea64365 100644 --- a/src/libvaladoc/documentation/girmetadata.vala +++ b/src/libvaladoc/documentation/girmetadata.vala @@ -95,7 +95,8 @@ public class Valadoc.GirMetaData : Object { break; case "index_sgml": - this.index_sgml = key_file.get_string ("General", "index_sgml"); + string tmp = key_file.get_string ("General", "index_sgml"); + this.index_sgml = Path.build_filename (Path.get_dirname (metadata_path), tmp); break; case "index_sgml_online": diff --git a/src/libvaladoc/importer/valadocdocumentationimporter.vala b/src/libvaladoc/importer/valadocdocumentationimporter.vala index e6025c96b..d94be23e9 100644 --- a/src/libvaladoc/importer/valadocdocumentationimporter.vala +++ b/src/libvaladoc/importer/valadocdocumentationimporter.vala @@ -158,6 +158,8 @@ public class Valadoc.Importer.ValadocDocumentationImporter : DocumentationImport if (comment != null) { var docu = _doc_parser.parse_comment_str (symbol, comment.str, filename, src_ref.line, src_ref.column); if (docu != null) { + docu.check (tree, symbol, filename, reporter, settings); + if (symbol.documentation == null || insertion_mode == InsertionMode.REPLACE) { if (insertion_mode == InsertionMode.APPEND) { docu.content.insert (0, factory.create_paragraph ()); |