Use dedicated version api of libvala internally as well

diff --git a/Makefile.am b/Makefile.am
index e5dc0cc971580c2b0de1770f0b8c575dca6d422e..508c6618f601de9f4339cb7d71eeabc5bced029e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,11 +52,6 @@ coverage-report: coverage
        genhtml --title "@PACKAGE_STRING@" --output-directory $(top_builddir)/coverage $(top_builddir)/lcov.info
 #endif
 
-all: version.h
-
-version.h: $(top_srcdir)/.version
-       echo '#define BUILD_VERSION "'`cat $(top_srcdir)/.version`'"' > $@-t && mv $@-t $@
-
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version: gen-version
        @true
@@ -94,5 +89,3 @@ EXTRA_DIST = \
        build-aux/git-version-gen \
        build-aux/gitlog-to-changelog \
        $(NULL)
-
-DISTCLEANFILES = version.h

diff --git a/ccode/valaccodewriter.vala b/ccode/valaccodewriter.vala
index 26b284c4c9f9a5561f518dedaa318f904626c04c..a71e16c8974ebb3a89d19121a5e2bfd46182f727 100644 (file)
--- a/ccode/valaccodewriter.vala
+++ b/ccode/valaccodewriter.vala
@@ -93,7 +93,7 @@ public class Vala.CCodeWriter {
                }
 
                var opening = write_version ?
-                       "/* %s generated by valac %s, the Vala compiler".printf (Path.get_basename (filename), Config.BUILD_VERSION) :
+                       "/* %s generated by valac %s, the Vala compiler".printf (Path.get_basename (filename), Vala.BUILD_VERSION) :
                        "/* %s generated by valac, the Vala compiler".printf (Path.get_basename (filename));
                write_string (opening);
 

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index c2f73c17e418ec1d4bc91446349ceb2f0eb4cb38..b6a21e5378ca85bacab2d3365aa7bb3ffa799c00 100644 (file)
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -552,10 +552,10 @@ class Vala.Compiler {
                }
 
                if (version) {
-                       stdout.printf ("Vala %s\n", Config.BUILD_VERSION);
+                       stdout.printf ("Vala %s\n", Vala.BUILD_VERSION);
                        return 0;
                } else if (api_version) {
-                       stdout.printf ("%s\n", Config.API_VERSION);
+                       stdout.printf ("%s\n", Vala.API_VERSION);
                        return 0;
                }
 
@@ -640,10 +640,10 @@ class Vala.Compiler {
                }
                
                if (version) {
-                       stdout.printf ("Vala %s\n", Config.BUILD_VERSION);
+                       stdout.printf ("Vala %s\n", Vala.BUILD_VERSION);
                        return 0;
                } else if (api_version) {
-                       stdout.printf ("%s\n", Config.API_VERSION);
+                       stdout.printf ("%s\n", Vala.API_VERSION);
                        return 0;
                }
                

diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index 985a23182642d97e27657c88e4227b5b81a9f480..a65956133d9aa3042eb56f53242358cc25d3d9df 100644 (file)
--- a/vala/valacodewriter.vala
+++ b/vala/valacodewriter.vala
@@ -84,7 +84,7 @@ public class Vala.CodeWriter : CodeVisitor {
                }
 
                var header = context.version_header ?
-                       "/* %s generated by %s %s, do not modify. */".printf (Path.get_basename (filename), Environment.get_prgname (), Config.BUILD_VERSION) :
+                       "/* %s generated by %s %s, do not modify. */".printf (Path.get_basename (filename), Environment.get_prgname (), Vala.BUILD_VERSION) :
                        "/* %s generated by %s, do not modify. */".printf (Path.get_basename (filename), Environment.get_prgname ());
                write_string (header);
                write_newline ();

diff --git a/valadoc/valadoc.vala b/valadoc/valadoc.vala
index 11263a0f76d627d88f13953588910d1c1267dbc2..7e74a187b6f8a6208d17bf0f5deb7e8af57eea62 100644 (file)
--- a/valadoc/valadoc.vala
+++ b/valadoc/valadoc.vala
@@ -317,7 +317,7 @@ public class ValaDoc : Object {
                }
 
                if (version) {
-                       stdout.printf ("Valadoc %s\n", Config.BUILD_VERSION);
+                       stdout.printf ("Valadoc %s\n", Vala.BUILD_VERSION);
                        return 0;
                }
 

diff --git a/vapi/config.vapi b/vapi/config.vapi
index 49797b829c840f1813f5ae23c861f951b3f73247..543a92fa8a078b2cacbdf15ad9390d7c7a4b6b52 100644 (file)
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -22,9 +22,6 @@
 
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config {
-       public const string API_VERSION;
-       [CCode (cheader_filename = "version.h")]
-       public const string BUILD_VERSION;
        public const string PACKAGE_DATADIR;
        public const string PACKAGE_SUFFIX;
 }

diff --git a/vapigen/valavapigen.vala b/vapigen/valavapigen.vala
index 616efdf292c9e7c5691cf8b5be53053118ce3271..9fe8ea6f003a13b67dfb8a6236b024b06be1bc5c 100644 (file)
--- a/vapigen/valavapigen.vala
+++ b/vapigen/valavapigen.vala
@@ -218,7 +218,7 @@ class Vala.VAPIGen {
                }
 
                if (version) {
-                       stdout.printf ("Vala API Generator %s\n", Config.BUILD_VERSION);
+                       stdout.printf ("Vala API Generator %s\n", Vala.BUILD_VERSION);
                        return 0;
                }