embedded: Fix check() for relative paths

diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index c50105ba6fd63dd8d7cd908de82aa935f80f4f89..fe6d685051b516297dc431a86a3fc95ed3fe05b1 100644 (file)
--- 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 61c6c4b9ddc9b7f5cab4b2b5dbb1e8d1f7b44b7d..c6ea643651258cc8ec01465c987fc543216acd97 100644 (file)
--- 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 e6025c96bf2d3892485d2ae609236fcbf619ba38..d94be23e9a7b5ea2394ea9bae978695d666dec17 100644 (file)
--- 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 ());