Perform runtime version check of libvala

Fixes https://gitlab.gnome.org/GNOME/vala/issues/88

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index ad292a77792b777a83df24ebe7701594e0574dcb..9a801e36986d26fe98ccff3d133d6a0643a548de 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -373,6 +373,10 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
        public static int ccode_attribute_cache_index = CodeNode.get_attribute_cache_index ();
 
        protected CCodeBaseModule () {
+               if (Vala.get_build_version () != Vala.BUILD_VERSION) {
+                       Report.error (null, "Integrity check failed (libvala %s doesn't match ccodegen %s)".printf (Vala.get_build_version (), Vala.BUILD_VERSION));
+               }
+
                predefined_marshal_set = new HashSet<string> (str_hash, str_equal);
                predefined_marshal_set.add ("VOID:VOID");
                predefined_marshal_set.add ("VOID:BOOLEAN");

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index e5a6a21d11c5d5aaa87a8d1438d6044b1b84ac27..4cc7b2967a136b929b0fbe51f5a9e7cbeb360ffb 100644 (file)
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -622,6 +622,11 @@ class Vala.Compiler {
                // initialize locale
                Intl.setlocale (LocaleCategory.ALL, "");
 
+               if (Vala.get_build_version () != Vala.BUILD_VERSION) {
+                       stderr.printf ("Integrity check failed (libvala %s doesn't match valac %s)\n", Vala.get_build_version (), Vala.BUILD_VERSION);
+                       return 1;
+               }
+
                if (Path.get_basename (args[0]) == "vala" || Path.get_basename (args[0]) == "vala" + Config.PACKAGE_SUFFIX) {
                        return run_source (args);
                }

diff --git a/valadoc/valadoc.vala b/valadoc/valadoc.vala
index 175bbdd9d7cd7f45d9a67100c72205355a7f5133..68d8b8fa4ace1ff9beed13c9c0773bad55d76842 100644 (file)
--- a/valadoc/valadoc.vala
+++ b/valadoc/valadoc.vala
@@ -398,6 +398,11 @@ public class ValaDoc : Object {
        static int main (string[] args) {
                Intl.setlocale (LocaleCategory.ALL, "");
 
+               if (Vala.get_build_version () != Vala.BUILD_VERSION) {
+                       stderr.printf ("Integrity check failed (libvala %s doesn't match valadoc %s)\n", Vala.get_build_version (), Vala.BUILD_VERSION);
+                       return 1;
+               }
+
                try {
                        var opt_context = new OptionContext ("- Vala Documentation Tool");
                        opt_context.set_help_enabled (true);

diff --git a/vapigen/valavapigen.vala b/vapigen/valavapigen.vala
index 7eb4fc0444d40962b1bdca67dd37cb61dbfd18fa..7bd37be85f09480017b19d62c19752dff1da0b80 100644 (file)
--- a/vapigen/valavapigen.vala
+++ b/vapigen/valavapigen.vala
@@ -211,6 +211,12 @@ class Vala.VAPIGen {
        
        static int main (string[] args) {
                Intl.setlocale (LocaleCategory.ALL, "");
+
+               if (Vala.get_build_version () != Vala.BUILD_VERSION) {
+                       stderr.printf ("Integrity check failed (libvala %s doesn't match vapigen %s)\n", Vala.get_build_version (), Vala.BUILD_VERSION);
+                       return 1;
+               }
+
                try {
                        var opt_context = new OptionContext ("- Vala API Generator");
                        opt_context.set_help_enabled (true);