On Wed, Apr 02, 2014 at 01:53:37PM +0200, Christophe Fergeau wrote: > 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. > --- > configure.ac | 2 +- > mingw-virt-viewer.spec.in | 2 +- > virt-viewer.spec.in | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 7a00bf4..c553dae 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -212,7 +212,7 @@ 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_DEFINE_UNQUOTED([BUILDID], "-$with_buildid", [Build version details]) > if test "x$with_buildid" != x; then > AC_SUBST([BUILDID], "-$with_buildid") Isn't this line adding a second '-' to the BUILDID value ? Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| _______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
