[gnome-boxes] build: Use PACKAGE_VERSION instead of VERSION



commit b073c808eaac7e35839bbed3755a574797cfa725
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Nov 14 19:23:18 2017 +0100

    build: Use PACKAGE_VERSION instead of VERSION
    
    One part of it is purely cosmetic. The PACKAGE_ prefix increases the
    name's uniqueness, hence making it more greppable, and goes nicely
    with the other variables with the same prefix.
    
    A following commit will add an option to specify the distributor's
    version. Using PACKAGE_VERSION instead of VERSION removes any shadow
    of doubt as to whose version it is.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=790343

 Makefile.am     |    4 ++--
 configure.ac    |    2 +-
 meson.build     |    1 -
 src/app.vala    |    2 +-
 src/config.vapi |    2 +-
 src/main.vala   |    2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b50cdbd..f6d1e29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,11 +48,11 @@ MAINTAINERCLEANFILES =                              \
 
 # see git-version-gen
 dist-hook:
-       echo $(VERSION) > $(distdir)/.tarball-version
+       echo $(PACKAGE_VERSION) > $(distdir)/.tarball-version
 
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
-       echo $(VERSION) > $@-t && mv $@-t $@
+       echo $(PACKAGE_VERSION) > $@-t && mv $@-t $@
 
 all:
 
diff --git a/configure.ac b/configure.ac
index 5f47b93..8abff4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,7 @@ AC_OUTPUT
 dnl ==========================================================================
 AC_MSG_NOTICE([
 
-        GNOME Boxes $VERSION
+        GNOME Boxes $PACKAGE_VERSION
         =================
 
         prefix:                   ${prefix}
diff --git a/meson.build b/meson.build
index 32d981d..9d32260 100644
--- a/meson.build
+++ b/meson.build
@@ -55,7 +55,6 @@ conf.set_quoted ('PACKAGE_TARNAME', meson.project_name ())
 conf.set_quoted ('PACKAGE_VERSION', meson.project_version ())
 conf.set_quoted ('GETTEXT_PACKAGE', meson.project_name ())
 conf.set('PACKAGE_URL', '"https://wiki.gnome.org/Apps/Boxes";')
-conf.set_quoted ('VERSION', meson.project_version ())
 conf.set_quoted ('DATADIR', data_dir)
 conf.set_quoted ('CACHEDIR', '/var/cache')
 conf.set_quoted ('LOCALEDIR', locale_dir)
diff --git a/src/app.vala b/src/app.vala
index 66b5151..9c21615 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -108,7 +108,7 @@ private class Boxes.App: Gtk.Application {
                                    "copyright", "Copyright 2011 Red Hat, Inc.",
                                    "license-type", Gtk.License.LGPL_2_1,
                                    "logo-icon-name", "gnome-boxes",
-                                   "version", Config.VERSION,
+                                   "version", Config.PACKAGE_VERSION,
                                    "website", Config.PACKAGE_URL,
                                    "wrap-license", true);
         });
diff --git a/src/config.vapi b/src/config.vapi
index 021e959..f462322 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -1,6 +1,6 @@
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config {
-        public const string VERSION;
+        public const string PACKAGE_VERSION;
         public const string PACKAGE_DATADIR;
         public const string PACKAGE_TARNAME;
         public const string GETTEXT_PACKAGE;
diff --git a/src/main.vala b/src/main.vala
index 53bbf05..ff7e14f 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -23,7 +23,7 @@ private static void parse_local_args (ref unowned string[] args) {
     }
 
     if (version) {
-        GLib.stdout.printf ("%s\n", Config.VERSION);
+        GLib.stdout.printf ("%s\n", Config.PACKAGE_VERSION);
         exit (0);
     }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]