From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 29 Apr 2019 14:48:55 +0000 (+0200)
Subject: girwriter: Infer gir_namespace/version from target GIR filename
X-Git-Tag: 0.51.1~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08561731e0677ad961ec4331ec4f22eb0d7842fd;p=thirdparty%2Fvala.git

girwriter: Infer gir_namespace/version from target GIR filename

See https://gitlab.gnome.org/GNOME/vala/issues/606
---

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index eea87bc3e..14f0819a0 100644
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -337,6 +337,16 @@ public class Vala.GIRWriter : CodeVisitor {
 			return;
 		}
 
+		// Use given gir_namespace and gir_version for our top-level namespace
+		var old_gir_namespace = ns.get_attribute_string ("CCode", "gir_namespace");
+		var old_gir_version = ns.get_attribute_string ("CCode", "gir_version");
+		if ((old_gir_namespace != null && old_gir_namespace != gir_namespace)
+		    || (old_gir_version != null && old_gir_version != gir_version)) {
+			Report.warning (ns.source_reference, "Replace conflicting CCode.gir_* attributes for namespace `%s'".printf (ns.name));
+		}
+		ns.set_attribute_string ("CCode", "gir_namespace", gir_namespace);
+		ns.set_attribute_string ("CCode", "gir_version", gir_version);
+
 		write_c_includes (ns);
 
 		write_indent ();