build-sys: add --with-buildid to details build version

Add a configure argument to append build version details, similar to
what Daniel Berrange proposed in the "use finer package version in
mingw-virt-viewer" thread on the ML.
This commit is contained in:
Marc-André Lureau 2013-02-11 16:33:11 +01:00
parent da45d9fa1e
commit a52b5ea88c
6 changed files with 9 additions and 5 deletions

View File

@ -196,6 +196,10 @@ if test "x$have_gtk_vnc" != "xyes" && test "x$have_spice_gtk" != "xyes"; then
AC_MSG_ERROR([At least one of spice or vnc must be used]) AC_MSG_ERROR([At least one of spice or vnc must be used])
fi fi
AC_ARG_WITH([buildid],
AS_HELP_STRING([--with-buildid=id], [Set additional build version details]))
AC_DEFINE_UNQUOTED([BUILDID], "$with_buildid", [Build version details])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
data/Makefile data/Makefile

View File

@ -84,7 +84,7 @@ MinGW Windows virt-viewer installer
%build %build
%mingw_configure --with-gtk=2.0 %mingw_configure --with-gtk=2.0 --with-buildid=-%{release}
%mingw_make %{?_smp_mflags} V=1 %mingw_make %{?_smp_mflags} V=1
%install %install

View File

@ -44,7 +44,7 @@
static void static void
remote_viewer_version(void) remote_viewer_version(void)
{ {
g_print(_("remote-viewer version %s\n"), VERSION); g_print(_("remote-viewer version %s\n"), VERSION BUILDID);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }

View File

@ -35,7 +35,7 @@
static void virt_viewer_version(void) static void virt_viewer_version(void)
{ {
g_print(_("%s version %s\n"), PACKAGE, VERSION); g_print(_("%s version %s\n"), PACKAGE, VERSION BUILDID);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }

View File

@ -898,7 +898,7 @@ virt_viewer_window_menu_help_about(GtkWidget *menu G_GNUC_UNUSED,
GtkBuilder *about = virt_viewer_util_load_ui("virt-viewer-about.xml"); GtkBuilder *about = virt_viewer_util_load_ui("virt-viewer-about.xml");
GtkWidget *dialog = GTK_WIDGET(gtk_builder_get_object(about, "about")); GtkWidget *dialog = GTK_WIDGET(gtk_builder_get_object(about, "about"));
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION BUILDID);
gtk_window_set_transient_for(GTK_WINDOW(dialog), gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(self->priv->window)); GTK_WINDOW(self->priv->window));

View File

@ -128,7 +128,7 @@ autoreconf -if
%define gtk_arg --with-gtk=2.0 %define gtk_arg --with-gtk=2.0
%endif %endif
%configure %{spice_arg} %{plugin_arg} %{gtk_arg} %configure %{spice_arg} %{plugin_arg} %{gtk_arg} --with-buildid=-%{release}
%__make %{?_smp_mflags} %__make %{?_smp_mflags}