build-sys: fix meson project version usage

[PATCH] build-sys: fix meson project version usage

Posted by marcandre.lureau@redhat.com 1 year ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Program wixl found: YES (/usr/bin/wixl)

../qga/meson.build:149:16: ERROR: Unknown variable "project".

Fixes: e20d68aa0b9 ("configure, meson: use command line options to configure qemu-ga")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qga/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qga/meson.build b/qga/meson.build
index 940a51d55d..ff7a8496e4 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -146,7 +146,7 @@ if targetos == 'windows'
       libpcre = 'libpcre2'
     endif
     qga_msi_version = get_option('qemu_ga_version') == '' \
-      ? project.version() \
+      ? meson.project_version() \
       : get_option('qemu_ga_version')
     qga_msi = custom_target('QGA MSI',
                             input: files('installer/qemu-ga.wxs'),
-- 
2.41.0

Re: [PATCH] build-sys: fix meson project version usage

Posted by Konstantin Kostiuk 1 year ago

Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Thu, Nov 2, 2023 at 4:10 PM <marcandre.lureau@redhat.com> wrote:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Program wixl found: YES (/usr/bin/wixl)
>
> ../qga/meson.build:149:16: ERROR: Unknown variable "project".
>
> Fixes: e20d68aa0b9 ("configure, meson: use command line options to
> configure qemu-ga")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  qga/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/qga/meson.build b/qga/meson.build
> index 940a51d55d..ff7a8496e4 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -146,7 +146,7 @@ if targetos == 'windows'
>        libpcre = 'libpcre2'
>      endif
>      qga_msi_version = get_option('qemu_ga_version') == '' \
> -      ? project.version() \
> +      ? meson.project_version() \
>        : get_option('qemu_ga_version')
>      qga_msi = custom_target('QGA MSI',
>                              input: files('installer/qemu-ga.wxs'),
> --
> 2.41.0
>
>

Re: [PATCH] build-sys: fix meson project version usage

Posted by Konstantin Kostiuk 1 year ago

PULL sent
https://patchew.org/QEMU/20231125173011.374840-1-kkostiuk@redhat.com/

On Sat, Nov 25, 2023 at 7:15 PM Konstantin Kostiuk <kkostiuk@redhat.com>
wrote:

> Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
>
> On Thu, Nov 2, 2023 at 4:10 PM <marcandre.lureau@redhat.com> wrote:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Program wixl found: YES (/usr/bin/wixl)
>>
>> ../qga/meson.build:149:16: ERROR: Unknown variable "project".
>>
>> Fixes: e20d68aa0b9 ("configure, meson: use command line options to
>> configure qemu-ga")
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> ---
>>  qga/meson.build | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/qga/meson.build b/qga/meson.build
>> index 940a51d55d..ff7a8496e4 100644
>> --- a/qga/meson.build
>> +++ b/qga/meson.build
>> @@ -146,7 +146,7 @@ if targetos == 'windows'
>>        libpcre = 'libpcre2'
>>      endif
>>      qga_msi_version = get_option('qemu_ga_version') == '' \
>> -      ? project.version() \
>> +      ? meson.project_version() \
>>        : get_option('qemu_ga_version')
>>      qga_msi = custom_target('QGA MSI',
>>                              input: files('installer/qemu-ga.wxs'),
>> --
>> 2.41.0
>>
>>

Re: [PATCH] build-sys: fix meson project version usage

Posted by Marc-André Lureau 1 year ago

On Thu, Nov 2, 2023 at 6:11 PM <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Program wixl found: YES (/usr/bin/wixl)
>
> ../qga/meson.build:149:16: ERROR: Unknown variable "project".
>
> Fixes: e20d68aa0b9 ("configure, meson: use command line options to configure qemu-ga")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

ping

> ---
>  qga/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/qga/meson.build b/qga/meson.build
> index 940a51d55d..ff7a8496e4 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -146,7 +146,7 @@ if targetos == 'windows'
>        libpcre = 'libpcre2'
>      endif
>      qga_msi_version = get_option('qemu_ga_version') == '' \
> -      ? project.version() \
> +      ? meson.project_version() \
>        : get_option('qemu_ga_version')
>      qga_msi = custom_target('QGA MSI',
>                              input: files('installer/qemu-ga.wxs'),
> --
> 2.41.0
>
>


-- 
Marc-André Lureau