[libcamera-devel] meson: Use files() instead of find_program() for internal scripts

Message ID 20200510212636.13017-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit 019a145068b714482bbf791c0f296abd06ec0dc1
Headers show
Series
  • [libcamera-devel] meson: Use files() instead of find_program() for internal scripts
Related show

Commit Message

Laurent Pinchart May 10, 2020, 9:26 p.m. UTC
Using find_program() to locate scripts part of the source tree causes
meson to print messages at setup time for each of those scripts:

Program ipa-sign.sh found: YES (/home/user/src/libcamera/src/ipa/ipa-sign.sh)

This polutes the meson setup log with useless messages, as we know the
scripts are present. Use files() instead to avoid this.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/meson.build | 2 +-
 src/meson.build     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Kieran Bingham May 11, 2020, 8:11 a.m. UTC | #1
Hi Laurent,

On 10/05/2020 22:26, Laurent Pinchart wrote:
> Using find_program() to locate scripts part of the source tree causes
> meson to print messages at setup time for each of those scripts:
> 
> Program ipa-sign.sh found: YES (/home/user/src/libcamera/src/ipa/ipa-sign.sh)
> 
> This polutes the meson setup log with useless messages, as we know the

s/polutes/pollutes/

> scripts are present. Use files() instead to avoid this.
> 

Sounds good to me.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/ipa/meson.build | 2 +-
>  src/meson.build     | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/ipa/meson.build b/src/ipa/meson.build
> index 56e65eaa7426..cc3837ab8525 100644
> --- a/src/ipa/meson.build
> +++ b/src/ipa/meson.build
> @@ -16,7 +16,7 @@ config_h.set('IPA_MODULE_DIR',
>  
>  subdir('libipa')
>  
> -ipa_sign = find_program('ipa-sign.sh')
> +ipa_sign = files('ipa-sign.sh')
>  
>  ipas = ['rkisp1', 'vimc']
>  
> diff --git a/src/meson.build b/src/meson.build
> index f605a420c3ee..c9c1008562b1 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -4,7 +4,7 @@ endif
>  
>  openssl = find_program('openssl', required : true)
>  if openssl.found()
> -    ipa_gen_priv_key = find_program('ipa/gen-ipa-priv-key.sh')
> +    ipa_gen_priv_key = files('ipa/gen-ipa-priv-key.sh')
>      ipa_priv_key = custom_target('ipa-priv-key',
>                                   output : [ 'ipa-priv-key.pem' ],
>                                   command : [ ipa_gen_priv_key, '@OUTPUT@' ])
>

Patch

diff --git a/src/ipa/meson.build b/src/ipa/meson.build
index 56e65eaa7426..cc3837ab8525 100644
--- a/src/ipa/meson.build
+++ b/src/ipa/meson.build
@@ -16,7 +16,7 @@  config_h.set('IPA_MODULE_DIR',
 
 subdir('libipa')
 
-ipa_sign = find_program('ipa-sign.sh')
+ipa_sign = files('ipa-sign.sh')
 
 ipas = ['rkisp1', 'vimc']
 
diff --git a/src/meson.build b/src/meson.build
index f605a420c3ee..c9c1008562b1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,7 +4,7 @@  endif
 
 openssl = find_program('openssl', required : true)
 if openssl.found()
-    ipa_gen_priv_key = find_program('ipa/gen-ipa-priv-key.sh')
+    ipa_gen_priv_key = files('ipa/gen-ipa-priv-key.sh')
     ipa_priv_key = custom_target('ipa-priv-key',
                                  output : [ 'ipa-priv-key.pem' ],
                                  command : [ ipa_gen_priv_key, '@OUTPUT@' ])