shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-01-10 01:17:47 +03:00
Code Issues Projects Releases Wiki Activity

build-sys: Always prepend '-' to build id

Browse Source 
When using the --with-buildid configure paramater, the build id which is
substituted in the MSI wxs file is automatically prepended by a '-', but
the build id which is used in the C files does not get this '-'
automatically.

Currently, the linux and mingw spec files prepend a '-' on their own to the
--with-buildid argument, but this causes the MSI installer to show 2 '-'
during installation: "Please wait while Windows configures VirtViewer
0.6.0--1"

This commit always prepends a '-' to the buildid strings, and removes the
'-' from the spec files. This is to ensure the separator between version
number and buildid is not forgotten, which could give a confusing version
number.
This commit is contained in:
Christophe Fergeau 2014-04-02 13:43:17 +02:00
parent f1cadccb9a
commit 3232dd743b
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -211,10 +211,11 @@ if test "x$have_gtk_vnc" != "xyes" && test "x$have_spice_gtk" != "xyes"; then
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])
if test "x$with_buildid" != x; then
AC_SUBST([BUILDID], "-$with_buildid")
AS_HELP_STRING([--with-buildid=id], [Set additional build version details]),
[buildid="-$with_buildid"], [buildid=""])
AC_DEFINE_UNQUOTED([BUILDID], "$buildid", [Build version details])
if test "x$buildid" != x; then
AC_SUBST([BUILDID], "$buildid")
fi
major=`echo $PACKAGE_VERSION | cut -d. -f1`

2
mingw-virt-viewer.spec.in
View File

@ -85,7 +85,7 @@ MinGW Windows virt-viewer MSI
%build
%mingw_configure --with-gtk=2.0 --with-buildid=-%{release}
%mingw_configure --with-gtk=2.0 --with-buildid=%{release}
%mingw_make %{?_smp_mflags} V=1
%mingw_make %{?_smp_mflags} V=1 -C data msi

2
virt-viewer.spec.in
View File

@ -104,7 +104,7 @@ autoreconf -if
%define govirt_arg --with-ovirt
%endif
%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=-%{release} --disable-update-mimedb
%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=%{release} --disable-update-mimedb
%__make %{?_smp_mflags}