Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Mon, Sep 23, 2019 at 12:38 PM Pavel Hrdina wrote: > > On Mon, Sep 23, 2019 at 12:31:34PM +0200, Andrea Bolognani wrote: > > On Mon, 2019-09-23 at 11:02 +0100, Daniel P. Berrangé wrote: > > > On Mon, Sep 23, 2019 at 11:59:01AM +0200, Andrea Bolognani wrote: > > > > For what it's worth, I also prefer 'syntax': the -check suffix is > > > > useful for make because it highlights that you're verifying some > > > > property of the program, and also clearly ties > > > > > > > > make check > > > > make syntax-check > > > > > > > > together. In the case of Meson, the fact that you're verifying > > > > something is explicit in the name of the ninja target, and also > > > > > > > > ninja test --suite unit > > > > ninja test --suite syntax > > > > > > > > are already very obviously connected. Using 'syntax-check' for the > > > > latter would, if anything, make the relationship unbalanced: why > > > > didn't we call the former 'unit-check' then? > > > > > > How about calling the suite "style" rather than "syntax" since I > > > think that better reflects what it is actually doing. It is coding > > > style / guidelines checks. > > > > Sounds good to me! > > Works for me as well. +1. > > Pavel -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Mon, Sep 23, 2019 at 12:31:34PM +0200, Andrea Bolognani wrote: > On Mon, 2019-09-23 at 11:02 +0100, Daniel P. Berrangé wrote: > > On Mon, Sep 23, 2019 at 11:59:01AM +0200, Andrea Bolognani wrote: > > > For what it's worth, I also prefer 'syntax': the -check suffix is > > > useful for make because it highlights that you're verifying some > > > property of the program, and also clearly ties > > > > > > make check > > > make syntax-check > > > > > > together. In the case of Meson, the fact that you're verifying > > > something is explicit in the name of the ninja target, and also > > > > > > ninja test --suite unit > > > ninja test --suite syntax > > > > > > are already very obviously connected. Using 'syntax-check' for the > > > latter would, if anything, make the relationship unbalanced: why > > > didn't we call the former 'unit-check' then? > > > > How about calling the suite "style" rather than "syntax" since I > > think that better reflects what it is actually doing. It is coding > > style / guidelines checks. > > Sounds good to me! Works for me as well. Pavel signature.asc Description: PGP signature -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Mon, 2019-09-23 at 11:02 +0100, Daniel P. Berrangé wrote: > On Mon, Sep 23, 2019 at 11:59:01AM +0200, Andrea Bolognani wrote: > > For what it's worth, I also prefer 'syntax': the -check suffix is > > useful for make because it highlights that you're verifying some > > property of the program, and also clearly ties > > > > make check > > make syntax-check > > > > together. In the case of Meson, the fact that you're verifying > > something is explicit in the name of the ninja target, and also > > > > ninja test --suite unit > > ninja test --suite syntax > > > > are already very obviously connected. Using 'syntax-check' for the > > latter would, if anything, make the relationship unbalanced: why > > didn't we call the former 'unit-check' then? > > How about calling the suite "style" rather than "syntax" since I > think that better reflects what it is actually doing. It is coding > style / guidelines checks. Sounds good to me! -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Mon, Sep 23, 2019 at 11:59:01AM +0200, Andrea Bolognani wrote: > On Mon, 2019-09-23 at 10:17 +0200, Pavel Hrdina wrote: > > On Sat, Sep 21, 2019 at 09:22:38AM +0200, Fabiano Fidêncio wrote: > > > One last things here (thanks, Pavel, for pointing this out), I'd > > > prefer the 'syntax' suite being called 'syntax-check' just because > > > people are already used to the 'syntax-check' name. > > > > > > So, please, would you mind changing it as well? > > > > I don't mind changing it if we agree on the naming, I'll have one last > > argument for the shorter and easier to type name, coping it from the > > comment on gitlab: > > > > To me it feels redundant to have the `check` as part of the suit label > > as you already know that you are running test suit so the check is > > somehow implied. Consistency is a nice thing if it makes sense, but we > > are completely changing the workflow so I don't see any reason to pick > > longer and redundant name just for consistency reasons. > > > > Based on that I still prefer using simply `syntax`, let's see of others > > have some opinion about it. > > For what it's worth, I also prefer 'syntax': the -check suffix is > useful for make because it highlights that you're verifying some > property of the program, and also clearly ties > > make check > make syntax-check > > together. In the case of Meson, the fact that you're verifying > something is explicit in the name of the ninja target, and also > > ninja test --suite unit > ninja test --suite syntax > > are already very obviously connected. Using 'syntax-check' for the > latter would, if anything, make the relationship unbalanced: why > didn't we call the former 'unit-check' then? How about calling the suite "style" rather than "syntax" since I think that better reflects what it is actually doing. It is coding style / guidelines checks. Regards, Daniel -- |: https://berrange.com -o-https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o-https://fstop138.berrange.com :| |: https://entangle-photo.org-o-https://www.instagram.com/dberrange :| -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Mon, 2019-09-23 at 10:17 +0200, Pavel Hrdina wrote: > On Sat, Sep 21, 2019 at 09:22:38AM +0200, Fabiano Fidêncio wrote: > > One last things here (thanks, Pavel, for pointing this out), I'd > > prefer the 'syntax' suite being called 'syntax-check' just because > > people are already used to the 'syntax-check' name. > > > > So, please, would you mind changing it as well? > > I don't mind changing it if we agree on the naming, I'll have one last > argument for the shorter and easier to type name, coping it from the > comment on gitlab: > > To me it feels redundant to have the `check` as part of the suit label > as you already know that you are running test suit so the check is > somehow implied. Consistency is a nice thing if it makes sense, but we > are completely changing the workflow so I don't see any reason to pick > longer and redundant name just for consistency reasons. > > Based on that I still prefer using simply `syntax`, let's see of others > have some opinion about it. For what it's worth, I also prefer 'syntax': the -check suffix is useful for make because it highlights that you're verifying some property of the program, and also clearly ties make check make syntax-check together. In the case of Meson, the fact that you're verifying something is explicit in the name of the ninja target, and also ninja test --suite unit ninja test --suite syntax are already very obviously connected. Using 'syntax-check' for the latter would, if anything, make the relationship unbalanced: why didn't we call the former 'unit-check' then? The switch to Meson is a clear-cut break from what we had before, and we should take the opportunity to re-evaluate whether our existing decisions are still valid in a post-autotools world: in this specific case, I think it makes more sense to change the name rather than stick with the historical one. -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Mon, Sep 23, 2019 at 10:07:59AM +0200, Ján Tomko wrote:
> On Fri, Sep 20, 2019 at 11:03:42AM +0200, Pavel Hrdina wrote:
> > Meson build system is simple and quick compared to Autotools and it's
> > able to fully replace our Autotools usage. There are few drawbacks as
> > it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0,
> > it's still evolving and the user base is not that large and there were
> > some tweaks required to achieve the same functionality.
> >
> > However, there are benefits, the configure and build time is way shorter
> > and build definition files are more readable and easier to maintain.
> >
> > There are some major changes with Meson build system:
> >
> >- there is no syntax-check target, the syntax-check is part of Meson
> > test suite but it's still possible to run it separately,
> >
> >- Meson forces separation between source and build directories
> >
> > Signed-off-by: Pavel Hrdina
>
> > Tested-by: Ján Tomko
>
> Still true.
>
> > ---
> >
> > Notes:
> >changes in v2:
> >
> >- add -Werror if we are building from git
> >- fixed -Wframe-larger-than
> >- removed unrelated fix
> >- added comment for flake8 ignore warning
> >- added 'suite' labels 'syntax' and 'unit' for tests
> >- AUTHORS and libvirt-dbus.spec are generated only when building
> > from git
> >- run.in is no longer executable, there is a helper script to fix
> > permissions
> > for the generated run script
> >- fixed include_directories for test executable, direct paths can be
> > used
> > since meson 0.50.0
> >- flake8 is optional as it was with autotools
> >- added meson version into spec file
> >
> > .gitignore | 1 +
> > AUTHORS.in | 2 +-
> > HACKING.md | 24 ++--
> > Makefile.am | 51 ---
> > README.md | 12 +-
> > autogen.sh | 52 ---
> > configure.ac| 87 ---
> > data/Makefile.am| 83 ---
> > data/meson.build| 15 ++
> > data/session/meson.build| 6 +
> > data/system/meson.build | 18 +++
> > docs/Makefile.am| 21 ---
> > docs/meson.build| 8 ++
> > libvirt-dbus.spec.in| 9 +-
> > m4/manywarnings.m4 | 276 ---
> > m4/virt-arg.m4 | 154
> > m4/virt-compile-pie.m4 | 35 -
> > m4/virt-compile-warnings.m4 | 203 --
> > m4/virt-linker-relro.m4 | 35 -
> > m4/warnings.m4 | 79 --
> > meson.build | 279
> > meson_options.txt | 6 +
> > run.in | 4 +-
> > src/Makefile.am | 66 -
> > src/meson.build | 42 ++
> > tests/Makefile.am | 57
> > tests/meson.build | 52 +++
> > tools/fix-perm.sh | 3 +
> > tools/gen-authors.sh| 4 +
> > 29 files changed, 463 insertions(+), 1221 deletions(-)
>
> [...]
>
> > diff --git a/README.md b/README.md
> > index 66aa6f6..e365650 100644
> > --- a/README.md
> > +++ b/README.md
> > @@ -32,21 +32,19 @@ The packages required to build libvirt-dbus are
> > Installation
> >
> >
> > -libvirt-dbus uses GNU Autotools build system, so the build & install
> > +libvirt-dbus uses Meson build system, so the build & install
> > process is fairly simple. For example, to install as root user:
> >
> > ```
> > -# ./configure --prefix=/usr --sysconfigdir=/etc --localstatedir=/var
> > -# make
> > -# make install
> > +# meson build --prefix=/usr --sysconfigdir=/etc --localstatedir=/var
>
> In meson, the parameter is called --sysconfdir
>
> $ meson build --prefix=/usr --sysconfigdir=/etc --localstatedir=/var
> usage: meson [-h]
> {setup,configure,install,introspect,init,test,wrap,subprojects,help,rewrite}
> ...
> meson: error: unrecognized arguments: --sysconfigdir=/etc
Nice catch, I'll fix that.
> > +# ninja -C build install
> > ```
> >
> > or to install as unprivileged user:
> >
> > ```
> > -$ ./configure --prefix=$HOME/usr
> > -$ make
> > -$ make install
> > +$ meson build --prefix=$HOME/usr
> > +$ ninja -C build install
> > ```
>
> [...]
>
> > diff --git a/src/meson.build b/src/meson.build
> > new file mode 100644
> > index 000..a848bcd
> > --- /dev/null
> > +++ b/src/meson.build
> > @@ -0,0 +1,42 @@
> > +lib_util = static_library(
> > +'libutil',
> > +[
> > +'util.c',
> > +],
> > +dependencies: [
> > +dep_gio_unix,
> > +dep_glib,
> > +dep_libvirt,
> > +dep_libvirt_glib
> > +],
> > +)
> > +
> > +exe_libvirt_dbus = executable(
> > +'libvirt-dbus',
> > +[
> > +'connect.c',
> > +'domain.c',
> > +'events.c',
> > +'gdbus.c',
>
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Sat, Sep 21, 2019 at 09:22:38AM +0200, Fabiano Fidêncio wrote: > On Fri, Sep 20, 2019 at 2:34 PM Fabiano Fidêncio wrote: > > > > [snip] > > > > > > > > > In general, it looks good and works as expected. > > > > I will add my "Reviewed-by: " after we discuss the points raised. > > > > > > > > Another thing, please, let's sync to have the libvirt-jenkins-ci work > > > > done and merged before this one gets merged. > > > > > > Works for me, thanks for review, I'll fix the dist script to use a shell > > > script. > > > > > > > Reviewed-by: Fabiano Fidêncio > > One last things here (thanks, Pavel, for pointing this out), I'd > prefer the 'syntax' suite being called 'syntax-check' just because > people are already used to the 'syntax-check' name. > > So, please, would you mind changing it as well? I don't mind changing it if we agree on the naming, I'll have one last argument for the shorter and easier to type name, coping it from the comment on gitlab: To me it feels redundant to have the `check` as part of the suit label as you already know that you are running test suit so the check is somehow implied. Consistency is a nice thing if it makes sense, but we are completely changing the workflow so I don't see any reason to pick longer and redundant name just for consistency reasons. Based on that I still prefer using simply `syntax`, let's see of others have some opinion about it. Thanks, Pavel signature.asc Description: PGP signature -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Fri, Sep 20, 2019 at 11:03:42AM +0200, Pavel Hrdina wrote:
Meson build system is simple and quick compared to Autotools and it's
able to fully replace our Autotools usage. There are few drawbacks as
it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0,
it's still evolving and the user base is not that large and there were
some tweaks required to achieve the same functionality.
However, there are benefits, the configure and build time is way shorter
and build definition files are more readable and easier to maintain.
There are some major changes with Meson build system:
- there is no syntax-check target, the syntax-check is part of Meson
test suite but it's still possible to run it separately,
- Meson forces separation between source and build directories
Signed-off-by: Pavel Hrdina
Tested-by: Ján Tomko
Still true.
---
Notes:
changes in v2:
- add -Werror if we are building from git
- fixed -Wframe-larger-than
- removed unrelated fix
- added comment for flake8 ignore warning
- added 'suite' labels 'syntax' and 'unit' for tests
- AUTHORS and libvirt-dbus.spec are generated only when building from git
- run.in is no longer executable, there is a helper script to fix
permissions
for the generated run script
- fixed include_directories for test executable, direct paths can be used
since meson 0.50.0
- flake8 is optional as it was with autotools
- added meson version into spec file
.gitignore | 1 +
AUTHORS.in | 2 +-
HACKING.md | 24 ++--
Makefile.am | 51 ---
README.md | 12 +-
autogen.sh | 52 ---
configure.ac| 87 ---
data/Makefile.am| 83 ---
data/meson.build| 15 ++
data/session/meson.build| 6 +
data/system/meson.build | 18 +++
docs/Makefile.am| 21 ---
docs/meson.build| 8 ++
libvirt-dbus.spec.in| 9 +-
m4/manywarnings.m4 | 276 ---
m4/virt-arg.m4 | 154
m4/virt-compile-pie.m4 | 35 -
m4/virt-compile-warnings.m4 | 203 --
m4/virt-linker-relro.m4 | 35 -
m4/warnings.m4 | 79 --
meson.build | 279
meson_options.txt | 6 +
run.in | 4 +-
src/Makefile.am | 66 -
src/meson.build | 42 ++
tests/Makefile.am | 57
tests/meson.build | 52 +++
tools/fix-perm.sh | 3 +
tools/gen-authors.sh| 4 +
29 files changed, 463 insertions(+), 1221 deletions(-)
[...]
diff --git a/README.md b/README.md
index 66aa6f6..e365650 100644
--- a/README.md
+++ b/README.md
@@ -32,21 +32,19 @@ The packages required to build libvirt-dbus are
Installation
-libvirt-dbus uses GNU Autotools build system, so the build & install
+libvirt-dbus uses Meson build system, so the build & install
process is fairly simple. For example, to install as root user:
```
-# ./configure --prefix=/usr --sysconfigdir=/etc --localstatedir=/var
-# make
-# make install
+# meson build --prefix=/usr --sysconfigdir=/etc --localstatedir=/var
In meson, the parameter is called --sysconfdir
$ meson build --prefix=/usr --sysconfigdir=/etc --localstatedir=/var
usage: meson [-h]
{setup,configure,install,introspect,init,test,wrap,subprojects,help,rewrite} ...
meson: error: unrecognized arguments: --sysconfigdir=/etc
+# ninja -C build install
```
or to install as unprivileged user:
```
-$ ./configure --prefix=$HOME/usr
-$ make
-$ make install
+$ meson build --prefix=$HOME/usr
+$ ninja -C build install
```
[...]
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 000..a848bcd
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,42 @@
+lib_util = static_library(
+'libutil',
+[
+'util.c',
+],
+dependencies: [
+dep_gio_unix,
+dep_glib,
+dep_libvirt,
+dep_libvirt_glib
+],
+)
+
+exe_libvirt_dbus = executable(
+'libvirt-dbus',
+[
+'connect.c',
+'domain.c',
+'events.c',
+'gdbus.c',
+'interface.c',
+'main.c',
+'network.c',
+'nodedev.c',
+'nwfilter.c',
+'secret.c',
+'storagepool.c',
+'storagevol.c',
+],
+dependencies: [
+dep_gio_unix,
+dep_glib,
+dep_libvirt,
+dep_libvirt_glib
+],
+link_with: [
+lib_util,
+],
+install: true,
+install_dir: get_option('sbindir'),
+)
+
Whitespace at EOL (git am complains about this)
Jano
signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Fri, Sep 20, 2019 at 2:34 PM Fabiano Fidêncio wrote: > > [snip] > > > > > > In general, it looks good and works as expected. > > > I will add my "Reviewed-by: " after we discuss the points raised. > > > > > > Another thing, please, let's sync to have the libvirt-jenkins-ci work > > > done and merged before this one gets merged. > > > > Works for me, thanks for review, I'll fix the dist script to use a shell > > script. > > > > Reviewed-by: Fabiano Fidêncio One last things here (thanks, Pavel, for pointing this out), I'd prefer the 'syntax' suite being called 'syntax-check' just because people are already used to the 'syntax-check' name. So, please, would you mind changing it as well? Best Regards, -- Fabiano Fidêncio -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
[snip] > > > In general, it looks good and works as expected. > > I will add my "Reviewed-by: " after we discuss the points raised. > > > > Another thing, please, let's sync to have the libvirt-jenkins-ci work > > done and merged before this one gets merged. > > Works for me, thanks for review, I'll fix the dist script to use a shell > script. > Reviewed-by: Fabiano Fidêncio -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Fri, Sep 20, 2019 at 01:28:28PM +0200, Fabiano Fidêncio wrote:
> On Fri, Sep 20, 2019 at 11:05 AM Pavel Hrdina wrote:
> >
> > Meson build system is simple and quick compared to Autotools and it's
> > able to fully replace our Autotools usage. There are few drawbacks as
> > it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0,
> > it's still evolving and the user base is not that large and there were
> > some tweaks required to achieve the same functionality.
> >
> > However, there are benefits, the configure and build time is way shorter
> > and build definition files are more readable and easier to maintain.
> >
> > There are some major changes with Meson build system:
> >
> > - there is no syntax-check target, the syntax-check is part of Meson
> > test suite but it's still possible to run it separately,
> >
> > - Meson forces separation between source and build directories
> >
> > Signed-off-by: Pavel Hrdina
> > Tested-by: Ján Tomko
> > ---
> >
> > Notes:
> > changes in v2:
> >
> > - add -Werror if we are building from git
> > - fixed -Wframe-larger-than
> > - removed unrelated fix
> > - added comment for flake8 ignore warning
> > - added 'suite' labels 'syntax' and 'unit' for tests
> > - AUTHORS and libvirt-dbus.spec are generated only when building
> > from git
>
> Why? Not opposed to this decision, just want to understand the reason for
> that.
This is what was done by Autotools, at least for AUTHORS. If you are
compiling libvirt-dbus from tarball you don't have git so you will not
be able to generate AUTHORS. For the spec file my idea was that there
is no need to regenerate it from tarball as that one is usually used as
it is.
> > - run.in is no longer executable, there is a helper script to fix
> > permissions
> > for the generated run script
> > - fixed include_directories for test executable, direct paths can
> > be used
> > since meson 0.50.0
>
> By using 0.50.0 you're dropping support on:
> - Debian 10;
> - Ubuntu 19.04;
>
> Personally, I would stick to 0.49.0.
Ignored per following email :).
> > - flake8 is optional as it was with autotools
> > - added meson version into spec file
[...]
> > --- a/autogen.sh
> > +++ /dev/null
> > @@ -1,52 +0,0 @@
> > -#!/bin/sh
> > -# Run this to generate all the initial makefiles, etc.
> > -
> > -set -e
> > -srcdir=`dirname $0`
> > -test -z "$srcdir" && srcdir=.
> > -
> > -THEDIR=`pwd`
> > -cd $srcdir
> > -
> > -DIE=0
> > -
> > -for prog in autoreconf automake autoconf libtoolize
> > -do
> > -($prog --version) < /dev/null > /dev/null 2>&1 || {
> > -echo
> > -echo "You must have $prog installed to compile libvirt-dbus."
> > -DIE=1
> > -}
> > -done
> > -
> > -if test "$DIE" -eq 1; then
> > -exit 1
> > -fi
> > -
> > -if test -z "$*"; then
> > -echo "I am going to run ./configure with no args - if you "
> > -echo "wish to pass any extra arguments to it, please specify them
> > on "
> > -echo "the $0 command line."
> > -fi
> > -
> > -mkdir -p build-aux
> > -autoreconf -if
> > -
> > -cd $THEDIR
> > -
> > -if test "x$1" = "x--system"; then
> > -shift
> > -prefix=/usr
> > -libdir=$prefix/lib
> > -sysconfdir=/etc
> > -localstatedir=/var
> > -if [ -d /usr/lib64 ]; then
> > - libdir=$prefix/lib64
> > -fi
> > -EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir
> > --localstatedir=$localstatedir --libdir=$libdir"
> > -fi
>
> --system ended up being remove here but never added back.
> AFAIU that's a pattern followed by libvirt* projects and, if that's
> the case, may be worth to adding it back.
Good point, should have mentioned it in the commit message.
The --system option is usually used only by libvirt developers if they
need to run libvirt from git with system configuration files, I doubt
that anyone is actually using it with libvirt-dbus as there is probably
no need at all.
> > -
> > -$srcdir/configure $EXTRA_ARGS "$@" && {
> > -echo
> > -echo "Now type 'make' to compile libvirt-dbus."
> > -}
[...]
> > diff --git a/meson.build b/meson.build
> > new file mode 100644
> > index 000..30eeebe
> > --- /dev/null
> > +++ b/meson.build
> > @@ -0,0 +1,279 @@
> > +project(
> > +'libvirt-dbus', 'c',
> > +version: '1.4.0',
> > +license: 'LGPLv2+',
> > +meson_version: '>= 0.49.0',
>
> In case you're really going for 0.50.0, this needs to be bumped ...
>
> > +default_options: [
> > +'buildtype=debugoptimized',
> > +'c_std=gnu99',
> > +],
> > +)
> > +
> > +
> > +conf = configuration_data()
> > +conf.set('MESON_VERSION', '0.49.0')
>
> ... and this one as well ...
>
> > +conf.set('PACKAGE', meson.project_name())
> > +conf.set('VERSION', meson.project_version())
> > +conf.set('build_root', meson.build_root())
> > +conf.set('sbindir', get_option('sbindir'))
> >
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Fri, Sep 20, 2019 at 1:28 PM Fabiano Fidêncio wrote: > > On Fri, Sep 20, 2019 at 11:05 AM Pavel Hrdina wrote: > > > > Meson build system is simple and quick compared to Autotools and it's > > able to fully replace our Autotools usage. There are few drawbacks as > > it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0, > > it's still evolving and the user base is not that large and there were > > some tweaks required to achieve the same functionality. > > > > However, there are benefits, the configure and build time is way shorter > > and build definition files are more readable and easier to maintain. > > > > There are some major changes with Meson build system: > > > > - there is no syntax-check target, the syntax-check is part of Meson > > test suite but it's still possible to run it separately, > > > > - Meson forces separation between source and build directories > > > > Signed-off-by: Pavel Hrdina > > Tested-by: Ján Tomko > > --- > > > > Notes: > > changes in v2: > > > > - add -Werror if we are building from git > > - fixed -Wframe-larger-than > > - removed unrelated fix > > - added comment for flake8 ignore warning > > - added 'suite' labels 'syntax' and 'unit' for tests > > - AUTHORS and libvirt-dbus.spec are generated only when building > > from git > > Why? Not opposed to this decision, just want to understand the reason for > that. > > > - run.in is no longer executable, there is a helper script to fix > > permissions > > for the generated run script > > - fixed include_directories for test executable, direct paths can > > be used > > since meson 0.50.0 > > By using 0.50.0 you're dropping support on: > - Debian 10; > - Ubuntu 19.04; > > Personally, I would stick to 0.49.0. So, let me see if I properly understood your comment. You mean that before you were requiring 0.50.0 and now, because you changed the way to deal with the include_directories, you require 0.49.0. Is it? If so, just ignore my comment in the previous email. Best Regards, -- Fabiano Fidêncio -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Fri, Sep 20, 2019 at 11:05 AM Pavel Hrdina wrote: > > Meson build system is simple and quick compared to Autotools and it's > able to fully replace our Autotools usage. There are few drawbacks as > it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0, > it's still evolving and the user base is not that large and there were > some tweaks required to achieve the same functionality. > > However, there are benefits, the configure and build time is way shorter > and build definition files are more readable and easier to maintain. > > There are some major changes with Meson build system: > > - there is no syntax-check target, the syntax-check is part of Meson > test suite but it's still possible to run it separately, > > - Meson forces separation between source and build directories > > Signed-off-by: Pavel Hrdina > Tested-by: Ján Tomko > --- > > Notes: > changes in v2: > > - add -Werror if we are building from git > - fixed -Wframe-larger-than > - removed unrelated fix > - added comment for flake8 ignore warning > - added 'suite' labels 'syntax' and 'unit' for tests > - AUTHORS and libvirt-dbus.spec are generated only when building from > git Why? Not opposed to this decision, just want to understand the reason for that. > - run.in is no longer executable, there is a helper script to fix > permissions > for the generated run script > - fixed include_directories for test executable, direct paths can be > used > since meson 0.50.0 By using 0.50.0 you're dropping support on: - Debian 10; - Ubuntu 19.04; Personally, I would stick to 0.49.0. > - flake8 is optional as it was with autotools > - added meson version into spec file > > .gitignore | 1 + > AUTHORS.in | 2 +- > HACKING.md | 24 ++-- > Makefile.am | 51 --- > README.md | 12 +- > autogen.sh | 52 --- > configure.ac| 87 --- > data/Makefile.am| 83 --- > data/meson.build| 15 ++ > data/session/meson.build| 6 + > data/system/meson.build | 18 +++ > docs/Makefile.am| 21 --- > docs/meson.build| 8 ++ > libvirt-dbus.spec.in| 9 +- > m4/manywarnings.m4 | 276 --- > m4/virt-arg.m4 | 154 > m4/virt-compile-pie.m4 | 35 - > m4/virt-compile-warnings.m4 | 203 -- > m4/virt-linker-relro.m4 | 35 - > m4/warnings.m4 | 79 -- > meson.build | 279 > meson_options.txt | 6 + > run.in | 4 +- > src/Makefile.am | 66 - > src/meson.build | 42 ++ > tests/Makefile.am | 57 > tests/meson.build | 52 +++ > tools/fix-perm.sh | 3 + > tools/gen-authors.sh| 4 + > 29 files changed, 463 insertions(+), 1221 deletions(-) > delete mode 100644 Makefile.am > delete mode 100755 autogen.sh > delete mode 100644 configure.ac > delete mode 100644 data/Makefile.am > create mode 100644 data/meson.build > create mode 100644 data/session/meson.build > create mode 100644 data/system/meson.build > delete mode 100644 docs/Makefile.am > create mode 100644 docs/meson.build > delete mode 100644 m4/manywarnings.m4 > delete mode 100644 m4/virt-arg.m4 > delete mode 100644 m4/virt-compile-pie.m4 > delete mode 100644 m4/virt-compile-warnings.m4 > delete mode 100644 m4/virt-linker-relro.m4 > delete mode 100644 m4/warnings.m4 > create mode 100644 meson.build > create mode 100644 meson_options.txt > delete mode 100644 src/Makefile.am > create mode 100644 src/meson.build > delete mode 100644 tests/Makefile.am > create mode 100644 tests/meson.build > create mode 100755 tools/fix-perm.sh > create mode 100755 tools/gen-authors.sh > > diff --git a/.gitignore b/.gitignore > index b4abf66..7ed7554 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -19,6 +19,7 @@ vgcore.* > /aclocal.m4 > /autom4te.cache/ > /build-aux/ > +/build/ > /config.h > /config.h.in > /config.log > diff --git a/AUTHORS.in b/AUTHORS.in > index 52202ea..d5a486e 100644 > --- a/AUTHORS.in > +++ b/AUTHORS.in > @@ -13,4 +13,4 @@ The primary maintainers of libvirt-dbus are: > > Patches have been received from: > > -#contributorslist# > +@contributorslist@ > diff --git a/HACKING.md b/HACKING.md > index 8903408..e90f136 100644 > --- a/HACKING.md > +++ b/HACKING.md > @@ -16,32 +16,40 @@ Alternatively you can use one of the mirrors: > Running from git repository > --- > > - * The first step is to run autoreconf to create configure script: > + * The first step is to run meson to create build directory: > >
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Fri, Sep 20, 2019 at 11:36:53AM +0200, Pavel Hrdina wrote:
> On Fri, Sep 20, 2019 at 10:14:00AM +0100, Daniel P. Berrangé wrote:
> > On Fri, Sep 20, 2019 at 11:03:42AM +0200, Pavel Hrdina wrote:
> > > Meson build system is simple and quick compared to Autotools and it's
> > > able to fully replace our Autotools usage. There are few drawbacks as
> > > it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0,
> > > it's still evolving and the user base is not that large and there were
> > > some tweaks required to achieve the same functionality.
> > >
> > > However, there are benefits, the configure and build time is way shorter
> > > and build definition files are more readable and easier to maintain.
> > >
> > > There are some major changes with Meson build system:
> > >
> > > - there is no syntax-check target, the syntax-check is part of Meson
> > > test suite but it's still possible to run it separately,
> > >
> > > - Meson forces separation between source and build directories
> > >
> > > Signed-off-by: Pavel Hrdina
> > > Tested-by: Ján Tomko
> > > @@ -35,11 +36,11 @@ This package provides D-Bus API for libvirt
> > > %autosetup
> > >
> > > %build
> > > -%configure
> > > -%make_build
> > > +%meson
> > > +%meson_build
> > >
> > > %install
> > > -%make_install
> > > +%meson_install
> > >
> > > %pre
> > > getent group %{system_user} >/dev/null || groupadd -r %{system_user}
> >
> > Should this add a '%check' section to run '%meson_test' as sanity
> > check for the build.
>
> I would rather do it as a followup patch where we wound have to add
> more build dependencies into our spec file (python3, python3-pytest,
> python3-dbus and python3-flake8).
Sure, fine with me.
Regards,
Daniel
--
|: https://berrange.com -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Fri, Sep 20, 2019 at 10:14:00AM +0100, Daniel P. Berrangé wrote:
> On Fri, Sep 20, 2019 at 11:03:42AM +0200, Pavel Hrdina wrote:
> > Meson build system is simple and quick compared to Autotools and it's
> > able to fully replace our Autotools usage. There are few drawbacks as
> > it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0,
> > it's still evolving and the user base is not that large and there were
> > some tweaks required to achieve the same functionality.
> >
> > However, there are benefits, the configure and build time is way shorter
> > and build definition files are more readable and easier to maintain.
> >
> > There are some major changes with Meson build system:
> >
> > - there is no syntax-check target, the syntax-check is part of Meson
> > test suite but it's still possible to run it separately,
> >
> > - Meson forces separation between source and build directories
> >
> > Signed-off-by: Pavel Hrdina
> > Tested-by: Ján Tomko
> > ---
> >
> > Notes:
> > changes in v2:
> >
> > - add -Werror if we are building from git
> > - fixed -Wframe-larger-than
> > - removed unrelated fix
> > - added comment for flake8 ignore warning
> > - added 'suite' labels 'syntax' and 'unit' for tests
> > - AUTHORS and libvirt-dbus.spec are generated only when building
> > from git
> > - run.in is no longer executable, there is a helper script to fix
> > permissions
> > for the generated run script
> > - fixed include_directories for test executable, direct paths can
> > be used
> > since meson 0.50.0
> > - flake8 is optional as it was with autotools
> > - added meson version into spec file
> >
> > .gitignore | 1 +
> > AUTHORS.in | 2 +-
> > HACKING.md | 24 ++--
> > Makefile.am | 51 ---
> > README.md | 12 +-
> > autogen.sh | 52 ---
> > configure.ac| 87 ---
> > data/Makefile.am| 83 ---
> > data/meson.build| 15 ++
> > data/session/meson.build| 6 +
> > data/system/meson.build | 18 +++
> > docs/Makefile.am| 21 ---
> > docs/meson.build| 8 ++
> > libvirt-dbus.spec.in| 9 +-
> > m4/manywarnings.m4 | 276 ---
> > m4/virt-arg.m4 | 154
> > m4/virt-compile-pie.m4 | 35 -
> > m4/virt-compile-warnings.m4 | 203 --
> > m4/virt-linker-relro.m4 | 35 -
> > m4/warnings.m4 | 79 --
> > meson.build | 279
> > meson_options.txt | 6 +
> > run.in | 4 +-
> > src/Makefile.am | 66 -
> > src/meson.build | 42 ++
> > tests/Makefile.am | 57
> > tests/meson.build | 52 +++
> > tools/fix-perm.sh | 3 +
> > tools/gen-authors.sh| 4 +
> > 29 files changed, 463 insertions(+), 1221 deletions(-)
> > delete mode 100644 Makefile.am
> > delete mode 100755 autogen.sh
> > delete mode 100644 configure.ac
> > delete mode 100644 data/Makefile.am
> > create mode 100644 data/meson.build
> > create mode 100644 data/session/meson.build
> > create mode 100644 data/system/meson.build
> > delete mode 100644 docs/Makefile.am
> > create mode 100644 docs/meson.build
> > delete mode 100644 m4/manywarnings.m4
> > delete mode 100644 m4/virt-arg.m4
> > delete mode 100644 m4/virt-compile-pie.m4
> > delete mode 100644 m4/virt-compile-warnings.m4
> > delete mode 100644 m4/virt-linker-relro.m4
> > delete mode 100644 m4/warnings.m4
> > create mode 100644 meson.build
> > create mode 100644 meson_options.txt
> > delete mode 100644 src/Makefile.am
> > create mode 100644 src/meson.build
> > delete mode 100644 tests/Makefile.am
> > create mode 100644 tests/meson.build
> > create mode 100755 tools/fix-perm.sh
> > create mode 100755 tools/gen-authors.sh
>
>
> > diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in
> > index 626e2da..3425e9e 100644
> > --- a/libvirt-dbus.spec.in
> > +++ b/libvirt-dbus.spec.in
> > @@ -1,5 +1,6 @@
> > # -*- rpm-spec -*-
> >
> > +%global meson_version @MESON_VERSION@
> > %global glib2_version @GLIB2_REQUIRED@
> > %global libvirt_version @LIBVIRT_REQUIRED@
> > %global libvirt_glib_version @LIBVIRT_GLIB_REQUIRED@
> > @@ -14,7 +15,7 @@ URL: https://libvirt.org/
> > Source0: https://libvirt.org/sources/dbus/%{name}-%{version}.tar.xz
> >
> > BuildRequires: gcc
> > -BuildRequires: libtool
> > +BuildRequires: meson >= %{meson_version}
> > BuildRequires: glib2-devel >= %{glib2_version}
> > BuildRequires: libvirt-devel >= %{libvirt_version}
> > BuildRequires: libvirt-glib-devel >= %{libvirt_glib_version}
> > @@
Re: [libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
On Fri, Sep 20, 2019 at 11:03:42AM +0200, Pavel Hrdina wrote:
> Meson build system is simple and quick compared to Autotools and it's
> able to fully replace our Autotools usage. There are few drawbacks as
> it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0,
> it's still evolving and the user base is not that large and there were
> some tweaks required to achieve the same functionality.
>
> However, there are benefits, the configure and build time is way shorter
> and build definition files are more readable and easier to maintain.
>
> There are some major changes with Meson build system:
>
> - there is no syntax-check target, the syntax-check is part of Meson
> test suite but it's still possible to run it separately,
>
> - Meson forces separation between source and build directories
>
> Signed-off-by: Pavel Hrdina
> Tested-by: Ján Tomko
> ---
>
> Notes:
> changes in v2:
>
> - add -Werror if we are building from git
> - fixed -Wframe-larger-than
> - removed unrelated fix
> - added comment for flake8 ignore warning
> - added 'suite' labels 'syntax' and 'unit' for tests
> - AUTHORS and libvirt-dbus.spec are generated only when building from
> git
> - run.in is no longer executable, there is a helper script to fix
> permissions
> for the generated run script
> - fixed include_directories for test executable, direct paths can be
> used
> since meson 0.50.0
> - flake8 is optional as it was with autotools
> - added meson version into spec file
>
> .gitignore | 1 +
> AUTHORS.in | 2 +-
> HACKING.md | 24 ++--
> Makefile.am | 51 ---
> README.md | 12 +-
> autogen.sh | 52 ---
> configure.ac| 87 ---
> data/Makefile.am| 83 ---
> data/meson.build| 15 ++
> data/session/meson.build| 6 +
> data/system/meson.build | 18 +++
> docs/Makefile.am| 21 ---
> docs/meson.build| 8 ++
> libvirt-dbus.spec.in| 9 +-
> m4/manywarnings.m4 | 276 ---
> m4/virt-arg.m4 | 154
> m4/virt-compile-pie.m4 | 35 -
> m4/virt-compile-warnings.m4 | 203 --
> m4/virt-linker-relro.m4 | 35 -
> m4/warnings.m4 | 79 --
> meson.build | 279
> meson_options.txt | 6 +
> run.in | 4 +-
> src/Makefile.am | 66 -
> src/meson.build | 42 ++
> tests/Makefile.am | 57
> tests/meson.build | 52 +++
> tools/fix-perm.sh | 3 +
> tools/gen-authors.sh| 4 +
> 29 files changed, 463 insertions(+), 1221 deletions(-)
> delete mode 100644 Makefile.am
> delete mode 100755 autogen.sh
> delete mode 100644 configure.ac
> delete mode 100644 data/Makefile.am
> create mode 100644 data/meson.build
> create mode 100644 data/session/meson.build
> create mode 100644 data/system/meson.build
> delete mode 100644 docs/Makefile.am
> create mode 100644 docs/meson.build
> delete mode 100644 m4/manywarnings.m4
> delete mode 100644 m4/virt-arg.m4
> delete mode 100644 m4/virt-compile-pie.m4
> delete mode 100644 m4/virt-compile-warnings.m4
> delete mode 100644 m4/virt-linker-relro.m4
> delete mode 100644 m4/warnings.m4
> create mode 100644 meson.build
> create mode 100644 meson_options.txt
> delete mode 100644 src/Makefile.am
> create mode 100644 src/meson.build
> delete mode 100644 tests/Makefile.am
> create mode 100644 tests/meson.build
> create mode 100755 tools/fix-perm.sh
> create mode 100755 tools/gen-authors.sh
> diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in
> index 626e2da..3425e9e 100644
> --- a/libvirt-dbus.spec.in
> +++ b/libvirt-dbus.spec.in
> @@ -1,5 +1,6 @@
> # -*- rpm-spec -*-
>
> +%global meson_version @MESON_VERSION@
> %global glib2_version @GLIB2_REQUIRED@
> %global libvirt_version @LIBVIRT_REQUIRED@
> %global libvirt_glib_version @LIBVIRT_GLIB_REQUIRED@
> @@ -14,7 +15,7 @@ URL: https://libvirt.org/
> Source0: https://libvirt.org/sources/dbus/%{name}-%{version}.tar.xz
>
> BuildRequires: gcc
> -BuildRequires: libtool
> +BuildRequires: meson >= %{meson_version}
> BuildRequires: glib2-devel >= %{glib2_version}
> BuildRequires: libvirt-devel >= %{libvirt_version}
> BuildRequires: libvirt-glib-devel >= %{libvirt_glib_version}
> @@ -35,11 +36,11 @@ This package provides D-Bus API for libvirt
> %autosetup
>
> %build
> -%configure
> -%make_build
> +%meson
> +%meson_build
>
> %install
> -%make_install
> +%meson_install
>
> %pre
> getent group %{system_user} >/dev/null || groupadd -r %{system_user}
Should this add a
[libvirt] [dbus PATCH v2] build: convert to Meson/Ninja build system
Meson build system is simple and quick compared to Autotools and it's able to fully replace our Autotools usage. There are few drawbacks as it's a fairly new build system, it requires Python 3.5 and Ninja 1.5.0, it's still evolving and the user base is not that large and there were some tweaks required to achieve the same functionality. However, there are benefits, the configure and build time is way shorter and build definition files are more readable and easier to maintain. There are some major changes with Meson build system: - there is no syntax-check target, the syntax-check is part of Meson test suite but it's still possible to run it separately, - Meson forces separation between source and build directories Signed-off-by: Pavel Hrdina Tested-by: Ján Tomko --- Notes: changes in v2: - add -Werror if we are building from git - fixed -Wframe-larger-than - removed unrelated fix - added comment for flake8 ignore warning - added 'suite' labels 'syntax' and 'unit' for tests - AUTHORS and libvirt-dbus.spec are generated only when building from git - run.in is no longer executable, there is a helper script to fix permissions for the generated run script - fixed include_directories for test executable, direct paths can be used since meson 0.50.0 - flake8 is optional as it was with autotools - added meson version into spec file .gitignore | 1 + AUTHORS.in | 2 +- HACKING.md | 24 ++-- Makefile.am | 51 --- README.md | 12 +- autogen.sh | 52 --- configure.ac| 87 --- data/Makefile.am| 83 --- data/meson.build| 15 ++ data/session/meson.build| 6 + data/system/meson.build | 18 +++ docs/Makefile.am| 21 --- docs/meson.build| 8 ++ libvirt-dbus.spec.in| 9 +- m4/manywarnings.m4 | 276 --- m4/virt-arg.m4 | 154 m4/virt-compile-pie.m4 | 35 - m4/virt-compile-warnings.m4 | 203 -- m4/virt-linker-relro.m4 | 35 - m4/warnings.m4 | 79 -- meson.build | 279 meson_options.txt | 6 + run.in | 4 +- src/Makefile.am | 66 - src/meson.build | 42 ++ tests/Makefile.am | 57 tests/meson.build | 52 +++ tools/fix-perm.sh | 3 + tools/gen-authors.sh| 4 + 29 files changed, 463 insertions(+), 1221 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 data/Makefile.am create mode 100644 data/meson.build create mode 100644 data/session/meson.build create mode 100644 data/system/meson.build delete mode 100644 docs/Makefile.am create mode 100644 docs/meson.build delete mode 100644 m4/manywarnings.m4 delete mode 100644 m4/virt-arg.m4 delete mode 100644 m4/virt-compile-pie.m4 delete mode 100644 m4/virt-compile-warnings.m4 delete mode 100644 m4/virt-linker-relro.m4 delete mode 100644 m4/warnings.m4 create mode 100644 meson.build create mode 100644 meson_options.txt delete mode 100644 src/Makefile.am create mode 100644 src/meson.build delete mode 100644 tests/Makefile.am create mode 100644 tests/meson.build create mode 100755 tools/fix-perm.sh create mode 100755 tools/gen-authors.sh diff --git a/.gitignore b/.gitignore index b4abf66..7ed7554 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ vgcore.* /aclocal.m4 /autom4te.cache/ /build-aux/ +/build/ /config.h /config.h.in /config.log diff --git a/AUTHORS.in b/AUTHORS.in index 52202ea..d5a486e 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -13,4 +13,4 @@ The primary maintainers of libvirt-dbus are: Patches have been received from: -#contributorslist# +@contributorslist@ diff --git a/HACKING.md b/HACKING.md index 8903408..e90f136 100644 --- a/HACKING.md +++ b/HACKING.md @@ -16,32 +16,40 @@ Alternatively you can use one of the mirrors: Running from git repository --- - * The first step is to run autoreconf to create configure script: + * The first step is to run meson to create build directory: ``` -./autogen.sh +meson build ``` Now you can compile libvirt-dbus: ``` -make +ninja -C build ``` - * Before posting a patch, you should run tests and perform syntax-checking: + * Before posting a patch, you should run tests: ``` -make check +ninja -C build test ``` -The test tool requires python3, python3-pytest and python3-dbus. +The test tool requires python3, python3-pytest, python3-dbus and flake8. +
