From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PATCH 4/4] configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION
Date: Thu, 17 Dec 2020 09:50:05 +0100 [thread overview]
Message-ID: <20201217085005.10644-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20201217085005.10644-1-pbonzini@redhat.com>
version.rc can just use existing preprocessor symbols.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 9 ---------
version.rc | 4 ++--
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 568818e72d..74eebfd692 100755
--- a/configure
+++ b/configure
@@ -5929,15 +5929,6 @@ if test "$bigendian" = "yes" ; then
fi
if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=y" >> $config_host_mak
- rc_version=$(cat $source_path/VERSION)
- version_major=${rc_version%%.*}
- rc_version=${rc_version#*.}
- version_minor=${rc_version%%.*}
- rc_version=${rc_version#*.}
- version_subminor=${rc_version%%.*}
- version_micro=0
- echo "CONFIG_FILEVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak
- echo "CONFIG_PRODUCTVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak
if test "$guest_agent_with_vss" = "yes" ; then
echo "CONFIG_QGA_VSS=y" >> $config_host_mak
echo "QGA_VSS_PROVIDER=$qga_vss_provider" >> $config_host_mak
diff --git a/version.rc b/version.rc
index d8e1569991..0daadbf981 100644
--- a/version.rc
+++ b/version.rc
@@ -2,8 +2,8 @@
#include "config-host.h"
VS_VERSION_INFO VERSIONINFO
-FILEVERSION CONFIG_FILEVERSION
-PRODUCTVERSION CONFIG_PRODUCTVERSION
+FILEVERSION QEMU_VERSION_MAJOR,QEMU_VERSION_MINOR,QEMU_VERSION_MICRO,0
+PRODUCTVERSION QEMU_VERSION_MAJOR,QEMU_VERSION_MINOR,QEMU_VERSION_MICRO,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
--
2.29.2
next prev parent reply other threads:[~2020-12-17 8:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 8:50 [PATCH 0/4] First batch of configure cleanups Paolo Bonzini
2020-12-17 8:50 ` [PATCH 1/4] configure: remove useless code to check for Xen PCI passthrough Paolo Bonzini
2020-12-17 10:20 ` Marc-André Lureau
2020-12-17 8:50 ` [PATCH 2/4] configure: remove variable bogus_os Paolo Bonzini
2020-12-17 9:04 ` Thomas Huth
2020-12-17 10:21 ` Marc-André Lureau
2020-12-17 8:50 ` [PATCH 3/4] configure: accept --enable-slirp Paolo Bonzini
2020-12-17 9:06 ` Thomas Huth
2020-12-17 10:22 ` Marc-André Lureau
2020-12-17 8:50 ` Paolo Bonzini [this message]
2020-12-17 10:30 ` [PATCH 4/4] configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201217085005.10644-5-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).