[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 35/55] configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERS
From: |
Paolo Bonzini |
Subject: |
[PULL 35/55] configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION |
Date: |
Mon, 21 Dec 2020 15:44:27 +0100 |
version.rc can just use existing preprocessor symbols.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
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 16b609a984..61ae342a58 100755
--- a/configure
+++ b/configure
@@ -5927,15 +5927,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
- [PULL 15/55] target/i386: Check privilege level for protected mode 'int N' task gate, (continued)
- [PULL 15/55] target/i386: Check privilege level for protected mode 'int N' task gate, Paolo Bonzini, 2020/12/21
- [PULL 18/55] check-block: enable iotests with cfi-icall, Paolo Bonzini, 2020/12/21
- [PULL 19/55] configure,meson: support Control-Flow Integrity, Paolo Bonzini, 2020/12/21
- [PULL 20/55] docs: Add CFI Documentation, Paolo Bonzini, 2020/12/21
- [PULL 29/55] meson: use pkg-config method for libudev, Paolo Bonzini, 2020/12/21
- [PULL 25/55] Makefile: add dummy target for build.ninja dependencies, Paolo Bonzini, 2020/12/21
- [PULL 43/55] libssh: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 48/55] zstd: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 50/55] virtfs: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 13/55] test-char: Destroy chardev correctly at char_file_test_internal(), Paolo Bonzini, 2020/12/21
- [PULL 35/55] configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION,
Paolo Bonzini <=
- [PULL 27/55] meson: switch minimum meson version to 0.56.0, Paolo Bonzini, 2020/12/21
- [PULL 55/55] win32: drop fd registration to the main-loop on setting non-block, Paolo Bonzini, 2020/12/21
- [PULL 32/55] configure: remove useless code to check for Xen PCI passthrough, Paolo Bonzini, 2020/12/21
- [PULL 37/55] curl: remove compatibility code, require 7.29.0, Paolo Bonzini, 2020/12/21
- [PULL 36/55] brlapi: convert to meson, Paolo Bonzini, 2020/12/21
- [PULL 30/55] meson: use dependency to gate block modules, Paolo Bonzini, 2020/12/21
- [PULL 09/55] tests/docker: Remove the remainders of debian9 containers from the Makefile, Paolo Bonzini, 2020/12/21
- [PULL 23/55] util: Extract flush_icache_range to cacheflush.c, Paolo Bonzini, 2020/12/21
- [PULL 34/55] configure: accept --enable-slirp, Paolo Bonzini, 2020/12/21
- [PULL 28/55] meson: fix detection of curses with pkgconfig, Paolo Bonzini, 2020/12/21