[PATCH v3 0/8] meson: mingw installation fixes & nsis conversion

marcandre.lureau@redhat.com posted 8 patches 3 years, 8 months ago
Test docker-quick@centos7 failed
Test docker-mingw@fedora failed
Test checkpatch failed
Test FreeBSD failed
Failed in applying to current master (apply log)
Makefile                           | 56 ---------------------
configure                          | 27 ++++++-----
contrib/vhost-user-gpu/meson.build |  2 +-
docs/meson.build                   |  4 +-
meson.build                        | 34 +++++++++++--
meson_options.txt                  |  4 ++
pc-bios/descriptors/meson.build    |  2 +-
pc-bios/keymaps/meson.build        |  6 +--
pc-bios/meson.build                |  2 +-
scripts/nsis.py                    | 78 ++++++++++++++++++++++++++++++
tools/virtiofsd/meson.build        |  2 +-
trace/meson.build                  |  2 +-
12 files changed, 138 insertions(+), 81 deletions(-)
create mode 100644 scripts/nsis.py
[PATCH v3 0/8] meson: mingw installation fixes & nsis conversion
Posted by marcandre.lureau@redhat.com 3 years, 8 months ago
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Hi,

The following patches fix installation path when cross-compiling Windows
version, and move the NSIS build rule to meson.

v3:
 - change qemu suffix handling, make /-separator implicit
 - use qemu suffix to build qemu_docdir, as --help says
 - use / to construct qemu directory variables in meson
 - add a few signed-off from Daniel

v2:
 - replaced the shell script by a python version
 - add copyright/license for the new python script

Marc-André Lureau (8):
  configure: rename confsuffix option
  configure: always /-seperate directory from qemu_suffix
  configure: build docdir like other suffixed directories
  meson: pass qemu_suffix option
  meson: use meson datadir instead of qemu_datadir
  meson: pass docdir option
  meson: use meson mandir instead of qemu_mandir
  meson: add NSIS building

 Makefile                           | 56 ---------------------
 configure                          | 27 ++++++-----
 contrib/vhost-user-gpu/meson.build |  2 +-
 docs/meson.build                   |  4 +-
 meson.build                        | 34 +++++++++++--
 meson_options.txt                  |  4 ++
 pc-bios/descriptors/meson.build    |  2 +-
 pc-bios/keymaps/meson.build        |  6 +--
 pc-bios/meson.build                |  2 +-
 scripts/nsis.py                    | 78 ++++++++++++++++++++++++++++++
 tools/virtiofsd/meson.build        |  2 +-
 trace/meson.build                  |  2 +-
 12 files changed, 138 insertions(+), 81 deletions(-)
 create mode 100644 scripts/nsis.py

-- 
2.26.2



Re: [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion
Posted by Paolo Bonzini 3 years, 8 months ago
Since behavioral changes should be reviewed separately let's just include
v2 first.

Paolo

Il mer 26 ago 2020, 13:04 <marcandre.lureau@redhat.com> ha scritto:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Hi,
>
> The following patches fix installation path when cross-compiling Windows
> version, and move the NSIS build rule to meson.
>
> v3:
>  - change qemu suffix handling, make /-separator implicit
>  - use qemu suffix to build qemu_docdir, as --help says
>  - use / to construct qemu directory variables in meson
>  - add a few signed-off from Daniel
>
> v2:
>  - replaced the shell script by a python version
>  - add copyright/license for the new python script
>
> Marc-André Lureau (8):
>   configure: rename confsuffix option
>   configure: always /-seperate directory from qemu_suffix
>   configure: build docdir like other suffixed directories
>   meson: pass qemu_suffix option
>   meson: use meson datadir instead of qemu_datadir
>   meson: pass docdir option
>   meson: use meson mandir instead of qemu_mandir
>   meson: add NSIS building
>
>  Makefile                           | 56 ---------------------
>  configure                          | 27 ++++++-----
>  contrib/vhost-user-gpu/meson.build |  2 +-
>  docs/meson.build                   |  4 +-
>  meson.build                        | 34 +++++++++++--
>  meson_options.txt                  |  4 ++
>  pc-bios/descriptors/meson.build    |  2 +-
>  pc-bios/keymaps/meson.build        |  6 +--
>  pc-bios/meson.build                |  2 +-
>  scripts/nsis.py                    | 78 ++++++++++++++++++++++++++++++
>  tools/virtiofsd/meson.build        |  2 +-
>  trace/meson.build                  |  2 +-
>  12 files changed, 138 insertions(+), 81 deletions(-)
>  create mode 100644 scripts/nsis.py
>
> --
> 2.26.2
>
>
>
Re: [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion
Posted by Marc-André Lureau 3 years, 8 months ago
Hi

On Wed, Aug 26, 2020 at 3:38 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> Since behavioral changes should be reviewed separately let's just include
> v2 first.
>
>
 I am more confident that this version doesn't introduce regressions
though.. The use of + qemu_confsuffix was problematic, and I noticed some
weird behaviour that I couldn't clearly identify (when updating meson &
running make only - iow, fresh configure && make should be ok, but for the
rest it's not as "clean" as this version..).

Paolo
>
> Il mer 26 ago 2020, 13:04 <marcandre.lureau@redhat.com> ha scritto:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Hi,
>>
>> The following patches fix installation path when cross-compiling Windows
>> version, and move the NSIS build rule to meson.
>>
>> v3:
>>  - change qemu suffix handling, make /-separator implicit
>>  - use qemu suffix to build qemu_docdir, as --help says
>>  - use / to construct qemu directory variables in meson
>>  - add a few signed-off from Daniel
>>
>> v2:
>>  - replaced the shell script by a python version
>>  - add copyright/license for the new python script
>>
>> Marc-André Lureau (8):
>>   configure: rename confsuffix option
>>   configure: always /-seperate directory from qemu_suffix
>>   configure: build docdir like other suffixed directories
>>   meson: pass qemu_suffix option
>>   meson: use meson datadir instead of qemu_datadir
>>   meson: pass docdir option
>>   meson: use meson mandir instead of qemu_mandir
>>   meson: add NSIS building
>>
>>  Makefile                           | 56 ---------------------
>>  configure                          | 27 ++++++-----
>>  contrib/vhost-user-gpu/meson.build |  2 +-
>>  docs/meson.build                   |  4 +-
>>  meson.build                        | 34 +++++++++++--
>>  meson_options.txt                  |  4 ++
>>  pc-bios/descriptors/meson.build    |  2 +-
>>  pc-bios/keymaps/meson.build        |  6 +--
>>  pc-bios/meson.build                |  2 +-
>>  scripts/nsis.py                    | 78 ++++++++++++++++++++++++++++++
>>  tools/virtiofsd/meson.build        |  2 +-
>>  trace/meson.build                  |  2 +-
>>  12 files changed, 138 insertions(+), 81 deletions(-)
>>  create mode 100644 scripts/nsis.py
>>
>> --
>> 2.26.2
>>
>>
>>

-- 
Marc-André Lureau
Re: [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion
Posted by Paolo Bonzini 3 years, 8 months ago
We should document the difference in the 5.2 changelog then (it's okay to
introduce it since the configure option is named differently).

Il mer 26 ago 2020, 13:50 Marc-André Lureau <marcandre.lureau@gmail.com> ha
scritto:

> Hi
>
> On Wed, Aug 26, 2020 at 3:38 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> Since behavioral changes should be reviewed separately let's just include
>> v2 first.
>>
>>
>  I am more confident that this version doesn't introduce regressions
> though.. The use of + qemu_confsuffix was problematic, and I noticed some
> weird behaviour that I couldn't clearly identify (when updating meson &
> running make only - iow, fresh configure && make should be ok, but for the
> rest it's not as "clean" as this version..).
>
> Paolo
>>
>> Il mer 26 ago 2020, 13:04 <marcandre.lureau@redhat.com> ha scritto:
>>
>>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>>
>>> Hi,
>>>
>>> The following patches fix installation path when cross-compiling Windows
>>> version, and move the NSIS build rule to meson.
>>>
>>> v3:
>>>  - change qemu suffix handling, make /-separator implicit
>>>  - use qemu suffix to build qemu_docdir, as --help says
>>>  - use / to construct qemu directory variables in meson
>>>  - add a few signed-off from Daniel
>>>
>>> v2:
>>>  - replaced the shell script by a python version
>>>  - add copyright/license for the new python script
>>>
>>> Marc-André Lureau (8):
>>>   configure: rename confsuffix option
>>>   configure: always /-seperate directory from qemu_suffix
>>>   configure: build docdir like other suffixed directories
>>>   meson: pass qemu_suffix option
>>>   meson: use meson datadir instead of qemu_datadir
>>>   meson: pass docdir option
>>>   meson: use meson mandir instead of qemu_mandir
>>>   meson: add NSIS building
>>>
>>>  Makefile                           | 56 ---------------------
>>>  configure                          | 27 ++++++-----
>>>  contrib/vhost-user-gpu/meson.build |  2 +-
>>>  docs/meson.build                   |  4 +-
>>>  meson.build                        | 34 +++++++++++--
>>>  meson_options.txt                  |  4 ++
>>>  pc-bios/descriptors/meson.build    |  2 +-
>>>  pc-bios/keymaps/meson.build        |  6 +--
>>>  pc-bios/meson.build                |  2 +-
>>>  scripts/nsis.py                    | 78 ++++++++++++++++++++++++++++++
>>>  tools/virtiofsd/meson.build        |  2 +-
>>>  trace/meson.build                  |  2 +-
>>>  12 files changed, 138 insertions(+), 81 deletions(-)
>>>  create mode 100644 scripts/nsis.py
>>>
>>> --
>>> 2.26.2
>>>
>>>
>>>
>
> --
> Marc-André Lureau
>
Re: [PATCH v3 0/8] meson: mingw installation fixes & nsis conversion
Posted by Marc-André Lureau 3 years, 8 months ago
Hi

On Wed, Aug 26, 2020 at 5:47 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> We should document the difference in the 5.2 changelog then (it's okay to
> introduce it since the configure option is named differently).
>
>
Not directly related, but I can't help thinking that we would be better off
maintaining the changelog in git too, with sphinx yada yada..

Il mer 26 ago 2020, 13:50 Marc-André Lureau <marcandre.lureau@gmail.com> ha
> scritto:
>
>> Hi
>>
>> On Wed, Aug 26, 2020 at 3:38 PM Paolo Bonzini <pbonzini@redhat.com>
>> wrote:
>>
>>> Since behavioral changes should be reviewed separately let's just
>>> include v2 first.
>>>
>>>
>>  I am more confident that this version doesn't introduce regressions
>> though.. The use of + qemu_confsuffix was problematic, and I noticed some
>> weird behaviour that I couldn't clearly identify (when updating meson &
>> running make only - iow, fresh configure && make should be ok, but for the
>> rest it's not as "clean" as this version..).
>>
>> Paolo
>>>
>>> Il mer 26 ago 2020, 13:04 <marcandre.lureau@redhat.com> ha scritto:
>>>
>>>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>>>
>>>> Hi,
>>>>
>>>> The following patches fix installation path when cross-compiling Windows
>>>> version, and move the NSIS build rule to meson.
>>>>
>>>> v3:
>>>>  - change qemu suffix handling, make /-separator implicit
>>>>  - use qemu suffix to build qemu_docdir, as --help says
>>>>  - use / to construct qemu directory variables in meson
>>>>  - add a few signed-off from Daniel
>>>>
>>>> v2:
>>>>  - replaced the shell script by a python version
>>>>  - add copyright/license for the new python script
>>>>
>>>> Marc-André Lureau (8):
>>>>   configure: rename confsuffix option
>>>>   configure: always /-seperate directory from qemu_suffix
>>>>   configure: build docdir like other suffixed directories
>>>>   meson: pass qemu_suffix option
>>>>   meson: use meson datadir instead of qemu_datadir
>>>>   meson: pass docdir option
>>>>   meson: use meson mandir instead of qemu_mandir
>>>>   meson: add NSIS building
>>>>
>>>>  Makefile                           | 56 ---------------------
>>>>  configure                          | 27 ++++++-----
>>>>  contrib/vhost-user-gpu/meson.build |  2 +-
>>>>  docs/meson.build                   |  4 +-
>>>>  meson.build                        | 34 +++++++++++--
>>>>  meson_options.txt                  |  4 ++
>>>>  pc-bios/descriptors/meson.build    |  2 +-
>>>>  pc-bios/keymaps/meson.build        |  6 +--
>>>>  pc-bios/meson.build                |  2 +-
>>>>  scripts/nsis.py                    | 78 ++++++++++++++++++++++++++++++
>>>>  tools/virtiofsd/meson.build        |  2 +-
>>>>  trace/meson.build                  |  2 +-
>>>>  12 files changed, 138 insertions(+), 81 deletions(-)
>>>>  create mode 100644 scripts/nsis.py
>>>>
>>>> --
>>>> 2.26.2
>>>>
>>>>
>>>>
>>
>> --
>> Marc-André Lureau
>>
>

-- 
Marc-André Lureau