| Message ID | 20201217085005.10644-5-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | First batch of configure cleanups | expand |
On Thu, Dec 17, 2020 at 12:50 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > version.rc can just use existing preprocessor symbols. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@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 >
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
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(-)