pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-27 14:54:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump version 1.0 to simplify Windows MSI versioning

Browse Source 
The Windows MSI product version is restricted to a 3 component
version number, whose fields are a max value of 255.255.65536

Since the main virt-viewer version takes up 3 components already,
we have the munge the micro version together with the first
component of the release version. eg we have

   $VERSION[0].$VERSION[1].($VERSION[2] << 8 + $RELEASE[0])

This causes problems for RHEL which needs to have 2-component
release versions to deal with z-stream builds.  eg a RHEL
version might be virt-viewer-0.5.6-2.el6_4.3 and we've
no easy way of adding the final '.3' to the Windows product
version.

If we reduce the primary virt-viewer version to just 2 components,
then we can leave the 3rd component for exclusive use by the RPM
release number. eg so we'd make product version up using

   $VERSION[0].$VERSION[1].($RELEASE[0] << 8 + $RELEASE[1])

In course of normal development, we'd increase the $VERSION[0]
for each release. ie next release is 1.0, then 2.0, then 3.0.
This means we retain the ability to put out "stable" branch
releases for any historical version by doing 1.1, 1.2 instead
of having to re-add a 3rd component.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2014-06-09 11:48:52 +01:00
parent 687b9e0bfa
commit 28a6bd6cf4
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -1,5 +1,5 @@
AC_INIT([virt-viewer],[0.6.0])
AC_INIT([virt-viewer],[1.0])
AC_CONFIG_SRCDIR(src/virt-viewer-main.c)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
@ -212,23 +212,13 @@ fi
AC_ARG_WITH([buildid],
AS_HELP_STRING([--with-buildid=id], [Set additional build version details]),
[buildid="-$with_buildid"], [buildid=""])
[buildid="$with_buildid"], [buildid="0"])
AC_DEFINE_UNQUOTED([BUILDID], "$buildid", [Build version details])
if test "x$buildid" != x; then
AC_SUBST([BUILDID], "$buildid")
fi
AC_SUBST([BUILDID], "$buildid")
major=`echo $PACKAGE_VERSION | cut -d. -f1`
minor=`echo $PACKAGE_VERSION | cut -d. -f2`
micro=`echo $PACKAGE_VERSION | cut -d. -f3`
buildid=`echo $with_buildid | cut -d. -f1`
if test "x$buildid" = x; then
buildid=0
fi
# In RHEV builds
# build = $micro << 12 + (%release[0] << 4 + %release[1])
build=`expr $micro \* 4096 + $buildid`
WINDOWS_PRODUCTVERSION="$major.$minor.$build"
WINDOWS_PRODUCTVERSION="$major.$minor.$buildid"
AC_SUBST([WINDOWS_PRODUCTVERSION])

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

@ -1,8 +1,20 @@
%{?mingw_package_header}
%define relver 1%{?dist}
# We want the 1st part of the release number, and
# the 3rd part (or 0 if not present). We want to
# avoid the autobuild magic %{extra_release} too
# which is not purely numeric and larger than 255.
# This scheme lets us cope with RHEL-style z-stream
# versioning when creating Win product versions
%define rel0 %(echo %{relver} | cut -d. -f1)
%define rel1 %(test -z "`echo %{relver} | cut -d. -f3`" && echo 0 || (echo %{relver} | cut -d. -f3))
%define buildid %(expr %{rel0} \\* 256 + %{rel1})
Name: mingw-virt-viewer
Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
Release: %{relver}%{?extra_release}
Summary: MinGW Windows virt-viewer console application
License: GPLv2+
@ -83,9 +95,8 @@ MinGW Windows virt-viewer MSI
%prep
%setup -q -n virt-viewer-%{version}
%build
%mingw_configure --with-gtk=2.0 --with-buildid=%{release}
%mingw_configure --with-gtk=2.0 --with-buildid=%{buildid}
%mingw_make %{?_smp_mflags} V=1
%mingw_make %{?_smp_mflags} V=1 -C data msi