[3/3] build: limit what is built when using MSVC compiler
Checks
Commit Message
Build only kvargs and telemetry when is_ms_compiler.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
lib/meson.build | 7 +++++++
meson.build | 13 +++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)
Comments
On Wed, Jan 25, 2023 at 11:25:07AM -0800, Tyler Retzlaff wrote:
> Build only kvargs and telemetry when is_ms_compiler.
>
> Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
> ---
> lib/meson.build | 7 +++++++
> meson.build | 13 +++++++++----
> 2 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/lib/meson.build b/lib/meson.build
> index 82e4666..8e99e21 100644
<snip>
> --- a/meson.build
> +++ b/meson.build
> @@ -76,11 +76,16 @@ subdir('config')
>
> # build libs and drivers
> subdir('lib')
> -subdir('drivers')
>
> -# build binaries and installable tools
> -subdir('usertools')
> -subdir('app')
> +if is_ms_compiler
> + enabled_apps = []
> +else
> + subdir('drivers')
> +
> + # build binaries and installable tools
> + subdir('usertools')
> + subdir('app')
> +endif
>
My own preference here would be to put the checks inside the
subdirectories, and try and keep the top-level meson.build file clean.
Would that work ok?
> # build docs
> subdir('doc')
> --
> 1.8.3.1
>
On Thu, Jan 26, 2023 at 11:10:26AM +0000, Bruce Richardson wrote:
> On Wed, Jan 25, 2023 at 11:25:07AM -0800, Tyler Retzlaff wrote:
> > Build only kvargs and telemetry when is_ms_compiler.
> >
> > Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
> > ---
> > lib/meson.build | 7 +++++++
> > meson.build | 13 +++++++++----
> > 2 files changed, 16 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/meson.build b/lib/meson.build
> > index 82e4666..8e99e21 100644
> <snip>
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -76,11 +76,16 @@ subdir('config')
> >
> > # build libs and drivers
> > subdir('lib')
> > -subdir('drivers')
> >
> > -# build binaries and installable tools
> > -subdir('usertools')
> > -subdir('app')
> > +if is_ms_compiler
> > + enabled_apps = []
> > +else
> > + subdir('drivers')
> > +
> > + # build binaries and installable tools
> > + subdir('usertools')
> > + subdir('app')
> > +endif
> >
>
> My own preference here would be to put the checks inside the
> subdirectories, and try and keep the top-level meson.build file clean.
> Would that work ok?
no objection. one clarification request though.
do you mean just for drivers, usertools and app or do you mean for every
lib/<foo> as well?
i'll send up a v2 once i get confirmation.
>
> > # build docs
> > subdir('doc')
> > --
> > 1.8.3.1
> >
On Thu, Jan 26, 2023 at 09:28:58AM -0800, Tyler Retzlaff wrote:
> On Thu, Jan 26, 2023 at 11:10:26AM +0000, Bruce Richardson wrote:
> > On Wed, Jan 25, 2023 at 11:25:07AM -0800, Tyler Retzlaff wrote:
> > > Build only kvargs and telemetry when is_ms_compiler.
> > >
> > > Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
> > > ---
> > > lib/meson.build | 7 +++++++
> > > meson.build | 13 +++++++++----
> > > 2 files changed, 16 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/lib/meson.build b/lib/meson.build
> > > index 82e4666..8e99e21 100644
> > <snip>
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -76,11 +76,16 @@ subdir('config')
> > >
> > > # build libs and drivers
> > > subdir('lib')
> > > -subdir('drivers')
> > >
> > > -# build binaries and installable tools
> > > -subdir('usertools')
> > > -subdir('app')
> > > +if is_ms_compiler
> > > + enabled_apps = []
> > > +else
> > > + subdir('drivers')
> > > +
> > > + # build binaries and installable tools
> > > + subdir('usertools')
> > > + subdir('app')
> > > +endif
> > >
> >
> > My own preference here would be to put the checks inside the
> > subdirectories, and try and keep the top-level meson.build file clean.
> > Would that work ok?
>
> no objection. one clarification request though.
>
> do you mean just for drivers, usertools and app or do you mean for every
> lib/<foo> as well?
>
No, not for every lib, there are far too many of them. What you have done
there makes most sense. But for drivers/apps/usertools, putting the check
in the subfolder help keep the top-level file cleaner.
On Thu, Jan 26, 2023 at 05:34:50PM +0000, Bruce Richardson wrote:
> On Thu, Jan 26, 2023 at 09:28:58AM -0800, Tyler Retzlaff wrote:
> > On Thu, Jan 26, 2023 at 11:10:26AM +0000, Bruce Richardson wrote:
> > > On Wed, Jan 25, 2023 at 11:25:07AM -0800, Tyler Retzlaff wrote:
> > > > Build only kvargs and telemetry when is_ms_compiler.
> > > >
> > > > Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
> > > > ---
> > > > lib/meson.build | 7 +++++++
> > > > meson.build | 13 +++++++++----
> > > > 2 files changed, 16 insertions(+), 4 deletions(-)
> > > >
> > > > diff --git a/lib/meson.build b/lib/meson.build
> > > > index 82e4666..8e99e21 100644
> > > <snip>
> > > > --- a/meson.build
> > > > +++ b/meson.build
> > > > @@ -76,11 +76,16 @@ subdir('config')
> > > >
> > > > # build libs and drivers
> > > > subdir('lib')
> > > > -subdir('drivers')
> > > >
> > > > -# build binaries and installable tools
> > > > -subdir('usertools')
> > > > -subdir('app')
> > > > +if is_ms_compiler
> > > > + enabled_apps = []
> > > > +else
> > > > + subdir('drivers')
> > > > +
> > > > + # build binaries and installable tools
> > > > + subdir('usertools')
> > > > + subdir('app')
> > > > +endif
> > > >
> > >
> > > My own preference here would be to put the checks inside the
> > > subdirectories, and try and keep the top-level meson.build file clean.
> > > Would that work ok?
> >
> > no objection. one clarification request though.
> >
> > do you mean just for drivers, usertools and app or do you mean for every
> > lib/<foo> as well?
> >
>
> No, not for every lib, there are far too many of them. What you have done
> there makes most sense. But for drivers/apps/usertools, putting the check
> in the subfolder help keep the top-level file cleaner.
thanks, i'll fire up v2 sometime today.
@@ -65,6 +65,13 @@ libraries = [
'node',
]
+if is_ms_compiler
+ libraries = [
+ 'kvargs',
+ 'telemetry',
+ ]
+endif
+
optional_libs = [
'bitratestats',
'cfgfile',
@@ -76,11 +76,16 @@ subdir('config')
# build libs and drivers
subdir('lib')
-subdir('drivers')
-# build binaries and installable tools
-subdir('usertools')
-subdir('app')
+if is_ms_compiler
+ enabled_apps = []
+else
+ subdir('drivers')
+
+ # build binaries and installable tools
+ subdir('usertools')
+ subdir('app')
+endif
# build docs
subdir('doc')